adapted Julian's new speed improved version

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 77be8199ddb7e0e2ed11d46e68d184fe5cc6b502..89080fa27e19dd81424ee685bcf2441a6062244a 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -3,7 +3,7 @@
 
 <makefile>
 
-    <requires version="0.2.1"/>
+    <requires version="0.2.3"/>
 
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
@@ -25,6 +25,7 @@
     <!-- FIXME: PalmOS is another candidate to bakefiles -->
     <set var="PLATFORM_PALMOS">0</set>
 
+
     <include file="config.bkl"/>
 
     <include file="plugins_deps.bkl"/>
@@ -141,14 +142,6 @@
     <set var="WXLIB_XRC">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if>
     </set>
-    <set var="WXLIB_ODBC">
-        <if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
-            $(mk.evalExpr(wxwin.mkLibName('odbc')))
-        </if>
-    </set>
-    <set var="WXLIB_DBGRID">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
-    </set>
     <set var="WXLIB_AUI">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
     </set>
@@ -271,6 +264,7 @@
     </set>
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
+        <if cond="FORMAT!='autoconf' and UNICODE=='0'">wxUSE_UNICODE=0</if>
     </set>
     <set var="MSLU_DEFINE">
         <if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>
@@ -288,10 +282,10 @@
     <if cond="FORMAT!='autoconf'">
         <set var="GDIPLUS_LIB">
             <if cond="USE_GDIPLUS=='1'">gdiplus</if>
-       </set>
-       <set var="GFXCTX_DEFINE">
+        </set>
+        <set var="GFXCTX_DEFINE">
             <if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
-       </set>
+        </set>
     </if>
 
     <set var="LINK_TARGET_CPU">
@@ -314,13 +308,6 @@
         </if>
         <define>$(NO_VC_CRTDBG)</define>
         <define>$(WIN32_WINNT)</define>
-        <if cond="FORMAT=='msevc4prj' and
-                  BAKEFILE_VERSION in ['0.1.9'] and
-                  USE_RTTI=='0'">
-            <!-- hack to make eVC4 2.6.2 project files compatible with what we had in 2.6.1 -->
-            <set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
-            <set var="_cppflags">$(_cppflags.replace('/GR', ''))</set>
-        </if>
         <if cond="FORMAT=='msvc'">
             <ldflags>$(LINK_TARGET_CPU)</ldflags>
         </if>
@@ -350,10 +337,6 @@
 
     <!-- deal with the need to copy setup.h here: -->
 
-    <set var="IS_MSVC_PRJ">
-        $(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
-    </set>
-
     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
             <msvc-project-files>
@@ -371,6 +354,20 @@ InputPath=..\..\include\wx\%s
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         </if>
     </set>
+    <!-- this should be removed after new bakefile release -->
+    <if cond="FORMAT in ['msvs2005prj','msvs2003prj']">
+        <if cond="BAKEFILE_VERSION!='0.2.3'">
+            <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning>
+        </if>
+        <set var="msvc_copy_setup_h_script">
+Creating $(SETUPHDIR)\wx\setup.h
+InputPath=..\..\include\wx\%s
+
+"$(SETUPHDIR)\wx\setup.h" : "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
+$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+        </set>
+    </if>
+    <!-- end of what should be removed after new bakefile release -->
 
     <define-tag name="msvc-headers-setup-h" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
@@ -429,6 +426,19 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 "$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
 $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>
+            <!-- this should be removed after new bakefile release -->
+            <if cond="FORMAT in ['msvs2005prj','msvs2003prj']">
+                <if cond="BAKEFILE_VERSION!='0.2.3'">
+                    <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning>
+                </if>
+                <set var="_custom_build_include_wx_msw_genrcdefs_h">
+Creating $(SETUPHDIR)\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(SETUPHDIR)\wx\msw"
+$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
+                </set>
+            </if>
         </if>
     </define-tag>
 
@@ -447,7 +457,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <include file="png.bkl"/>
     <include file="jpeg.bkl"/>
     <include file="tiff.bkl"/>
-    <include file="odbc.bkl"/>
     <include file="expat.bkl"/>
     <include file="scintilla.bkl"/>
 
@@ -512,7 +521,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_ZLIB)</sys-lib>
-        <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
         <sys-lib>$(LIB_EXPAT)</sys-lib>
 
@@ -566,9 +574,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
-            <if cond="FORMAT!='msevc4prj'">
-                <sys-lib>odbc32</sys-lib>
-            </if>
         </if>
     </template>
 
@@ -668,7 +673,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
               template="wx_3rdparty_dependencies_gui">
         <depends>wxexpat</depends>
         <depends>wxzlib</depends>
-        <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
 
@@ -685,7 +689,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <template id="wx_3rdparty_includes"
               template="wx_3rdparty_includes_gui">
         <include>$(INC_ZLIB)</include>
-        <include>$(INC_ODBC)</include>
         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>
@@ -761,14 +764,15 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     </define-rule>
 
     <!-- =============================================================== -->
-    <!--               Support for wxWidgets samples and contrib:        -->
+    <!--               Support for wxWidgets samples:                    -->
     <!-- =============================================================== -->
 
     <!-- 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="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
+        <!-- msvs200?prj formats don't support external dependencies yet: -->
+        <if cond="FORMAT in ['msvc6prj','msevc4prj'] and MONOLITHIC=='0'">
             <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>
     </define-tag>