Move the WX_FLAVOUR variables to be defined generally, not just for

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

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 8d80297d2c9f5dba4965fbdc081feb96b413d1bc..4c15cc46ceea217084f2d44d531460996ba7e314 100644 (file)
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -8,11 +8,19 @@
         <set var="wxUSE_LIBPNG">builtin</set>
     </if>
     <set var="LIB_PNG">
-        <if cond="wxUSE_LIBPNG=='builtin'">wxpng</if>
+        <if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'">
+            wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+        </if>
+    </set>
+    <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