fixes to previous commit

[wxWidgets.git] / samples / opengl / isosurf / makefile.unx

diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx
index 2c0a36480812c29bd807936e6a6330aab3fdca3a..c0bce399417ff4517176aa6a482af8dda03fef15 100644 (file)
--- a/samples/opengl/isosurf/makefile.unx
+++ b/samples/opengl/isosurf/makefile.unx
@@ -9,18 +9,30 @@
 #
 # Makefile for isosurf example (UNIX).
 
+OPENGL_LIBS=-lGL -lGLU
+#if you have old Mesa, try this:
+#OPENGL_LIBS=-lMesaGL -lMesaGLU
+
 PROGRAM=isosurf
 
-OPENGLHOME=/home/jacs/mesa/Mesa-2.3
+CXX = $(shell wx-config --cxx)
+
+OBJECTS = $(PROGRAM).o
+
+# implementation
+
+.SUFFIXES:     .o .cpp
+
+.cpp.o :
+       $(CXX) -c `wx-config --cxxflags` -o $@ $<
 
-EXTRACPPFLAGS=-I$(OPENGLHOME)/include
-EXTRALDFLAGS=-L$(OPENGLHOME)/lib
-EXTRALDLIBS=-lMesaGL -lMesaGLU
+all: $(PROGRAM) isosurf.dat
 
-OBJECTS=$(PROGRAM).o
-EXTRATARGETS=isosurf.dat
+$(PROGRAM):    $(OBJECTS)
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
 
-include ../../../src/makeprog.env
+clean: 
+       rm -f *.o $(PROGRAM)
 
 isosurf.dat:   isosurf.dat.gz
        gzip -c -d isosurf.dat.gz > isosurf.dat