From e6978d5b4de565b2fa164cdd4dd06d6021485894 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Fri, 4 Jul 2003 17:21:42 +0000
Subject: [PATCH] call base library in multilib build e.g. wx25base_bcc, not
 wx25_base_bcc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/common.bkl |  6 +++---
 build/bakefiles/wxwin.py   | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index d0d8a7bf36..2d35ed97f6 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -65,17 +65,17 @@
     </set>
 
     <if cond="FORMAT=='autoconf'">
-        <set var="WXNAMEPREFIX">wx</set>
+        <set var="WXNAMEPREFIX">wx_base</set>
         <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
         <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
     </if>
     <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="WXVERSIONTAG"></set>
     </if>
     <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>
     </set>
     <set var="WXDLLNAMEPREFIXGUI">
diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 1d83108f64..02aa76234e 100644
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -29,8 +29,8 @@ def mk_wxid(id):
 
 
 # List of library names/ids for categories with different names:
-LIBS_BASE = ['base']
-LIBS_GUI  = ['core', 'html']
+LIBS_NOGUI = ['']
+LIBS_GUI   = ['core', 'html']
 
 def mkLibName(wxid):
     """Returns string that can be used as library name, including name
@@ -38,7 +38,9 @@ def mkLibName(wxid):
        with variables defined in common.bkl!"""
     if wxid == 'mono':
         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 '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)' % wxid
 
@@ -48,7 +50,9 @@ def mkDllName(wxid):
        with variables defined in common.bkl!"""
     if wxid == 'mono':
         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 '$(WXDLLNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)' % wxid
 
-- 
2.45.2