-1, TRUE/true, FALSE/false and tabs replacements.

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

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index b397f02b2613baa82bcbaea398c7fb17cd9c991b..d4cc6c9c7ca066e606650febdd2718d7fac64e2d 100644 (file)
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -8,16 +8,19 @@
         <set var="wxUSE_LIBPNG">builtin</set>
     </if>
     <set var="LIB_PNG">
-        <if cond="wxUSE_LIBPNG=='builtin'">wxpng$(WXDEBUGFLAG)</if>
+        <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>
+        <if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>
     </set>
 
     <lib id="wxpng" template="3rdparty_lib"
-         cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
+         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