X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442253be2d0b089683f34a334f1935994fb2e833..89e94a4bffda38bdb53d875f022982273f9580f2:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index ff94db56b1..ac23bd5ecf 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -29,37 +29,9 @@
 
     <include file="plugins_deps.bkl"/>
 
-    <!-- ================================================================== -->
-    <!--                     wxWidgets version numbers:                     -->
-    <!-- ================================================================== -->
 
-    <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
-    <set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
-    <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
-    <set var="WX_RELEASE" make_var="1">
-        $(WXVER_MAJOR).$(WXVER_MINOR)
-    </set>
-    <set var="WX_RELEASE_NODOT" make_var="1">
-        $(WXVER_MAJOR)$(WXVER_MINOR)
-    </set>
-    <set var="WX_VERSION" make_var="1">
-        $(WX_RELEASE).$(WXVER_RELEASE)
-    </set>
-    <set var="WX_VERSION_NODOT" make_var="1">
-        $(WX_RELEASE_NODOT)$(WXVER_RELEASE)
-    </set>
-
-    <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
-
-    <set var="WXSOVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">0.0.0</if>
-        <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
-    </set>
-    <set var="WXMACVERSION">$(WX_VERSION)</set>
-    <set var="WXWIN32DLLVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
-        <if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
-    </set>
+    <!-- wxWidgets version numbers logic: -->
+    <include file="version.bkl"/>
 
 
     <!-- ================================================================== -->
@@ -148,6 +120,9 @@
     <set var="WXLIB_NET">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
     </set>
+    <set var="WXLIB_QA">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('qa')))</if>
+    </set>
     <set var="WXLIB_CORE">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
     </set>
@@ -208,8 +183,10 @@
     </if>
 
     <set var="LIBTYPE_SUFFIX" make_var="1">
-        <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
-        <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='0' and PLATFORM_WIN32=='1'">lib</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='1' and PLATFORM_WIN32=='1'">dll</if>
+        <if cond="FORMAT=='watcom' and SHARED=='0' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_lib</if>
+        <if cond="FORMAT=='watcom' and SHARED=='1' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_dll</if>
     </set>
 
     <set var="LIBDIRNAME" make_var="1">
@@ -238,7 +215,8 @@
         <if cond="DEBUG_INFO=='0'">off</if>
     </set>
     <set var="DEBUGRUNTIME">
-        <if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='debug'">on</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">off</if>
         <if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
         <if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
     </set>
@@ -259,6 +237,16 @@
         <if cond="USE_THREADS=='0'">single</if>
     </set>
 
+    <set var="RTTI_DEFINE">
+        <if cond="USE_RTTI=='0'">wxNO_RTTI</if>
+    </set>
+    <set var="EXCEPTIONS_DEFINE">
+        <if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
+    </set>
+    <set var="THREAD_DEFINE">
+        <if cond="USE_THREADS=='0'">wxNO_THREADS</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>
@@ -271,6 +259,9 @@
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
     </set>
+    <set var="MSLU_DEFINE">
+        <if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>
+    </set>
 
     <!-- fill for the specific case of the format/compiler -->
     <set var="WIN32_WINNT">
@@ -294,6 +285,13 @@
         </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>
     </template>
 
     <template id="anylib">
@@ -323,37 +321,70 @@
 
     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
