X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fea018f8019cdbb6f3150de91d23b83c10a178b3..b22d16ad20a51052d24d538c22237c97b0ee0b53:/wxPython/setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index d9a0bb2e23..1212a3f807 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
-VERSION          = "2.3.2b2"
+VERSION          = "2.3.2b4"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
@@ -415,10 +415,8 @@ if BUILD_GLCANVAS or GL_ONLY:
 
     gl_libs = []
     if os.name == 'posix':
-        if '-D__WXDEBUG__' in cflags:
-            gl_libs = ['wx_gtkd_gl', 'GL', 'GLU']
-        else:
-            gl_libs = ['wx_gtk_gl', 'GL', 'GLU']
+        gl_libs = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
+        gl_libs = string.split(gl_libs)
     else:
         other_sources = [opj(location, 'msw/myglcanvas.cpp')]
         gl_libs = ['opengl32', 'glu32']
@@ -431,10 +429,10 @@ if BUILD_GLCANVAS or GL_ONLY:
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + gl_libs,
+                    libraries = libs,
 
                     extra_compile_args = cflags,
-                    extra_link_args = lflags,
+                    extra_link_args = gl_libs + lflags,
                     )
 
     wxpExtensions.append(ext)