Some Motif fixes; makefile fixes; added wxTransferStreamToFile/FileToStream for wxWin

[wxWidgets.git] / utils / glcanvas / samples / penguin / Makefile

diff --git a/utils/glcanvas/samples/penguin/Makefile b/utils/glcanvas/samples/penguin/Makefile
index 0401bb93aaf3e0efae9ac4f90e04c2f97e8209cb..437f7bc1bb1ea32230fee4f1064d26713ab4c03f 100644 (file)
--- a/utils/glcanvas/samples/penguin/Makefile
+++ b/utils/glcanvas/samples/penguin/Makefile
@@ -12,25 +12,26 @@
 # on your system.
 #
 
-CPP = g++
+CPP = gcc
 CC = gcc
+WXCONFIG=../../../../wx-config
+WXINCLUDE=-I../../../../include
+WXLIB=-L../../../../lib
 
 Penguin: penguin.o trackball.o lw.o glcanvas.o
-       $(CPP) -o Penguin \
-       penguin.o trackball.o lw.o glcanvas.o \
-       `wx-config --libs` -lMesaGL -lMesaGLU
+       $(CPP) -o Penguin penguin.o trackball.o lw.o glcanvas.o `$(WXCONFIG) --libs` $(WXLIB) -lMesaGL -lMesaGLU
 
 penguin.o: penguin.cpp
-       $(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../gtk $(WXINCLUDE) -c penguin.cpp
 
 lw.o: lw.cpp
-       $(CPP) `wx-config --cflags` -I../../gtk -c lw.cpp
+       $(CPP) `$(WXCONFIG) --cflags` -I../../gtk $(WXINCLUDE) -c lw.cpp
 
 trackball.o: trackball.c
-       $(CC) `wx-config --cflags` -I../../gtk -c trackball.c
+       $(CC) `$(WXCONFIG) --cflags` -I../../gtk $(WXINCLUDE) -c trackball.c
 
 glcanvas.o: ../../gtk/glcanvas.cpp
-       $(CPP) `wx-config --cflags` `gtk-config --cflags` -I../../gtk -c ../../gtk/glcanvas.cpp
+       $(CPP) `$(WXCONFIG) --cflags` `gtk-config --cflags` -g -I../../gtk $(WXINCLUDE) -c ../../gtk/glcanvas.cpp
 
 clean: 
        rm -f *.o Penguin