naming convention fixes

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 99fd3ae4b04a8d64735da4b3fa8c5ccf89740db9..d046fd6a587280a65c11bbbe8020dde0d088686c 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -41,7 +41,12 @@
     <set var="WXCOMPILER">
         <if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
     </set>
-    
+
+    <set var="VENDORTAG">
+        <if cond="OFFICIAL_BUILD=='1'"></if>
+        <if cond="OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
+    </set>
+
     <set var="WXDEBUGFLAG">
         <if cond="BUILD=='debug'">d</if>
     </set>
@@ -69,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)

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index cc0e95b2cbc7b30d27bb68db0d585ece619306ce..72ac723d29a58ec6eb79460900ff34248f71785c 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -47,6 +47,22 @@
     </option>
 
 
+    <option name="OFFICIAL_BUILD">
+        <values>0 1</values>
+        <default-value>0</default-value>
+        <description>
+            Is this official build by wxWindows developers?
+        </description>
+    </option>
+    <option name="VENDOR">
+        <default-value>custom</default-value>
+        <description>
+            Use this to name your customized DLLs differently
+        </description>
+    </option>
+        
+
+
     <!-- ================================================================== -->
     <!--                             Autoconf                               -->
     <!-- ================================================================== -->

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 3397dc54bd5ef153864b3e1ed27797938fa85c10..f2e9b2fa75df409a65e15596cfb4cf33e98b4b6b 100644 (file)
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -36,10 +36,10 @@ def mkDllName(wxid):
        suffixes, prefixes, version tags etc. This must be kept in sync
        with variables defined in common.bkl!"""
     if wxid == 'mono':
-        return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXCOMPILER)$(WXVERSIONTAG)'
+        return '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)'
     if wxid in LIBS_BASE:
-        return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(WXVERSIONTAG)' % wxid
-    return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(WXVERSIONTAG)' % wxid
+        return '$(WXDLLNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' % wxid
+    return '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' % wxid
 
 
 def libToLink(wxlibname):