Oops, had forgotten the GL libraries for unix

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

diff --git a/utils/wxPython/modules/glcanvas/build.cfg b/utils/wxPython/modules/glcanvas/build.cfg
index b5e6a50991862f08dede37944dde6a7c2fde02b7..24103b41310c10859cf4cea83518b9ce6b017f5a 100644 (file)
--- a/utils/wxPython/modules/glcanvas/build.cfg
+++ b/utils/wxPython/modules/glcanvas/build.cfg
@@ -12,6 +12,8 @@ if sys.platform == 'win32':
     OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
 else:
     SOURCES = [GENCODEDIR+'/_glcanvas.cpp']
     OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
 else:
     SOURCES = [GENCODEDIR+'/_glcanvas.cpp']

+    print "Warning: assuming MesaGL libraries. Modify build.cfg if you have native GL!"
+    OTHERLIBS = "-lMesaGL -lMesaGLU"

     OTHERRULES = """
 $(GENCODEDIR)/_glcanvas.cpp : 
        cp $(WXDIR)/utils/glcanvas/$(GENCODEDIR)/glcanvas.cpp $@
     OTHERRULES = """
 $(GENCODEDIR)/_glcanvas.cpp : 
        cp $(WXDIR)/utils/glcanvas/$(GENCODEDIR)/glcanvas.cpp $@

diff --git a/utils/wxPython/modules/glcanvas/gtk/.cvsignore b/utils/wxPython/modules/glcanvas/gtk/.cvsignore
index 5236e1e4621a7a79cad1c2b069faaa994d1bf73b..5244f322ba8a4cf8230cb72e762892dd222a2c1f 100644 (file)
--- a/utils/wxPython/modules/glcanvas/gtk/.cvsignore
+++ b/utils/wxPython/modules/glcanvas/gtk/.cvsignore
@@ -1,2 +1,2 @@
 *~
 *~

-
+_glcanvas.cpp