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

call base library in multilib build e.g. wx25base_bcc, not wx25_base_bcc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-04 17:21:42 +00:00
parent c5c570b934
commit e6978d5b4d
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/bakefiles/common.bkl
View File

@@ -65,17 +65,17 @@
</set> </set>
<if cond="FORMAT=='autoconf'"> <if cond="FORMAT=='autoconf'">
<set var="WXNAMEPREFIX">wx</set> <set var="WXNAMEPREFIX">wx_base</set>
<set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set> <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
<set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set> <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
</if> </if>
<if cond="FORMAT!='autoconf'"> <if cond="FORMAT!='autoconf'">
<set var="WXNAMEPREFIX">wx$(WXVER_MAJOR)$(WXVER_MINOR)</set> <set var="WXNAMEPREFIX">wxbase$(WXVER_MAJOR)$(WXVER_MINOR)</set>
<set var="WXNAMEPREFIXGUI">wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set> <set var="WXNAMEPREFIXGUI">wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
<set var="WXVERSIONTAG"></set> <set var="WXVERSIONTAG"></set>
</if> </if>
<set var="WXDLLNAMEPREFIX"> <set var="WXDLLNAMEPREFIX">
<if cond="PLATFORM_WIN32=='1'">wx$(WXVER_MAJOR)$(WXVER_MINOR)</if> <if cond="PLATFORM_WIN32=='1'">wxbase$(WXVER_MAJOR)$(WXVER_MINOR)</if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if> <if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
</set> </set>
<set var="WXDLLNAMEPREFIXGUI"> <set var="WXDLLNAMEPREFIXGUI">

10
build/bakefiles/wxwin.py
View File

@@ -29,7 +29,7 @@ def mk_wxid(id):
# List of library names/ids for categories with different names: # List of library names/ids for categories with different names:
LIBS_BASE = ['base'] LIBS_NOGUI = ['']
LIBS_GUI = ['core', 'html'] LIBS_GUI = ['core', 'html']
def mkLibName(wxid): def mkLibName(wxid):
@@ -38,7 +38,9 @@ def mkLibName(wxid):
with variables defined in common.bkl!""" with variables defined in common.bkl!"""
if wxid == 'mono': if wxid == 'mono':
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXVERSIONTAG)' return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXVERSIONTAG)'
if wxid in LIBS_BASE: if wxid == 'base':
return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)$(WXVERSIONTAG)'
if wxid in LIBS_NOGUI:
return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)' % wxid return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)' % wxid
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)' % wxid return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)' % wxid
@@ -48,7 +50,9 @@ def mkDllName(wxid):
with variables defined in common.bkl!""" with variables defined in common.bkl!"""
if wxid == 'mono': if wxid == 'mono':
return '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' return '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)'
if wxid in LIBS_BASE: if wxid == 'base':
return '$(WXDLLNAMEPREFIX)$(WXNAMESUFFIX)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)'
if wxid in LIBS_NOGUI:
return '$(WXDLLNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' % wxid return '$(WXDLLNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' % wxid
return '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' % wxid return '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' % wxid