Some Motif fixes; makefile fixes; added wxTransferStreamToFile/FileToStream for wxWin

[wxWidgets.git] / utils / glcanvas / samples / isosurf / Makefile

diff --git a/utils/glcanvas/samples/isosurf/Makefile b/utils/glcanvas/samples/isosurf/Makefile
index 7722db17b040da8865a1d6d0a85422a026dd06ce..97ba2a59b1774edf37c831e24ad732f278b4005f 100644 (file)
--- a/utils/glcanvas/samples/isosurf/Makefile
+++ b/utils/glcanvas/samples/isosurf/Makefile
@@ -1,16 +1,32 @@
+#
+# File:                Makefile
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# Makefile for OpenGl demo (GTK version)
+#
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
+#
 
 CC = g++
+WXCONFIG=../../../../wx-config
+WXINCLUDE=-I../../../../include
+WXLIB=-L../../../../lib
 
 isosurf: isosurf.o glcanvas.o
        $(CC) -o isosurf \
        isosurf.o glcanvas.o \
-       `wx-config --libs` -lMesaGL -lMesaGLU
+       `$(WXCONFIG) --libs` $(WXLIB) -lMesaGL -lMesaGLU
 
 isosurf.o: isosurf.cpp
-       $(CC) `wx-config --cflags` -I../../src -c isosurf.cpp
+       $(CC) `$(WXCONFIG) --cflags` -I../../gtk $(WXINCLUDE) -c isosurf.cpp
 
-glcanvas.o: ../../src/glcanvas.cpp
-       $(CC) `wx-config --cflags` `gtk-config --cflags` -I../../src -c ../../src/glcanvas.cpp
+glcanvas.o: ../../gtk/glcanvas.cpp
+       $(CC) `$(WXCONFIG) --cflags` `gtk-config --cflags` -I../../gtk -c $(WXINCLUDE) ../../gtk/glcanvas.cpp
 
 clean: 
-       rm -f *.o cube
+       rm -f *.o isosurf