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

Fixed Ron's fix

Browse Source 
Upped version number (beta)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-10-04 17:12:27 +00:00
parent c0881dc32e
commit f32afe1c2c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wxPython/setup.py
View File

@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
# flags and values that affect this script # flags and values that affect this script
#---------------------------------------------------------------------- #----------------------------------------------------------------------
VERSION = "2.3.2b4" VERSION = "2.3.2b5"
DESCRIPTION = "Cross platform GUI toolkit for Python" DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn" AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>" AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
@@ -415,12 +415,13 @@ if BUILD_GLCANVAS or GL_ONLY:
gl_libs = [] gl_libs = []
if os.name == 'posix': if os.name == 'posix':
gl_libs = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1] gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
gl_libs = string.split(gl_libs) gl_lflags = string.split(gl_config) + lflags
gl_libs = libs
else: else:
other_sources = [opj(location, 'msw/myglcanvas.cpp')] other_sources = [opj(location, 'msw/myglcanvas.cpp')]
gl_libs = ['opengl32', 'glu32'] gl_libs = libs + ['opengl32', 'glu32']
gl_lflags = lflags
ext = Extension('glcanvasc', ext = Extension('glcanvasc',
swig_sources + other_sources, swig_sources + other_sources,
@@ -429,10 +430,10 @@ if BUILD_GLCANVAS or GL_ONLY:
define_macros = defines, define_macros = defines,
library_dirs = libdirs, library_dirs = libdirs,
libraries = libs, libraries = gl_libs,
extra_compile_args = cflags, extra_compile_args = cflags,
extra_link_args = gl_libs + lflags, extra_link_args = gl_lflags,
) )
wxpExtensions.append(ext) wxpExtensions.append(ext)