Tools

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

diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx
index 2add0896b3053967a63bda0deee4683344906ff8..778d9051841d745abe393ba48763355e0f1bc979 100644 (file)
--- a/samples/opengl/penguin/makefile.unx
+++ b/samples/opengl/penguin/makefile.unx
@@ -7,22 +7,26 @@
 #
 # Makefile for penguin example (UNIX).
 
 #
 # Makefile for penguin example (UNIX).
 

+OPENGL_LIBS=-lGL -lGLU
+#if you have old Mesa, try this:
+#OPENGL_LIBS=-lMesaGL -lMesaGLU
+

 CPP = g++
 CPP = g++

-CC = gcc
+CXX = $(shell wx-config --cxx)

 
 Penguin: penguin.o trackball.o lw.o
        $(CPP) -o Penguin \
        penguin.o trackball.o lw.o \
 
 Penguin: penguin.o trackball.o lw.o
        $(CPP) -o Penguin \
        penguin.o trackball.o lw.o \

-       `wx-config --libs` -lwx_gtk_gl -lMesaGL -lMesaGLU
+       `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)

 
 penguin.o: penguin.cpp
 
 penguin.o: penguin.cpp

-       $(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp
+       $(CPP) `wx-config --cxxflags` -I../../gtk -c penguin.cpp

 
 lw.o: lw.cpp
 
 lw.o: lw.cpp

-       $(CPP) `wx-config --cflags` -I../../gtk -c lw.cpp
+       $(CPP) `wx-config --cxxflags` -I../../gtk -c lw.cpp

 
 trackball.o: trackball.c
 
 trackball.o: trackball.c

-       $(CC) `wx-config --cflags` -I../../gtk -c trackball.c
+       $(CXX) `wx-config --cxxflags` -I../../gtk -c trackball.c

 
 clean: 
        rm -f *.o Penguin
 
 clean: 
        rm -f *.o Penguin