Save dialog for printing. Source cleaning.

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 3e04b9ab3b87b41dd573abec8141da87bc70969a..99b0bd578b7bc5986db5a13024248618ee8d7051 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -3,7 +3,7 @@
 
 <makefile>
 
-    <requires version="0.1.4"/>
+    <requires version="0.1.5"/>
 
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
@@ -204,13 +204,15 @@
         <set var="BUILDDIR">$(OBJS)</set>
     </if>
 
+    <set var="LIBTYPE_SUFFIX" make_var="1">
+        <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
+    </set>
+
     <set var="LIBDIRNAME" make_var="1">
         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
-        <if cond="FORMAT!='autoconf' and SHARED=='0'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_lib$(CFG)
-        </if>
-        <if cond="FORMAT!='autoconf' and SHARED=='1'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_dll$(CFG)
+        <if cond="FORMAT!='autoconf'">
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
         </if>
     </set>
 
@@ -388,9 +390,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             -wcd=657 <!-- define this function inside its class definition (could have improved code quality) -->
             -wcd=667 <!-- 'va_start' macro will not work without an argument before '...' -->
         </cppflags-watcom>
-        <cppflags-mingw>
+        <cxxflags-mingw>
             -Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
-        </cppflags-mingw>
+        </cxxflags-mingw>
     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->
@@ -475,6 +477,13 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                     $(WXTOPDIR)src/msw/dummy.cpp
                 </precomp-headers-gen>
             </if>
+            
+            <!-- FIXME: temporary fix for bkl-0.1.5 bug, remove <if> when
+                        bkl-0.1.6 is released -->
+            <if cond="FORMAT in ['dmars','dmars_smake']">
+                <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
+            </if>
+            
             <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
             <precomp-headers>on</precomp-headers>
             <precomp-headers-file>wxprec_$(id)</precomp-headers-file>