X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/332cc656f3640f2d0dd351896eba291a38b40876..874cc42557bea53e2e503a7d1978e84a4a8034d3:/build/bakefiles/jpeg.bkl?ds=sidebyside diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl index e166c53906..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</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="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> + <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