eVC3 compatibility workaround.

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 65906d1ef91231a1d9bab2857e84743bce870963..c40caa90bbca3a6ec0daf8960f00a546df1240fe 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -236,13 +236,13 @@
     </set>
 
     <set var="RTTI_DEFINE">
     </set>
 
     <set var="RTTI_DEFINE">

-       <if cond="USE_RTTI=='0'">wxNO_RTTI</if>
+        <if cond="USE_RTTI=='0'">wxNO_RTTI</if>

     </set>
     <set var="EXCEPTIONS_DEFINE">
     </set>
     <set var="EXCEPTIONS_DEFINE">

-       <if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
+        <if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>

     </set>
     <set var="THREAD_DEFINE">
     </set>
     <set var="THREAD_DEFINE">

-       <if cond="USE_THREADS=='0'">wxNO_THREADS</if>
+        <if cond="USE_THREADS=='0'">wxNO_THREADS</if>

     </set>
 
     <set var="DEBUG_DEFINE">
     </set>
 
     <set var="DEBUG_DEFINE">


@@ -280,6 +280,10 @@
         </if>
         <define>$(NO_VC_CRTDBG)</define>
         <define>$(WIN32_WINNT)</define>
         </if>
         <define>$(NO_VC_CRTDBG)</define>
         <define>$(WIN32_WINNT)</define>

+        <if cond="FORMAT=='msevc4prj'">
+            <!-- hack to make eVC4 default project still compatible with eVC3 environment -->
+            <set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
+        </if>

     </template>
 
     <template id="anylib">
     </template>
 
     <template id="anylib">


@@ -520,7 +524,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <dllname>$(WXDLLNAME)</dllname>
         <version>$(WX_VERSION)</version>
         <so_version>$(WXSOVERSION)</so_version>
         <dllname>$(WXDLLNAME)</dllname>
         <version>$(WX_VERSION)</version>
         <so_version>$(WXSOVERSION)</so_version>

-    
+

         <!-- FIXME: until libtool scheme is implemented in bakefile -->
         <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
 
         <!-- FIXME: until libtool scheme is implemented in bakefile -->
         <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
 

diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h
index 16cd0df9281c63c03640d83a40c794f16a44553e..953e356b848f25234b8341570cb04dc9fb9d52fb 100644 (file)
--- a/include/wx/msw/wince/libraries.h
+++ b/include/wx/msw/wince/libraries.h
@@ -26,6 +26,10 @@
     #pragma comment(lib,"commdlg.lib")
 #endif
 
     #pragma comment(lib,"commdlg.lib")
 #endif
 

+#if (_WIN32_WCE >= 400) && !defined(wxNO_RTTI)
+    #pragma comment(lib,"ccrtrtti.lib")
+#endif
+

 #if defined(__WINCE_STANDARDSDK__)
     // DoDragDrop:
     #pragma comment(lib,"olece400.lib")
 #if defined(__WINCE_STANDARDSDK__)
     // DoDragDrop:
     #pragma comment(lib,"olece400.lib")