X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46da6d0629858da0b82ec54f2d804edc80eef552..37da386f77095543cf7740453455701ab65b5c94:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 5514715acd..2ac0c1a132 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -3,7 +3,7 @@
 
 <makefile>
 
-    <requires version="0.1.4"/>
+    <requires version="0.1.7"/>
 
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
@@ -247,6 +247,14 @@
         <if cond="USE_EXCEPTIONS=='1'">on</if>
         <if cond="USE_EXCEPTIONS=='0'">off</if>
     </set>
+    <set var="RTTIFLAG">
+        <if cond="USE_RTTI=='1'">on</if>
+        <if cond="USE_RTTI=='0'">off</if>
+    </set>
+    <set var="THREADSFLAG">
+        <if cond="USE_THREADS=='1'">multi</if>
+        <if cond="USE_THREADS=='0'">single</if>
+    </set>
 
     <set var="DEBUG_DEFINE">
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
@@ -261,6 +269,11 @@
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
     </set>
 
+    <!-- fill for the specific case of the format/compiler -->
+    <set var="WIN32_WINNT">
+        <if cond="FORMAT=='dmars' or FORMAT=='dmars_smake'">_WIN32_WINNT=0x0400</if>
+    </set>
+
     <set var="UNICOWS_LIB">
         <if cond="MSLU=='1'">unicows</if>
     </set>
@@ -269,14 +282,15 @@
         <debug-info>$(DEBUGINFO)</debug-info>
         <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
         <optimize>$(OPTIMIZEFLAG)</optimize>
-        <threading>multi</threading>
+        <threading>$(THREADSFLAG)</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
-        <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
+        <cxx-rtti>$(RTTIFLAG)</cxx-rtti>
         <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>
         <define>$(NO_VC_CRTDBG)</define>
+        <define>$(WIN32_WINNT)</define>
     </template>
 
     <template id="anylib">
@@ -390,9 +404,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: -->
@@ -477,6 +491,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                     $(WXTOPDIR)src/msw/dummy.cpp
                 </precomp-headers-gen>
             </if>
+            <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
             <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
             <precomp-headers>on</precomp-headers>
             <precomp-headers-file>wxprec_$(id)</precomp-headers-file>
@@ -508,6 +523,10 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <version>$(WX_VERSION)</version>
         <so_version>$(WXSOVERSION)</so_version>
         <mac_version>$(WXMACVERSION)</mac_version>
+
+        <!-- version info resources: -->
+        <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
+        <win32-res>src/msw/version.rc</win32-res>
     </template>
 
     <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">