Move stdpath into base on msw as well.

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

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 6f83cf40504b0d2557686b669077e7183505c211..99943cf6c296ecbaeeed7a0523955d78fb93550e 100644 (file)
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -3,21 +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>
     <set var="INC_PNG">
-        <if cond="wxUSE_LIBPNG=='builtin'">$(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