code cleanup

[wxWidgets.git] / utils / wxPython / modules / glcanvas / build.cfg

diff --git a/utils/wxPython/modules/glcanvas/build.cfg b/utils/wxPython/modules/glcanvas/build.cfg
index 24103b41310c10859cf4cea83518b9ce6b017f5a..dea7ca86f8d5828528bf3d4823f4031656cf5b00 100644 (file)
--- a/utils/wxPython/modules/glcanvas/build.cfg
+++ b/utils/wxPython/modules/glcanvas/build.cfg
@@ -3,18 +3,30 @@ 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
 # 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.lib glu32.lib opengl32.lib'
+    OTHERLIBS = '$(WXDIR)\lib\glcanvas$(LIBEXT).lib glu32.lib opengl32.lib'
+    OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)/utils/glcanvas/win'
+
 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 $@
-"""
+
+#    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
+#"""
+
+
+