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

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

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index f08024223103ee05cc91a610b78ca8f2337e54bc..8ddc4c30fc5cc5335720623e00b457265b384753 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -13,7 +13,7 @@
     </if>
     <set var="LIB_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
-            wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+            wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         </if>
     </set>
     <set var="INC_TIFF">
@@ -33,6 +33,7 @@
         <include>$(INC_ZLIB)</include>
         <include>$(INC_JPEG)</include>
         <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
+        <cflags-dmars>-w2</cflags-dmars>
         <sources>
             $(TIFF_PLATFORM_SRC)
                    src/tiff/tif_aux.c