X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ddf9896893fd4908556916fcb05fecca440cdfb5..62675ef3b7e75fb9f91f4192d9ffe7d882d6ea5a:/build/bakefiles/png.bkl?ds=sidebyside

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 8d80297d2c..99943cf6c2 100644
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -3,16 +3,29 @@
 
     <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'">wxpng</if>
+    <set var="INC_PNG">
+        <if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>
     </set>
 
-    <lib id="wxpng" cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxpng" template="3rdparty_lib"
+         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> 
         <sources>
 		    src/png/png.c
 		    src/png/pngerror.c