replaced "CC = gcc" and even stranger "CPP = gcc -g" (huh?) with

"CXX = $(shell wx-config --cxx)" in all makefile.unx


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/samples/gizmos/multicell/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for multicell example (Unix)
 # Created 2000-07-28
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = mtest
 
@@ -13,12 +13,12 @@ EXTRAINC=-I../include
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

contrib/samples/gizmos/splittree/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = minimal
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

contrib/samples/ogl/ogledit/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,19 +20,19 @@ WXLIB=-L../../../../lib -L../../../src/ogl
 OBJECTS=ogledit.o palette.o doc.o view.o
 
 ogledit: $(OBJECTS)
-	$(CPP) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
+	$(CXX) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
 
 ogledit.o: ogledit.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
 
 palette.o: palette.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c palette.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c palette.cpp
 
 doc.o: doc.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
 
 view.o: view.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
 
 clean: 
 	rm -f *.o ogledit

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) --cxxflags` -I../../src $(WXINCLUDE) -c studio.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c studio.cpp
 
 cspalette.o: cspalette.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c cspalette.cpp
 
 doc.o: doc.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp
 
 view.o: view.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp
 
 dialogs.o: dialogs.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c dialogs.cpp
 
 mainfrm.o: mainfrm.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp
 
 project.o: project.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c project.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c project.cpp
 
 shapes.o: shapes.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c shapes.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c shapes.cpp
 
 symbols.o: symbols.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c symbols.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c symbols.cpp
 
 csprint.o: csprint.cpp
-	$(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c csprint.cpp
+	$(CXX) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c csprint.cpp
 
 clean: 
 	rm -f *.o studio

demos/bombs/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = bombs
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o game.o bombs1.o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

demos/forty/makefile.unx

@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o canvas.o card.o game.o pile.o playerdg.o scoredg.o scoref
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

demos/fractal/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = fractal
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

demos/life/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = life
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o dialogs.o game.o reader.o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

demos/poem/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = wxpoem
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/calendar/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for calendar example (Unix)
 # Created: 2000-01-03
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = calendar
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/caret/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = caret
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/checklst/makefile.unx

@@ -15,7 +15,7 @@
 
 PROGRAM = checklst
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 OBJECTS = $(PROGRAM).o
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/config/makefile.unx

@@ -15,7 +15,7 @@
 
 PROGRAM = config
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 OBJECTS = $(PROGRAM).o
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/console/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = console
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/controls/makefile.unx

@@ -15,7 +15,7 @@
 
 PROGRAM = controls
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 OBJECTS = $(PROGRAM).o
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/db/makefile.unx

@@ -15,7 +15,7 @@
 
 PROGRAM = dbtest
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 OBJECTS = $(PROGRAM).o listdb.o
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o listdb.o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/dialogs/makefile.unx

@@ -15,7 +15,7 @@
 
 PROGRAM = dialogs
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 OBJECTS = $(PROGRAM).o
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/dialup/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = nettest
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/dnd/makefile.unx

@@ -15,7 +15,7 @@
 
 PROGRAM = dnd
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 OBJECTS = $(PROGRAM).o
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/docview/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = docview
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o view.o doc.o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/docvwmdi/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = docview
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o view.o doc.o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/dragimag/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for dragimag example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = dragimag
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/drawing/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = drawing
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/dynamic/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = dynamic
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/erase/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = erase
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/event/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for event example (Unix)
 # Created: 2001-01-31
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = event
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/exec/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for exec example (Unix)
 # Created: 2000-03-14
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = exec
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/font/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = font
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/grid/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for grid example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = grid
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/help/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = demo
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/image/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = image
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/internat/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = internat
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/ipc/makefile.unx

@@ -2,7 +2,7 @@
 # Created: 2000-03-14
 # hand hacked from template file by Ron <ron@debian.org>
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAMS = client server
 
@@ -11,15 +11,15 @@ PROGRAMS = client server
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all: $(PROGRAMS)
 
 client: client.o
-	$(CC) -o $@ $< `wx-config --libs`
+	$(CXX) -o $@ $< `wx-config --libs`
 
 server: server.o
-	$(CC) -o $@ $< `wx-config --libs`
+	$(CXX) -o $@ $< `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAMS)

samples/joytest/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for joytest example (Unix)
 # Created: 2000-03-14
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = joytest
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/layout/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = layout
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/listctrl/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = listtest
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/mdi/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = mdi
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/memcheck/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = memcheck
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/menu/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = menu
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/minifram/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for minifram example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = minifram
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/minimal/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = minimal
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/newgrid/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = griddemo
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/notebook/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for notebook example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = notebook
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/opengl/cube/makefile.unx

