fixes to previous commit

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

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