Added stubs for (DeviceToLogical|LogicalToDevice)(X|Y)Rel

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index fd09757a5999e0bda245b4e2a741c4ec3482790c..450525a16dc9d83cd7e22a8bcf56c2e08532a55b 100644 (file)
--- 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="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="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>

     
     
     <!-- ================================================================== -->
     
     
     <!-- ================================================================== -->


@@ -33,6 +42,10 @@
         <if cond="USE_GUI=='0'">base</if>
         <if cond="USE_GUI=='1'">$(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)</if>
     </set>
         <if cond="USE_GUI=='0'">base</if>
         <if cond="USE_GUI=='1'">$(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)</if>
     </set>

+    
+    <set var="WXBASEPORT">
+        <if cond="TOOLKIT=='MAC'">_carbon</if>
+    </set>

 
     <set var="COMPILERORGCC">
         <if cond="isdefined('COMPILER')">$(COMPILER)</if>
 
     <set var="COMPILERORGCC">
         <if cond="isdefined('COMPILER')">$(COMPILER)</if>


@@ -65,22 +78,27 @@
     </set>
 
     <if cond="FORMAT=='autoconf'">
     </set>
 
     <if cond="FORMAT=='autoconf'">

-        <set var="WXNAMEPREFIX">wx</set>
+        <set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>

         <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
         <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
         <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
     </if>
     <if cond="FORMAT!='autoconf'">

-        <set var="WXNAMEPREFIX">wx$(WXVER_MAJOR)$(WXVER_MINOR)</set>
-        <set var="WXNAMEPREFIXGUI">wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
+        <set var="WXNAMEPREFIX">
+            wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR)
+        </set>
+        <set var="WXNAMEPREFIXGUI">
+            wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>

         <set var="WXVERSIONTAG"></set>
     </if>
     <set var="WXDLLNAMEPREFIX">
         <set var="WXVERSIONTAG"></set>
     </if>
     <set var="WXDLLNAMEPREFIX">

-        <if cond="PLATFORM_WIN32=='1'">wx$(WXVER_MAJOR)$(WXVER_MINOR)</if>
+        <if cond="PLATFORM_WIN32=='1'">
+            wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION)
+        </if>

         <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
     </set>
     <set var="WXDLLNAMEPREFIXGUI">
         <if cond="PLATFORM_WIN32=='1'">
         <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>
         </if>
         <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIXGUI)</if>
     </set>


@@ -89,10 +107,6 @@
         <if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
     </set>
 
         <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:                -->
     
     <!-- =============================================================== -->
     <!--                    Names of component libraries:                -->


@@ -101,12 +115,18 @@
     <set var="WXLIB_BASE">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
     </set>
     <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_HTML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
     </set>
     <set var="WXLIB_CORE">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</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_MONO">
         <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
 
     <set var="WXLIB_MONO">
         <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>


@@ -125,15 +145,14 @@
         <set var="CFG_NAME_PART">
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>
         <set var="CFG_NAME_PART">
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>

-        <set var="OBJS" make_var="1">objs_$(COMPILER)_$(CFG_NAME_PART)</set>
+        <set var="OBJS" make_var="1">$(COMPILER)_$(CFG_NAME_PART)</set>

         <set var="BUILDDIR">$(OBJS)</set>
     </if>
         <set var="BUILDDIR">$(OBJS)</set>
     </if>

-    $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)

     
     

-    <set var="LIBDIRNAME">
+    <set var="LIBDIRNAME" make_var="1">

         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
         <if cond="FORMAT!='autoconf'">
         <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>
 
         </if>
     </set>
 


@@ -150,19 +169,31 @@
         <if cond="BUILD=='debug'">off</if>
         <if cond="BUILD=='release'">speed</if>
     </set>
         <if cond="BUILD=='debug'">off</if>
         <if cond="BUILD=='release'">speed</if>
     </set>

+
+    <set var="DEBUG_DEFINE">
+        <if cond="FORMAT!='autoconf' and BUILD=='debug'">__WXDEBUG__</if>
+    </set>
+    <set var="UNICODE_DEFINE">
+        <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
+    </set>
+
+    <template id="common_settings">
+        <debug-info>$(DEBUGFLAG)</debug-info>
+        <optimize>$(OPTIMIZEFLAG)</optimize>
+        <threading>multi</threading>
+        <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
+        <if cond="FORMAT!='autoconf'">
+            <cppflags>$(EXTRACFLAGS)</cppflags>
+        </if>
+    </template>

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

