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 afa6121f6f2dbd46fd04c0b6f1682b95d01e311a..6c2b07cdc10cd4087d6e94e192380a7eceacc20b 100644 (file)
--- a/samples/opengl/cube/makefile.unx
+++ b/samples/opengl/cube/makefile.unx
@@ -9,9 +9,13 @@
 #
 # Makefile for cube example (UNIX).
 
+OPENGL_LIBS=-lGL -lGLU
+#if you have old Mesa, try this:
+#OPENGL_LIBS=-lMesaGL -lMesaGLU
+
 PROGRAM=cube
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 OBJECTS = $(PROGRAM).o
 
@@ -20,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:     .o .cpp
 
 .cpp.o :
-       $(CC) -c `wx-config --cflags` -o $@ $<
+       $(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)
-       $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl -lMesaGL -lMesaGLU
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
 
 clean: 
        rm -f *.o $(PROGRAM)