don't confuse wxDF_UNICODETEXT and wxDF_TEXT

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

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index e166c5390627b169fed0947d0f656781240cf277..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</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>
 
     </set>
 

-    <lib id="wxjpeg" template="anylib"
-         cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxjpeg" template="3rdparty_lib"
+         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