From 3e46a8e623a425608a2e68d3ef1540d6ac8cea14 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 26 Jul 2003 00:20:04 +0000 Subject: [PATCH] Use the separate contrib libs on MSW too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/setup.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/wxPython/setup.py b/wxPython/setup.py index 270bfbb335..80036ac9d3 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -106,7 +106,8 @@ HYBRID = 1 # If set and not debug or FINAL, then build a # wxWindows must have been built with /MD, not /MDd # (using FINAL=hybrid will do it.) -WXDLLVER = '25' # Version part of wxWindows DLL name + # Version part of wxWindows LIB/DLL names +WXDLLVER = '%d%d' % (VER_MAJOR, VER_MINOR) #---------------------------------------------------------------------- @@ -321,8 +322,7 @@ def makeLibName(name): if os.name == 'posix': libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE) else: - libname = "FUBAR" - #raise NotImplementedError + libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name) return [libname] @@ -719,7 +719,6 @@ if BUILD_GLCANVAS: msg('Preparing GLCANVAS...') location = 'contrib/glcanvas' swig_files = ['glcanvas.i'] - other_sources = [] swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps) @@ -730,12 +729,11 @@ if BUILD_GLCANVAS: gl_lflags = gl_config.split() + lflags gl_libs = libs else: - other_sources = [opj(location, 'msw/myglcanvas.cpp')] - gl_libs = libs + ['opengl32', 'glu32'] + gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl') gl_lflags = lflags ext = Extension('glcanvasc', - swig_sources + other_sources, + swig_sources, include_dirs = includes, define_macros = defines,