X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64a2a46fc6b9f98debdd24122925afcccf0c6d83..aa8d7c2f9b1e50b5cf7b6ee24253c9459d7f31c4:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 724c12292d..f8b560d463 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -21,8 +21,17 @@
     <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
     <set var="WX_VERSION">$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)</set>
 
-    <set var="WXSOVERSION">0.0.0</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'">$(WXVER_MAJOR)$(WXVER_MINOR)</if>
+        <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)</if>
+    </set>
     
     
     <!-- ================================================================== -->
@@ -52,7 +61,8 @@
     </set>
 
     <set var="WXDEBUGFLAG">
-        <if cond="BUILD=='debug'">d</if>
+        <if cond="BUILD=='debug' and DEBUG_FLAG=='default'">d</if>
+        <if cond="DEBUG_FLAG=='1'">d</if>
     </set>
     <set var="WXUNICODEFLAG">
         <if cond="UNICODE=='1'">u</if>
@@ -83,13 +93,13 @@
     </if>
     <set var="WXDLLNAMEPREFIX">
         <if cond="PLATFORM_WIN32=='1'">
-            wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
+            wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION)
         </if>
         <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
     </set>
     <set var="WXDLLNAMEPREFIXGUI">
         <if cond="PLATFORM_WIN32=='1'">
-            wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)
+            wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)
         </if>
         <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIXGUI)</if>
     </set>
@@ -98,10 +108,6 @@
         <if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
     </set>
 
-    <set var="TOOLCHAIN_NAME">
-        $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
-    </set>
-
     
     <!-- =============================================================== -->
     <!--                    Names of component libraries:                -->
@@ -110,12 +116,27 @@
     <set var="WXLIB_BASE">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
     </set>
+    <set var="WXLIB_NET">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
+    </set>
     <set var="WXLIB_CORE">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
     </set>
+    <set var="WXLIB_ADV">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
+    </set>
     <set var="WXLIB_HTML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
     </set>
+    <set var="WXLIB_XML">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if>
+    </set>
+    <set var="WXLIB_ODBC">
+        <if cond="MONOLITHIC=='0'">$(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_MONO">
         <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
@@ -138,10 +159,10 @@
         <set var="BUILDDIR">$(OBJS)</set>
     </if>
     
-    <set var="LIBDIRNAME">
+    <set var="LIBDIRNAME" make_var="1">
         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
         <if cond="FORMAT!='autoconf'">
-            $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
         </if>
     </set>
 
@@ -150,9 +171,16 @@
     <!--                        Templates for libs:                      -->
     <!-- =============================================================== -->
 
-    <set var="DEBUGFLAG">
-        <if cond="BUILD=='debug'">on</if>
-        <if cond="BUILD=='release'">off</if>
+    <set var="DEBUGINFO">
+        <if cond="BUILD=='debug' and DEBUG_INFO=='default'">on</if>
+        <if cond="DEBUG_INFO=='1'">on</if>
+        <if cond="BUILD=='release' and DEBUG_INFO=='default'">off</if>
+        <if cond="DEBUG_INFO=='0'">off</if>
+    </set>
+    <set var="DEBUGRUNTIME">
+        <if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
     </set>
     <set var="OPTIMIZEFLAG">
         <if cond="BUILD=='debug'">off</if>
@@ -160,33 +188,35 @@
     </set>
 
     <set var="DEBUG_DEFINE">
-        <if cond="FORMAT!='autoconf' and BUILD=='debug'">__WXDEBUG__</if>
+        <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
+        <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
     </set>
+    
+    <set var="UNICOWS_LIB">
+        <if cond="MSLU=='1'">unicows</if>
+    </set>
 
     <template id="common_settings">
-        <debug-info>$(DEBUGFLAG)</debug-info>
+        <debug-info>$(DEBUGINFO)</debug-info>
+        <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>multi</threading>
-        <runtime-libs>dynamic</runtime-libs>
+        <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>
     </template>
     
     <template id="anylib">
-        <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
         <dirname>$(LIBDIRNAME)</dirname>
         <install-to>$(LIBDIR)</install-to>
-        <if cond="FORMAT!='autoconf'">
-            <cppflags>$(EXTRACFLAGS)</cppflags>
-        </if>
     </template>
 
     <template id="3rdparty_lib" template="common_settings,anylib">
-        <libname>$(id)$(WXDEBUGFLAG)</libname>
+        <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
     </template>
 
 
@@ -201,6 +231,7 @@
     <include file="jpeg.bkl"/>
     <include file="tiff.bkl"/>
     <include file="odbc.bkl"/>
+    <include file="expat.bkl"/>
 
     
     <!-- =============================================================== -->
@@ -222,9 +253,11 @@
         <include>$(INC_ZLIB)</include>
         <include>$(INC_ODBC)</include>
         <include>$(INC_REGEX)</include>
+        <include>$(INC_EXPAT)</include>
     </template>
 
-    <template id="wx_append">
+    <!-- for both GUI and wxBase libs/samples: -->
+    <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_TIFF)</sys-lib>
         <sys-lib>$(LIB_JPEG)</sys-lib>