-            <msvc-project-files>
-                $(addPrefixToList('include\', wxwin.headersOnly(value)))
-            </msvc-project-files>
+            <!-- FIXME: remove this once we require >=bkl-0.1.9 -->
+            <if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
+                <msvc-project-files>
+                    $(addPrefixToList('include\', wxwin.headersOnly(value)))
+                </msvc-project-files>
+            </if>
+            <if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
+                <msvc-project-files>
+                    $(addPrefixToList('include\\', wxwin.headersOnly(value)))
+                </msvc-project-files>
+            </if>
         </if>
     </define-tag>
 
-    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
-        <if cond="FORMAT=='msevc4prj'">
-            <msvc-headers>wx/msw/wince/setup.h</msvc-headers>
-            <set var="vc_setup_h">wince\setup.h</set>
-            <set var="vc_setup_h_rule">wince_setup_h</set>
-        </if>
-        <if cond="FORMAT!='msevc4prj'">
-            <msvc-headers>wx/msw/setup.h</msvc-headers>
-            <set var="vc_setup_h">setup.h</set>
-            <set var="vc_setup_h_rule">setup_h</set>
-        </if>
+    <set var="msvc_copy_setup_h_script">
         <if cond="IS_MSVC_PRJ">
-            <set var="_custom_build_files" append="1">
-                include\wx\msw\$(vc_setup_h)
-            </set>
-            <set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)">
 Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\include\wx\msw\$(vc_setup_h)
+InputPath=..\include\wx\%s
 
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+        </if>
+    </set>
+
+    <define-tag name="msvc-headers-setup-h" rules="dll,lib">
+        <if cond="IS_MSVC_PRJ">
+            <msvc-headers>
+                $(addPrefixToList('wx/', value))
+            </msvc-headers>
+            <set var="_custom_build_files" append="1">
+                $(nativePaths(addPrefixToList('include/wx/', value)))
             </set>
         </if>
     </define-tag>
 
+    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
+        <if cond="IS_MSVC_PRJ">
+            <if cond="FORMAT=='msevc4prj'">
+                <msvc-headers-setup-h>
+                    msw/wince/setup.h
+                </msvc-headers-setup-h>
+                <set var="_custom_build_include_wx_msw_wince_setup_h">
+                    $(msvc_copy_setup_h_script % 'msw\wince\setup.h')
+                </set>
+            </if>
+            <if cond="FORMAT!='msevc4prj'">
+                <msvc-headers-setup-h>
+                    msw/setup.h
+                    univ/setup.h
+                </msvc-headers-setup-h>
+                <set var="_custom_build_include_wx_msw_setup_h">
+                    <if cond="WXUNIV=='0'">
+                        $(msvc_copy_setup_h_script % 'msw\setup.h')
+                    </if>
+                </set>
+                <set var="_custom_build_include_wx_univ_setup_h">
+                    <if cond="WXUNIV=='1'">
+                        $(msvc_copy_setup_h_script % 'univ\setup.h')
+                    </if>
+                </set>
+            </if>
+        </if>
+    </define-tag>
+
     <template id="msvc_setup_h">
         <msvc-copy-setup-h/>
     </template>
@@ -394,7 +425,11 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>
         <define>$(DEBUG_DEFINE)</define>
+        <define>$(EXCEPTIONS_DEFINE)</define>
+        <define>$(RTTI_DEFINE)</define>
+        <define>$(THREAD_DEFINE)</define>
         <define>$(UNICODE_DEFINE)</define>
+        <define>$(MSLU_DEFINE)</define>
         <!-- this include is added by configure, we need to put other
              includes before it: -->
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
@@ -425,8 +460,15 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
 
         <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
 
+        <!-- system libraries on os2: -->
+        <if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
+            <if cond="FORMAT=='watcom'">
+                <sys-lib>upm32</sys-lib>
+            </if>
+        </if>
+
         <!-- system libraries on windows: -->
-        <if cond="FORMAT!='autoconf'">
+        <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
@@ -488,7 +530,6 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <libname>$(WXLIBNAME)</libname>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-                <error>HELL:$(TOOLKIT)</error>
             <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
                 <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
                 <precomp-headers-gen>
@@ -524,7 +565,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <dllname>$(WXDLLNAME)</dllname>
         <version>$(WX_VERSION)</version>
         <so_version>$(WXSOVERSION)</so_version>
-        <mac_version>$(WXMACVERSION)</mac_version>
+
+        <!-- FIXME: until libtool scheme is implemented in bakefile -->
+        <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
 
         <!-- version info resources: -->
         <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
@@ -533,7 +576,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                 $(TOP_SRCDIR)include
             </res-include>
         </if>
-        <win32-res>src/msw/version.rc</win32-res>
+        <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
     </template>
 
     <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">