X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1e6f6268ebc4ab275e6d485382b5cd8d8011875..22df83431dec5d8b827755265c91d6fcf5fef4c6:/build/bakefiles/png.bkl

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 662d2a28a2..99943cf6c2 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,6 +25,7 @@
          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