X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/149d9543f568e203347f9d64f07edaf73afeee57..f4998a1cc6cf4783a46fbeee4e75a0808b8afe21:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 0c429596ef..bd4ac24a21 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -198,13 +198,22 @@
         <if cond="BUILD=='debug'">off</if>
         <if cond="BUILD=='release'">speed</if>
     </set>
+    <set var="EXCEPTIONSFLAG">
+        <if cond="USE_EXCEPTIONS=='1'">on</if>
+        <if cond="USE_EXCEPTIONS=='0'">off</if>
+    </set>
 
     <set var="DEBUG_DEFINE">
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
         <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>
+    <!-- does not cover all cases, but better than nothing -->
+    <set var="NO_VC_CRTDBG">
+        <if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
+        <if cond="FORMAT=='msvc' and BUILD=='release' and DEBUG_FLAG=='1'">__NO_VC_CRTDBG__</if>
+    </set>
     <set var="UNICODE_DEFINE">
-        <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
+        <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
     </set>
     
     <set var="UNICOWS_LIB">
@@ -217,9 +226,12 @@
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>multi</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
+        <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
+        <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>
+        <define>$(NO_VC_CRTDBG)</define>
     </template>
     
     <template id="anylib">
@@ -264,6 +276,7 @@
         <include>$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
+        <warnings>max</warnings>
     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->
@@ -283,7 +296,6 @@
         <if cond="FORMAT!='autoconf'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
             <if cond="COMPILER=='bcc'">
-                <sys-lib>import32</sys-lib>
                 <sys-lib>ole2w32</sys-lib>
             </if>
             <if cond="COMPILER!='bcc'">
@@ -303,6 +315,9 @@
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
             </if>
+            <if cond="COMPILER=='vc' or COMPILER=='bcc'">
+                <sys-lib>oleacc</sys-lib>
+            </if>
         </if>        
     </template>
 
@@ -413,18 +428,24 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>
+
+    <template id="msvc_setup_h">
+        <msvc-copy-setup-h/>
+    </template>
     
-    <template id="wx_lib" template="wx_lib_b,wx_3rdparty_includes"/>
-    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_includes">
+    <template id="wx_lib"
+              template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
+    <template id="wx_base_lib"
+              template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h">
         <define>wxUSE_GUI=0</define> 
     </template>
 
     <template id="wx_dll"
               template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
-              template_append="wx_append_nomono"/>
+              template_append="msvc_setup_h,wx_append_nomono"/>
     <template id="wx_base_dll"
               template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
-              template_append="wx_append_base_nomono">
+              template_append="msvc_setup_h,wx_append_base_nomono">
         <define>wxUSE_GUI=0</define> 
     </template>
                            
@@ -479,6 +500,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
     <!-- Link against one wxWin library. Value must be literal! -->
     <define-tag name="wx-lib" rules="exe,dll,module">
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
+        <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
         <if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
             <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>