@@ -232,11 +265,13 @@
         <sys-lib>$(LIB_ZLIB)</sys-lib>
         <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
+        <sys-lib>$(LIB_EXPAT)</sys-lib>
         
         <ldlibs>$(EXTRALIBS)</ldlibs>
 
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf'">
+            <sys-lib>$(UNICOWS_LIB)</sys-lib>
             <if cond="COMPILER=='bcc'">
                 <sys-lib>import32</sys-lib>
                 <sys-lib>ole2w32</sys-lib>
@@ -261,19 +296,84 @@
         </if>        
     </template>
 
+    <define-tag name="msvc-headers" rules="dll,lib">
+        <if cond="FORMAT=='msvc6prj'">
+            <msvc-project-files>
+                $(addPrefixToList('include\', wxwin.headersOnly(value)))
+            </msvc-project-files>
+        </if>
+    </define-tag>
+    
+    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
+        <if cond="FORMAT=='msvc6prj'">
+            <msvc-headers>wx/msw/setup.h</msvc-headers>
+            <set var="__custom_build_files" append="1">
+                include\wx\msw\setup.h
+            </set>
+            <set var="__custom_build_include_wx_msw_setup_h">
+Creating $(LIBDIRNAME)\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"$(LIBDIRNAME)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
+$(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
+            </set>
+        </if>
+    </define-tag>
+
+
+    <!-- for GUI libs/samples: -->
+    <template id="wx_append_nomono" template="wx_append_base_nomono">
+        <ldlibs>$(EXTRALIBS_GUI)</ldlibs>
+    </template>
+
+
+    <template id="wx_append_base" template_append="wx_append_base_nomono">
+        <!-- Always link against the wxWin library in monolithic build: -->
+        <sys-lib>$(WXLIB_MONO)</sys-lib>
+    </template>
+    <template id="wx_append" template_append="wx_append_nomono">
+        <!-- Always link against the wxWin library in monolithic build: -->
+        <sys-lib>$(WXLIB_MONO)</sys-lib>
+    </template>
+    
+
+    <set var="WX_DISABLE_PRECOMP_HEADERS" overwrite="0">0</set>
+    
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
 
-        <if cond="FORMAT!='autoconf'">
-            <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
-            <precomp-headers-gen>
-                $(WXTOPDIR)src/msw/dummy.cpp
-            </precomp-headers-gen>
+        <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
+            <if cond="FORMAT!='autoconf'">
+                <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
+                <precomp-headers-gen>
+                    $(WXTOPDIR)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_$(id)</precomp-headers-file>
+            <precomp-headers-exclude>
+                src/common/unzip.c
+                src/common/extended.c
+                src/msw/gsocket.c
+                src/msw/gsockmsw.c
+            </precomp-headers-exclude>
+        </if>
+        
+        <if cond="FORMAT=='msvc6prj' and BUILDING_LIB=='1'">
+            <msvc-file-group>Common Sources:src/common/*</msvc-file-group>
+            <msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
+            <msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
+            <msvc-file-group>wxUniv Sources:src/univ/*</msvc-file-group>
+            <msvc-file-group>wxHTML Sources:src/html/*</msvc-file-group>
+            <msvc-file-group>Setup Headers:*/setup.h</msvc-file-group>
+            <msvc-file-group>MSW Headers:*wx/msw/*.h</msvc-file-group>
+            <msvc-file-group>Generic Headers:*wx/generic/*.h</msvc-file-group>
+            <msvc-file-group>wxUniv Headers:*wx/univ/*.h</msvc-file-group>
+            <msvc-file-group>wxHTML Headers:*wx/html/*.h</msvc-file-group>
+            <msvc-file-group>Common Headers:*wx/*.h</msvc-file-group>
         </if>
-        <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
-        <precomp-headers>on</precomp-headers>
-        <precomp-headers-file>wxprec_$(id)</precomp-headers-file>
     </template>
 
     <template id="wx_dll_b" template="wx_lib_b">
@@ -284,22 +384,78 @@
         <mac_version>$(WXMACVERSION)</mac_version>
     </template>
 
-    <template id="wx_lib" template="wx_lib_b"/>
-    <template id="wx_dll" template="wx_dll_b" template_append="wx_append">
+    <template id="wx_3rdparty_dependencies">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
+        <depends>wxexpat</depends>
         <depends>wxzlib</depends>
         <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
     
+    <template id="wx_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
+    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_dependencies">
+        <define>wxUSE_GUI=0</define> 
+    </template>
+
+    <template id="wx_dll" template="wx_dll_b,wx_3rdparty_dependencies"
+                          template_append="wx_append_nomono"/>
+    <template id="wx_base_dll" template="wx_dll_b,wx_3rdparty_dependencies"
+                               template_append="wx_append_base_nomono">
+        <define>wxUSE_GUI=0</define> 
+    </template>
+                           
+    <!-- =============================================================== -->
+    <!--             Templates for building wxWindows plugins:           -->
+    <!-- =============================================================== -->
+
+    <if cond="WX_STABLE_BRANCH=='1'">
+        <set var="PLUGIN_VERSION">
+            <if cond="PLATFORM_UNIX=='1'">
+                -$(WXVER_MAJOR).$(WXVER_MINOR)
+            </if>
+            <if cond="PLATFORM_UNIX=='0'">
+                $(WXVER_MAJOR)$(WXVER_MINOR)
+            </if>
+        </set>
+    </if>
+    <if cond="WX_STABLE_BRANCH=='0'">
+        <set var="PLUGIN_VERSION">
+            <if cond="PLATFORM_UNIX=='1'">
+                -$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
+            </if>
+            <if cond="PLATFORM_UNIX=='0'">
+                $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE)
+            </if>
+        </set>
+    </if>
+
+    <define-rule name="wx-base-plugin" extends="module">
+        <template>
+            <dllname>
+                $(id)$(addPrefixIfNotEmpty('_',WXNAMESUFFIX))$(PLUGIN_VERSION)
+            </dllname>
+            <define>WXUSINGDLL</define>
+            <define>wxUSE_GUI=0</define>
+        </template>
+    </define-rule>
+    
+    <define-rule name="wx-gui-plugin" extends="module">
+        <template template="wx">
+            <dllname>
+                $(id)_$(PORTNAME)$(WXUNIVNAME)$(WXNAMESUFFIX)$(PLUGIN_VERSION)
+            </dllname>
+            <define>WXUSINGDLL</define>
+        </template>
+    </define-rule>
+    
     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->
     <!-- =============================================================== -->
 
     <!-- Link against one wxWin library. Value must be literal! -->
-    <define-tag name="wx-lib" rules="exe,dll">
+    <define-tag name="wx-lib" rules="exe,dll,module">
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
     </define-tag>