X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d2efb51e6e4c27561184cbf83b8c90de2d761fa..c543817b3280c560d53307c0fa98e7a99aa00bf9:/build/bakefiles/jpeg.bkl

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index 8f142e1a9a..6b4840deee 100644
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -3,20 +3,29 @@
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_LIBJPEG"/>
+        <set var="LIB_JPEG">
+            <if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
+                wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+            </if>
+        </set>
     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="wxUSE_LIBJPEG">builtin</set>
+        <set var="LIB_JPEG">
+            <if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
+                wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+            </if>
+        </set>
     </if>
-    <set var="LIB_JPEG">
-        <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)</if>
-    </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"
-         cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
+         cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
         <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