compate charset names case-insensitively in GetEncodingFromName()

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

diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx
index 778d9051841d745abe393ba48763355e0f1bc979..bc26127d08914d44eb0b1f7f334f9e670c2c5749 100644 (file)
--- a/samples/opengl/penguin/makefile.unx
+++ b/samples/opengl/penguin/makefile.unx
@@ -11,22 +11,22 @@ 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 = $(shell wx-config --cc)

 CXX = $(shell wx-config --cxx)
 
 Penguin: penguin.o trackball.o lw.o
 CXX = $(shell wx-config --cxx)
 
 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 --cxxflags` -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 --cxxflags` -I../../gtk -c lw.cpp
+       $(CXX) `wx-config --cxxflags` -I../../gtk -c lw.cpp

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

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

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