Prep for wxPython 2.1b3 release

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/modules/glcanvas/build.cfg

@@ -3,7 +3,7 @@ import sys
 
 MODULE = 'glcanvasc'
 SWIGFILES = ['glcanvas.i', ]
-OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\%s' % (GENCODEDIR,)
+
 
 # Special action; for win32 we require you make the glcanvas lib. The
 # makefile will copy it to WXWIN\lib
@@ -11,10 +11,12 @@ OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\%s' % (GENCODEDIR,)
 # file ourselves...
 if sys.platform == 'win32':
     OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
+    OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\win'
 else:
     SOURCES = [GENCODEDIR+'/_glcanvas.cpp']
     print "Warning: Assuming MesaGL libraries. Override OTHERLIBS in build.local\n"\
           "         if you have native GL!"
+    OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\gtk'
     OTHERLIBS = "-lMesaGL -lMesaGLU"
     OTHERRULES = """
 $(GENCODEDIR)/_glcanvas.cpp :