More updates.

Began splitting up wxEntry so wxPython can use the bits it needs
instead of copying code.


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

utils/wxPython/modules/glcanvas/build.cfg

@@ -5,10 +5,6 @@ MODULE = 'glcanvasc'
 SWIGFILES = ['glcanvas.i', ]
 
 
-# Special action; for win32 we require you make the glcanvas lib. The
-# makefile will copy it to WXWIN\lib
-# Unix make system isn't so advanced, so we'll go looking for the source
-# file ourselves...
 if sys.platform == 'win32':
 #    OTHERLIBS = '$(WXDIR)\lib\glcanvas$(LIBEXT).lib glu32.lib opengl32.lib'
 #    OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)/utils/glcanvas/win'
@@ -16,18 +12,8 @@ if sys.platform == 'win32':
 
 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 = "-lwxglcanvas -lMesaGL -lMesaGLU"
-#    OTHERRULES = """
-#$(GENCODEDIR)/_glcanvas.cpp : $(WXDIR)/utils/glcanvas/$(GENCODEDIR)/glcanvas.cpp
-#	cp $< $@
-#glcanvas.h : $(WXDIR)/utils/glcanvas/$(GENCODEDIR)/glcanvas.h
-#	cp $< $@
-#_glcanvas.o : glcanvas.h
-#"""
-
+    OTHERLIBS = "-lwx_gtk_gl -lMesaGL -lMesaGLU"