cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

naming convention fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-06-29 00:03:46 +00:00
parent 8ee2dd0536
commit 4fc5f50932
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/bakefiles/common.bkl
View File

@ -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)

16
build/bakefiles/config.bkl
View File

@ -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 -->
<!-- ================================================================== -->

6
build/bakefiles/wxwin.py
View File

@ -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):