Fixed compile error (seen on OS/2).

[wxWidgets.git] / contrib / samples / ogl / studio / makefile.unx

diff --git a/contrib/samples/ogl/studio/makefile.unx b/contrib/samples/ogl/studio/makefile.unx
index 2070bc3b1303788a6f7c5d3949a61c76c87f0ff2..51a15a4d4fd1e91889e07a5bfe9bb036121af41e 100644 (file)
--- a/contrib/samples/ogl/studio/makefile.unx
+++ b/contrib/samples/ogl/studio/makefile.unx
@@ -12,8 +12,7 @@
 # on your system.
 #
 
-CPP = gcc -g
-CC = gcc
+CXX = $(shell wx-config --cxx)
 WXCONFIG=../../../../wx-config
 WXINCLUDE=-I../../../../include -I../../../include
 WXLIB=-L../../../../lib -L../../../src/ogl
@@ -21,37 +20,37 @@ WXLIB=-L../../../../lib -L../../../src/ogl
 OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o
 
 studio: $(OBJECTS)
-       $(CPP) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
+       $(CXX) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
 
 studio.o: studio.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c studio.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c studio.cpp
 
 cspalette.o: cspalette.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
 
 doc.o: doc.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
 
 view.o: view.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
 
 dialogs.o: dialogs.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
 
 mainfrm.o: mainfrm.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
 
 project.o: project.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c project.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c project.cpp
 
 shapes.o: shapes.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c shapes.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c shapes.cpp
 
 symbols.o: symbols.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c symbols.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c symbols.cpp
 
 csprint.o: csprint.cpp
-       $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c csprint.cpp
+       $(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c csprint.cpp
 
 clean: 
        rm -f *.o studio