From: Robin Dunn <robin@alldunn.com>
Date: Tue, 12 Oct 1999 03:04:13 +0000 (+0000)
Subject: more intelligent build for gtk
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/60a15c9b7b6732b2255c0c3a8b58917785032507

more intelligent build for gtk


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

diff --git a/utils/wxPython/modules/glcanvas/build.cfg b/utils/wxPython/modules/glcanvas/build.cfg
index 555ab8f75c..d24e39c800 100644
--- a/utils/wxPython/modules/glcanvas/build.cfg
+++ b/utils/wxPython/modules/glcanvas/build.cfg
@@ -11,14 +11,22 @@ SWIGFILES = ['glcanvas.i', ]
 # file ourselves...
 if sys.platform == 'win32':
     OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
-    OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\win'
+    OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)/utils/glcanvas/win'
+
 else:
-    SOURCES = [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 = "-lMesaGL -lMesaGLU"
-    OTHERRULES = """
-$(GENCODEDIR)/_glcanvas.cpp :
-	cp $(WXDIR)/utils/glcanvas/$(GENCODEDIR)/glcanvas.cpp $@
-"""
+    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
+#"""
+
+
+