X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/698ec182729bd330dabda6bc126ba828029ab5c3..8ef6d51ed75c75d313314f50b911e2f8f1df6a5c:/build/bakefiles/png.bkl diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl index d4cc6c9c7c..37cef92caf 100644 --- a/build/bakefiles/png.bkl +++ b/build/bakefiles/png.bkl @@ -3,15 +3,20 @@ <if cond="FORMAT=='autoconf'"> <option name="wxUSE_LIBPNG"/> + <set var="LIB_PNG"> + <if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'"> + wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) + </if> + </set> </if> <if cond="FORMAT!='autoconf'"> <set var="wxUSE_LIBPNG">builtin</set> + <set var="LIB_PNG"> + <if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'"> + wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) + </if> + </set> </if> - <set var="LIB_PNG"> - <if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'"> - wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) - </if> - </set> <set var="INC_PNG"> <if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if> </set> @@ -20,25 +25,26 @@ cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'"> <dirname>$(LIBDIRNAME)</dirname> <include>$(INC_ZLIB)</include> - <cflags-borland>-w-8004</cflags-borland> + <cflags-borland>-w-8004</cflags-borland> + <cflags-watcom>-wcd=124</cflags-watcom> <sources> - src/png/png.c - src/png/pngerror.c - src/png/pnggccrd.c - src/png/pngget.c - src/png/pngmem.c - src/png/pngpread.c - src/png/pngread.c - src/png/pngrio.c - src/png/pngrtran.c - src/png/pngrutil.c - src/png/pngset.c - src/png/pngtrans.c - src/png/pngvcrd.c - src/png/pngwio.c - src/png/pngwrite.c - src/png/pngwtran.c - src/png/pngwutil.c + src/png/png.c + src/png/pngerror.c + src/png/pnggccrd.c + src/png/pngget.c + src/png/pngmem.c + src/png/pngpread.c + src/png/pngread.c + src/png/pngrio.c + src/png/pngrtran.c + src/png/pngrutil.c + src/png/pngset.c + src/png/pngtrans.c + src/png/pngvcrd.c + src/png/pngwio.c + src/png/pngwrite.c + src/png/pngwtran.c + src/png/pngwutil.c </sources> </lib>