X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82cb028026ede816b9793bb1fe6df8304f71b6cb..3d97f1823ae1bc09fe0d8b8a7bd0c3894bc6e81d:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index f882d35246..3ba7c9369c 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -3,8 +3,6 @@
 
 <makefile>
     
-    <set var="BUILDING_LIB" overwrite="0">0</set>
-
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
 
@@ -43,7 +41,12 @@
     <set var="WXCOMPILER">
         <if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
     </set>
-    
+
+    <set var="VENDORTAG">
+        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'"></if>
+        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
+    </set>
+
     <set var="WXDEBUGFLAG">
         <if cond="BUILD=='debug'">d</if>
     </set>
@@ -71,6 +74,20 @@
         <set var="WXNAMEPREFIXGUI">wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
         <set var="WXVERSIONTAG"></set>
     </if>
+    <set var="WXDLLNAMEPREFIX">
+        <if cond="PLATFORM_WIN32=='1'">wx$(WXVER_MAJOR)$(WXVER_MINOR)</if>
+        <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
+    </set>
+    <set var="WXDLLNAMEPREFIXGUI">
+        <if cond="PLATFORM_WIN32=='1'">
+            wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)
+        </if>
+        <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIXGUI)</if>
+    </set>
+    <set var="WXDLLVERSIONTAG">
+        <if cond="PLATFORM_WIN32=='1'"></if>
+        <if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
+    </set>
 
     <set var="TOOLCHAIN_NAME">
         $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
@@ -97,13 +114,28 @@
     
     
     <!-- =============================================================== -->
-    <!--                   Where to store built libraries:               -->
+    <!--             Where to store built libraries and objects:         -->
     <!-- =============================================================== -->
     
+
+    <if cond="FORMAT!='autoconf'">
+        <set var="WXDLLFLAG">
+            <if cond="SHARED=='1'">dll</if>
+        </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="BUILDDIR">$(OBJS)</set>
+    </if>
+    
     <set var="LIBDIRNAME">
         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
-        <if cond="FORMAT!='autoconf'">$(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)</if>
+        <if cond="FORMAT!='autoconf'">
+            $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
+        </if>
     </set>
+
     
     <!-- =============================================================== -->
     <!--                        Templates for libs:                      -->
@@ -114,8 +146,15 @@
         <if cond="BUILD=='release'">off</if>
     </set>
     <set var="OPTIMIZEFLAG">
-        <if cond="BUILD=='debug'">speed</if>
-        <if cond="BUILD=='release'">off</if>
+        <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="anylib">
@@ -125,7 +164,8 @@
         
         <debug-info>$(DEBUGFLAG)</debug-info>
         <optimize>$(OPTIMIZEFLAG)</optimize>
-        <threading>multi</threading>        
+        <threading>multi</threading>
+        <runtime-libs>dynamic</runtime-libs>
     </template>
 
     <template id="3rdparty_lib" template="anylib">
@@ -154,6 +194,8 @@
         <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>
@@ -166,7 +208,6 @@
     </template>
 
     <template id="wx_append">
-        <ldflags>$(EXTRALIBS)</ldflags>
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_TIFF)</sys-lib>
         <sys-lib>$(LIB_JPEG)</sys-lib>
@@ -174,6 +215,15 @@
         <sys-lib>$(LIB_ZLIB)</sys-lib>
         <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
+        
+        <ldlibs>$(EXTRALIBS)</ldlibs>
+
+        <!-- system libraries on windows: -->
+        <if cond="FORMAT!='autoconf'">
+            <if cond="COMPILER=='bcc'">
+                <sys-lib>import32</sys-lib>
+            </if>
+        </if>        
     </template>
 
     <template id="wx_lib_b" template="wx,anylib">
@@ -192,7 +242,14 @@
     </template>
 
     <template id="wx_lib" template="wx_lib_b"/>
-    <template id="wx_dll" template="wx_dll_b" template_append="wx_append"/>
+    <template id="wx_dll" template="wx_dll_b" template_append="wx_append">
+        <depends>wxtiff</depends>
+        <depends>wxjpeg</depends>
+        <depends>wxpng</depends>
+        <depends>wxzlib</depends>
+        <depends cond="FORMAT=='autoconf'">wxodbc</depends>
+        <depends>wxregex</depends>
+    </template>
     
     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->