making windows compilation work

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index d046fd6a587280a65c11bbbe8020dde0d088686c..fd09757a5999e0bda245b4e2a741c4ec3482790c 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -43,8 +43,8 @@
     </set>
 
     <set var="VENDORTAG">
-        <if cond="OFFICIAL_BUILD=='1'"></if>
-        <if cond="OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
+        <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">
@@ -114,13 +114,29 @@
     
     
     <!-- =============================================================== -->
-    <!--                   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>
+    $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
+    
     <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:                      -->

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 72ac723d29a58ec6eb79460900ff34248f71785c..c7bcbd6d4d98f3c0ee7adb8d51921a7fb8f562d9 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -60,6 +60,15 @@
             Use this to name your customized DLLs differently
         </description>
     </option>
+
+    <option name="CFG">
+        <default-value></default-value>
+        <description>
+            Name of your custom configuration. This affects directory
+            where object files are stored as well as the location of
+            compiled .lib files and setup.h under the lib/ toplevel directory.
+        </description>
+    </option>
         
 
 
@@ -96,7 +105,6 @@
             <if cond="BUILDING_LIB=='0'">.</if>
         </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
-        <set var="BUILDDIR">objs_$(COMPILER)</set>
     </if>
 
 </makefile>

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index f2e9b2fa75df409a65e15596cfb4cf33e98b4b6b..1d83108f64d3f2a125d4d6f84102faad56e178ae 100644 (file)
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -5,6 +5,17 @@
 #
 
 
+import utils
+
+# We use 'CFG' option in places where bakefile doesn't like it, so we must
+# register a substitution function for it that provides additional knowledge
+# about the option (in this case that it does not contain dir separators and
+# so utils.nativePaths() doesn't have to do anything with it):
+def __noopSubst(func, opt):
+    return '$(%s)' % opt.name
+utils.addSubstituteCallback('CFG', __noopSubst)
+
+
 def mk_wxid(id):
     """Creates wxWindows library identifier from bakefile target ID that
        follows this convention: DLLs end with 'dll', static libraries