Move oleacc.lib from the VC++ projects/makefiles to libraries.h

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

diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx
index aaea80b74bf4e74eaba8f7b749cd288cd57b3977..bc26127d08914d44eb0b1f7f334f9e670c2c5749 100644 (file)
--- a/samples/opengl/penguin/makefile.unx
+++ b/samples/opengl/penguin/makefile.unx
@@ -11,19 +11,19 @@ OPENGL_LIBS=-lGL -lGLU
 #if you have old Mesa, try this:
 #OPENGL_LIBS=-lMesaGL -lMesaGLU
 
 #if you have old Mesa, try this:
 #OPENGL_LIBS=-lMesaGL -lMesaGLU
 

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

 
 Penguin: penguin.o trackball.o lw.o
 
 Penguin: penguin.o trackball.o lw.o

-       $(CPP) -o Penguin \
+       $(CXX) -o Penguin \

        penguin.o trackball.o lw.o \
        `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
 
 penguin.o: penguin.cpp
        penguin.o trackball.o lw.o \
        `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
 
 penguin.o: penguin.cpp

-       $(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp
+       $(CXX) `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
+       $(CXX) `wx-config --cxxflags` -I../../gtk -c lw.cpp

 
 trackball.o: trackball.c
        $(CC) `wx-config --cflags` -I../../gtk -c trackball.c
 
 trackball.o: trackball.c
        $(CC) `wx-config --cflags` -I../../gtk -c trackball.c