@@ -15,7 +15,7 @@ OPENGL_LIBS=-lGL -lGLU
 
 PROGRAM=cube
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 OBJECTS = $(PROGRAM).o
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/opengl/isosurf/makefile.unx

@@ -15,7 +15,7 @@ OPENGL_LIBS=-lGL -lGLU
 
 PROGRAM=isosurf
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 OBJECTS = $(PROGRAM).o
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all: $(PROGRAM) isosurf.dat
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/opengl/penguin/makefile.unx

@@ -12,7 +12,7 @@ OPENGL_LIBS=-lGL -lGLU
 #OPENGL_LIBS=-lMesaGL -lMesaGLU
 
 CPP = g++
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 Penguin: penguin.o trackball.o lw.o
 	$(CPP) -o Penguin \
@@ -26,7 +26,7 @@ lw.o: lw.cpp
 	$(CPP) `wx-config --cxxflags` -I../../gtk -c lw.cpp
 
 trackball.o: trackball.c
-	$(CC) `wx-config --cxxflags` -I../../gtk -c trackball.c
+	$(CXX) `wx-config --cxxflags` -I../../gtk -c trackball.c
 
 clean: 
 	rm -f *.o Penguin

samples/png/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = pngdemo
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/printing/makefile.unx

@@ -13,16 +13,16 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = printing
 
 $(PROGRAM): $(PROGRAM).o
-	$(CC) -o $(PROGRAM) \
+	$(CXX) -o $(PROGRAM) \
 	$(PROGRAM).o `wx-config --libs`
 
 $(PROGRAM).o: $(PROGRAM).cpp
-	$(CC) `wx-config --cxxflags` -c $(PROGRAM).cpp
+	$(CXX) `wx-config --cxxflags` -c $(PROGRAM).cpp
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/proplist/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for proplist example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = proplist
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/propsize/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for propsize example (Unix)
 # Created: 2000-03-14
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = propsize
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/resource/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = resource
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/richedit/makefile.unx

@@ -2,7 +2,7 @@
 # Created: 2000-03-14
 # hand hacked from template file by Ron <ron@debian.org>
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = wxLayout
 
@@ -13,10 +13,10 @@ OBJECTS = $(PROGRAM).o kbList.o wxllist.o wxlparser.o wxlwindow.o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 $(PROGRAM): $(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 	
 clean:
 	rm -f *.o $(PROGRAM)

samples/rotate/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = rotate
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/sashtest/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for sashtest example (Unix)
 # Created: 2000-03-14
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = sashtest
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/scroll/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = scroll
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/scrollsub/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = scrollsub
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/sockets/makefile.unx

@@ -2,7 +2,7 @@
 # Created: 2000-03-14
 # hand hacked from template file by Ron <ron@debian.org>
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAMS = client server
 
@@ -11,15 +11,15 @@ PROGRAMS = client server
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all: $(PROGRAMS)
 
 client: client.o
-	$(CC) -o $@ $< `wx-config --libs`
+	$(CXX) -o $@ $< `wx-config --libs`
 
 server: server.o
-	$(CC) -o $@ $< `wx-config --libs`
+	$(CXX) -o $@ $< `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAMS)

samples/splitter/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for splitter example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = splitter
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/statbar/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for statbar example (Unix)
 # Created: 2000-02-04
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = statbar
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/tab/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for tab example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = tab
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/text/makefile.unx

@@ -13,7 +13,7 @@
 # under Linux.
 #
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = text
 
@@ -24,12 +24,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)

samples/thread/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for thread example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = thread
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/toolbar/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for toolbar example (Unix)
 # Created: 2000-03-14
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = toolbar
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/treectrl/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for treectrl example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = treectrl
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/treelay/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for treelay example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = treelay
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/typetest/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for typetest example (Unix)
 # Created: 2000-03-14
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = typetest
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/validate/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for validate example (Unix)
 # Created: 2000-03-14
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = validate
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

samples/wizard/makefile.unx

@@ -1,7 +1,7 @@
 # Purpose: makefile for wizard example (Unix)
 # Created: 2000-03-15
 
-CC = gcc
+CXX = $(shell wx-config --cxx)
 
 PROGRAM = wizard
 
@@ -12,12 +12,12 @@ OBJECTS = $(PROGRAM).o
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)

utils/tex2rtf/src/makefile.unx

@@ -11,12 +11,12 @@ OBJECTS = tex2rtf.o tex2any.o texutils.o rtfutils.o xlputils.o htmlutil.o readsh
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CC) -c `wx-config --cxxflags` -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)