AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the separate contrib libs on MSW too.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2003-07-26 00:20:04 +00:00
parent 408ac1b8cf
commit 3e46a8e623
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/setup.py
View File

@ -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 # wxWindows must have been built with /MD, not /MDd
# (using FINAL=hybrid will do it.) # (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': if os.name == 'posix':
libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE) libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
else: else:
libname = "FUBAR" libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name)
#raise NotImplementedError
return [libname] return [libname]
@ -719,7 +719,6 @@ if BUILD_GLCANVAS:
msg('Preparing GLCANVAS...') msg('Preparing GLCANVAS...')
location = 'contrib/glcanvas' location = 'contrib/glcanvas'
swig_files = ['glcanvas.i'] swig_files = ['glcanvas.i']
other_sources = []
swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR, swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps) USE_SWIG, swig_force, swig_args, swig_deps)
@ -730,12 +729,11 @@ if BUILD_GLCANVAS:
gl_lflags = gl_config.split() + lflags gl_lflags = gl_config.split() + lflags
gl_libs = libs gl_libs = libs
else: else:
other_sources = [opj(location, 'msw/myglcanvas.cpp')] gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
gl_libs = libs + ['opengl32', 'glu32']
gl_lflags = lflags gl_lflags = lflags
ext = Extension('glcanvasc', ext = Extension('glcanvasc',
swig_sources + other_sources, swig_sources,
include_dirs = includes, include_dirs = includes,
define_macros = defines, define_macros = defines,