added displayx11.{cpp,h}

[wxWidgets.git] / build / bakefiles / jpeg.bkl

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index 8f142e1a9a571e173384d9493521b968e35e5f64..66aab149c54e2b43f5c3fc68a4846458b60ce477 100644 (file)
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -8,15 +8,19 @@
         <set var="wxUSE_LIBJPEG">builtin</set>
     </if>
     <set var="LIB_JPEG">
         <set var="wxUSE_LIBJPEG">builtin</set>
     </if>
     <set var="LIB_JPEG">

-        <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)</if>
+        <if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
+            wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+        </if>

     </set>
     <set var="INC_JPEG">
     </set>
     <set var="INC_JPEG">

-        <if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
+        <if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>

     </set>
 
     <lib id="wxjpeg" template="3rdparty_lib"
     </set>
 
     <lib id="wxjpeg" template="3rdparty_lib"

-         cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
+         cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">

         <dirname>$(LIBDIRNAME)</dirname>
         <dirname>$(LIBDIRNAME)</dirname>

+        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
+        <cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>

         <sources>
             src/jpeg/jcomapi.c
                    src/jpeg/jutils.c
         <sources>
             src/jpeg/jcomapi.c
                    src/jpeg/jutils.c