From b7cf4388047298ca0ba5d50a1c6606b5b90f8f89 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 1 Dec 2012 01:16:49 +0000 Subject: [PATCH] MSW build fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- buildtools/config.py | 7 ++++--- wscript | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/buildtools/config.py b/buildtools/config.py index 6f734c14..a3f42c56 100644 --- a/buildtools/config.py +++ b/buildtools/config.py @@ -454,15 +454,16 @@ class Configuration(object): return file_list - def makeLibName(self, name, checkMonolithic=False): + def makeLibName(self, name, checkMonolithic=False, isMSWBase=False): if checkMonolithic and self.MONOLITHIC: return [] + basename = 'base' if isMSWBase else 'msw' if os.name == 'posix' or self.COMPILER == 'mingw32': libname = '%s_%s-%s' % (self.WXBASENAME, name, self.WXRELEASE) elif name: - libname = 'wxmsw%s%s_%s' % (self.WXDLLVER, self.libFlag(), name) + libname = 'wx%s%s%s_%s' % (basename, self.WXDLLVER, self.libFlag(), name) else: - libname = 'wxmsw%s%s' % (self.WXDLLVER, self.libFlag()) + libname = 'wx%s%s%s' % (basename, self.WXDLLVER, self.libFlag()) return [libname] diff --git a/wscript b/wscript index 47fe6fb8..c61b82e4 100644 --- a/wscript +++ b/wscript @@ -94,10 +94,10 @@ def configure(conf): conf.env.LIB_WXWEBVIEW += cfg.makeLibName('webview') _copyEnvGroup(conf.env, '_WX', '_WXXML') - conf.env.LIB_WXWEBVIEW += cfg.makeLibName('xml') + conf.env.LIB_WXXML += cfg.makeLibName('xml', isMSWBase=True) _copyEnvGroup(conf.env, '_WX', '_WXXRC') - conf.env.LIB_WXWEBVIEW += cfg.makeLibName('xrc') + conf.env.LIB_WXXRC += cfg.makeLibName('xrc')