-        <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>

         <dirname>$(LIBDIRNAME)</dirname>
         <install-to>$(LIBDIR)</install-to>
         <dirname>$(LIBDIRNAME)</dirname>
         <install-to>$(LIBDIR)</install-to>

-        
-        <debug-info>$(DEBUGFLAG)</debug-info>
-        <optimize>$(OPTIMIZEFLAG)</optimize>
-        <threading>multi</threading>        

     </template>
 
     </template>
 

-    <template id="3rdparty_lib" template="anylib">
-        <libname>$(id)$(WXDEBUGFLAG)</libname>
+    <template id="3rdparty_lib" template="common_settings,anylib">
+        <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>

     </template>
 
 
     </template>
 
 


@@ -177,16 +208,19 @@
     <include file="jpeg.bkl"/>
     <include file="tiff.bkl"/>
     <include file="odbc.bkl"/>
     <include file="jpeg.bkl"/>
     <include file="tiff.bkl"/>
     <include file="odbc.bkl"/>

+    <include file="expat.bkl"/>

 
     
     <!-- =============================================================== -->
     <!--                  Templates for wxWindows libs:                  -->
     <!-- =============================================================== -->
 
 
     
     <!-- =============================================================== -->
     <!--                  Templates for wxWindows libs:                  -->
     <!-- =============================================================== -->
 

-    <template id="wx">
+    <template id="wx" template="common_settings">

         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>
         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>

+        <define>$(DEBUG_DEFINE)</define>
+        <define>$(UNICODE_DEFINE)</define>

         <include>$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
         <include>$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>


@@ -196,10 +230,11 @@
         <include>$(INC_ZLIB)</include>
         <include>$(INC_ODBC)</include>
         <include>$(INC_REGEX)</include>
         <include>$(INC_ZLIB)</include>
         <include>$(INC_ODBC)</include>
         <include>$(INC_REGEX)</include>

+        <include>$(INC_EXPAT)</include>

     </template>
 
     </template>
 

-    <template id="wx_append">
-        <ldlibs>$(EXTRALIBS)</ldlibs>
+    <!-- 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>
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_TIFF)</sys-lib>
         <sys-lib>$(LIB_JPEG)</sys-lib>


@@ -207,15 +242,85 @@
         <sys-lib>$(LIB_ZLIB)</sys-lib>
         <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
         <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'">
+            <if cond="COMPILER=='bcc'">
+                <sys-lib>import32</sys-lib>
+                <sys-lib>ole2w32</sys-lib>
+            </if>
+            <if cond="COMPILER!='bcc'">
+                <sys-lib>kernel32</sys-lib>
+                <sys-lib>user32</sys-lib>
+                <sys-lib>gdi32</sys-lib>
+                <sys-lib>comdlg32</sys-lib>
+                <sys-lib>winspool</sys-lib>
+                <sys-lib>winmm</sys-lib>
+                <sys-lib>shell32</sys-lib>
+                <sys-lib>comctl32</sys-lib>
+                <sys-lib>odbc32</sys-lib>
+                <sys-lib>ole32</sys-lib>
+                <sys-lib>oleaut32</sys-lib>
+                <sys-lib>uuid</sys-lib>
+                <sys-lib>rpcrt4</sys-lib>
+                <sys-lib>advapi32</sys-lib>
+                <sys-lib>wsock32</sys-lib>
+            </if>
+        </if>        

     </template>
 
     </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>
+
+    <!-- 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>
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>

-        <precomp-headers>on</precomp-headers>
-        <precomp-headers-file>wxprec</precomp-headers-file>
+
+        <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>

     </template>
     </template>

-    
+

     <template id="wx_dll_b" template="wx_lib_b">
         <set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
         <dllname>$(WXDLLNAME)</dllname>
     <template id="wx_dll_b" template="wx_lib_b">
         <set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
         <dllname>$(WXDLLNAME)</dllname>


@@ -225,7 +330,27 @@
     </template>
 
     <template id="wx_lib" template="wx_lib_b"/>
     </template>
 
     <template id="wx_lib" template="wx_lib_b"/>

-    <template id="wx_dll" template="wx_dll_b" template_append="wx_append"/>
+    <template id="wx_base_lib" template="wx_lib_b"/>
+    <template id="wx_dll" template="wx_dll_b"
+                          template_append="wx_append_nomono">
+        <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_base_dll" template="wx_dll_b"
+                               template_append="wx_append_base_nomono">
+        <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>

     
     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->
     
     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->