more #defines, libraries and precompiled headers work

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 3ba7c9369c1053145e1b37eded87db1ff1fe47cd..864e8f49e3f3219ad3658159ae36546e55fddd8f 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -166,6 +166,12 @@
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>multi</threading>
         <runtime-libs>dynamic</runtime-libs>
+
+        <if cond="FORMAT!='autoconf'">
+            <define>WINVER=0x0400</define>
+            <define>_WIN32_IE=0x0400</define>
+            <define>STRICT</define>
+        </if>
     </template>
 
     <template id="3rdparty_lib" template="anylib">
@@ -222,6 +228,25 @@
         <if cond="FORMAT!='autoconf'">
             <if cond="COMPILER=='bcc'">
                 <sys-lib>import32</sys-lib>
+                <sys-lib>ole2w32</sys-lib>
+            </if>
+            <if cond="COMPILER!='bcc'">
+                <sys-lib>kernel32</sys-lib>
+                <sys-lib>user32</sys-lib>
+                <sys-lib>gdi32</sys-lib>
+                <sys-lib>comdlg32</sys-lib>
+                <sys-lib>winspool</sys-lib>
+                <sys-lib>winmm</sys-lib>
+                <sys-lib>shell32</sys-lib>
+                <sys-lib>oldnames</sys-lib>
+                <sys-lib>comctl32</sys-lib>
+                <sys-lib>odbc32</sys-lib>
+                <sys-lib>ole32</sys-lib>
+                <sys-lib>oleaut32</sys-lib>
+                <sys-lib>uuid</sys-lib>
+                <sys-lib>rpcrt4</sys-lib>
+                <sys-lib>advapi32</sys-lib>
+                <sys-lib>wsock32</sys-lib>
             </if>
         </if>        
     </template>
@@ -229,10 +254,16 @@
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
+
+        <if cond="FORMAT!='autoconf'">
+            <sources>src/msw/dummy.cpp</sources>
+            <precomp-headers-gen>src/msw/dummy.cpp</precomp-headers-gen>
+        </if>
+        <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
         <precomp-headers>on</precomp-headers>
-        <precomp-headers-file>wxprec</precomp-headers-file>
+        <precomp-headers-file>wxprec_$(id)</precomp-headers-file>
     </template>
-    
+
     <template id="wx_dll_b" template="wx_lib_b">
         <set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
         <dllname>$(WXDLLNAME)</dllname>

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 1e70d1aef9b49d01fe3da1cef2402d0b4459d319..ebc6a54642b1c01c92bc7d744474c7b4f8044ea1 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -1,4 +1,6 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
+
 <makefile>
     
     <!-- ================================================================= -->