setup.py.rej - rejected patch

setup.py.rej (text/plain), 2.96 KB, created by Mike Verdone on 2003-02-20 22:30:34 UTC

***************
*** 500,542 ****
  #----------------------------------------------------------------------
  # Define the GLCanvas extension module
  #----------------------------------------------------------------------
- 
- CTRB_SRC =  opj(WXDIR, 'contrib/src')
- CTRB_INC =  opj(WXDIR, 'contrib/include/wx')
- 
- if BUILD_GLCANVAS or GL_ONLY:
-     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)
- 
-     gl_libs = []
-     if os.name == 'posix':
-         gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
-         gl_lflags = string.split(gl_config) + lflags
-         gl_libs = libs
-     else:
-         other_sources = [opj(location, 'msw/myglcanvas.cpp')]
-         gl_libs = libs + ['opengl32', 'glu32']
-         gl_lflags = lflags
- 
-     ext = Extension('glcanvasc',
-                     swig_sources + other_sources,
- 
-                     include_dirs = includes,
-                     define_macros = defines,
- 
-                     library_dirs = libdirs,
-                     libraries = gl_libs,
- 
-                     extra_compile_args = cflags,
-                     extra_link_args = gl_lflags,
-                     )
- 
-     wxpExtensions.append(ext)
  
  
  #----------------------------------------------------------------------
--- 500,542 ----
  #----------------------------------------------------------------------
  # Define the GLCanvas extension module
  #----------------------------------------------------------------------
+ #
+ #CTRB_SRC =  opj(WXDIR, 'contrib/src')
+ #CTRB_INC =  opj(WXDIR, 'contrib/include/wx')
+ #
+ #if BUILD_GLCANVAS or GL_ONLY:
+ #    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)
+ #
+ #    gl_libs = []
+ #    if os.name == 'posix':
+ #        gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
+ #        gl_lflags = string.split(gl_config) + lflags
+ #        gl_libs = libs
+ #    else:
+ #        other_sources = [opj(location, 'msw/myglcanvas.cpp')]
+ #        gl_libs = libs + ['opengl32', 'glu32']
+ #        gl_lflags = lflags
+ #
+ #    ext = Extension('glcanvasc',
+ #                    swig_sources + other_sources,
+ #
+ #                    include_dirs = includes,
+ #                    define_macros = defines,
+ #
+ #                    library_dirs = libdirs,
+ #                    libraries = gl_libs,
+ #
+ #                    extra_compile_args = cflags,
+ #                    extra_link_args = gl_lflags,
+ #                    )
+ #
+ #    wxpExtensions.append(ext)
  
  
  #----------------------------------------------------------------------