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

diff --git a/contrib/samples/gizmos/multicell/makefile.unx b/contrib/samples/gizmos/multicell/makefile.unx
index ae85345f2f63003f1c6636b4db2b673a05097e56..27d3b2952c6b102941b458f877c391cd705101d7 100644 (file)
--- a/contrib/samples/gizmos/multicell/makefile.unx
+++ b/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)

diff --git a/contrib/samples/gizmos/splittree/makefile.unx b/contrib/samples/gizmos/splittree/makefile.unx
index 7ca58131fc09f5a4eee8220b9a9d6796ebfce1af..ab2ced9e766a51ee9cf1c6917da2f765eabc3b7a 100644 (file)
--- a/contrib/samples/gizmos/splittree/makefile.unx
+++ b/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)

diff --git a/contrib/samples/ogl/ogledit/makefile.unx b/contrib/samples/ogl/ogledit/makefile.unx
index 31404938a44963c98b0096590cc4ba3851a88e58..9972f16aee0dfbec65402f4392f9ab01771cd41a 100644 (file)
--- a/contrib/samples/ogl/ogledit/makefile.unx
+++ b/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

diff --git a/contrib/samples/ogl/studio/makefile.unx b/contrib/samples/ogl/studio/makefile.unx
index 2189eaae4be1f7fcd5548798c94022cc5105cdb9..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) --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

diff --git a/demos/bombs/makefile.unx b/demos/bombs/makefile.unx
index 20a3228e72f849cd8d54e935139adda7c0355276..c6383ef8b78cd0efcd476e6a37dacc07a612a550 100644 (file)
--- a/demos/bombs/makefile.unx
+++ b/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)

diff --git a/demos/forty/makefile.unx b/demos/forty/makefile.unx
index 3623d3f33a2dc1c6b4ffe74c79c8da0745444e2b..00d37ff25b0d3725406c65c55bea2ca6be1ff8b6 100644 (file)
--- a/demos/forty/makefile.unx
+++ b/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)

diff --git a/demos/fractal/makefile.unx b/demos/fractal/makefile.unx
index 68b7ce389d0ddbf98ef235e567227c2b7d97b7e3..3101343e74526f30072a9598dfca0b234f803cd0 100644 (file)
--- a/demos/fractal/makefile.unx
+++ b/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)

diff --git a/demos/life/makefile.unx b/demos/life/makefile.unx
index 3a8141f1eb7b713326a274280e37a108d744f6ba..a39e968d176dbd94db0fdf99359e4f7b7ae98cc0 100644 (file)
--- a/demos/life/makefile.unx
+++ b/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)

diff --git a/demos/poem/makefile.unx b/demos/poem/makefile.unx
index 808a2bebc840656f43f03c272c7eff9a6ee8f83e..fe1fdce3c8a8393b7729c8d06dd4e0b761a71182 100644 (file)
--- a/demos/poem/makefile.unx
+++ b/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)

diff --git a/samples/calendar/makefile.unx b/samples/calendar/makefile.unx
index b2329a8c3c87ef4d0b9793a66e3594b27ae025f8..17fbe094e6d4b200d4b7687daaabcbc3dea1abae 100644 (file)
--- a/samples/calendar/makefile.unx
+++ b/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)

diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx
index 0bb48965a008d7207d77214f93c48f3ba5bbca71..f82a4c5990637eba90ee113de7dd1c98dcde21ff 100644 (file)
--- a/samples/caret/makefile.unx
+++ b/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)

diff --git a/samples/checklst/makefile.unx b/samples/checklst/makefile.unx
index ab8804db2ca72bb910418c2c766f2b760ba3c667..851d4cfca37cfcf5c426f6fc0ff2bd8f589d2b1d 100644 (file)
--- a/samples/checklst/makefile.unx
+++ b/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)

diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx
index 973e6256a610c9d809bfa24050cdb41b1c31ef8d..b79e2978846735d65915c7e69767e88b875a1449 100644 (file)
--- a/samples/config/makefile.unx
+++ b/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)

diff --git a/samples/console/makefile.unx b/samples/console/makefile.unx
index 21aace827bc1567ea610dae3f57e53f0acb2185a..f8962b65225b1b74abedc8f54b25c7b889352cb0 100644 (file)
--- a/samples/console/makefile.unx
+++ b/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)

diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx
index 6ca7bd454f4b735f12b82590009bc815027f1f05..6519d521e39013b7980899af0b25407eda7e5292 100644 (file)
--- a/samples/controls/makefile.unx
+++ b/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)

diff --git a/samples/db/makefile.unx b/samples/db/makefile.unx
index a896e2965c87d2dcdf2db2cd2fdd767aa6f7420d..816246660198bcacda1c6820ff2eb62ec8e57a8f 100644 (file)
--- a/samples/db/makefile.unx
+++ b/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)

diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx
index 2de880a541ee191e619c7e63869833f4c0d0775c..c9be335bcb111dc0df141dba2ea3fbcac4b10a5b 100644 (file)
--- a/samples/dialogs/makefile.unx
+++ b/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)

diff --git a/samples/dialup/makefile.unx b/samples/dialup/makefile.unx
index 45ea85294f17d9cfdba1d74ad19bda9f3d628425..0de7955967327e783c0176e24d5de60e31207bf8 100644 (file)
--- a/samples/dialup/makefile.unx
+++ b/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)

diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx
index 362470118708fefa2f2cc7d673d2d7104a31f65e..fbb90b2456160698ae8616b95235f8a47fdfadf4 100644 (file)
--- a/samples/dnd/makefile.unx
+++ b/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)

diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx
index 655b66b7590e31925f97bc4086c7a8f0c752f272..9af3b76a7ea0913494a5585dad8bc0aad8df1df1 100644 (file)
--- a/samples/docview/makefile.unx
+++ b/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)

diff --git a/samples/docvwmdi/makefile.unx b/samples/docvwmdi/makefile.unx
index 655b66b7590e31925f97bc4086c7a8f0c752f272..9af3b76a7ea0913494a5585dad8bc0aad8df1df1 100644 (file)
--- a/samples/docvwmdi/makefile.unx
+++ b/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)

diff --git a/samples/dragimag/makefile.unx b/samples/dragimag/makefile.unx
index 4abfc997167c79d3022117e144555e4d030b9e50..ad7cf511b2584ab9856c141fb32eb3917cef5949 100644 (file)
--- a/samples/dragimag/makefile.unx
+++ b/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)

diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx
index b137ddd1d41d958381e4a25fd8242aeaaf93c652..f7f9d023303cda36a6ac92a51a008e09cfd9b81c 100644 (file)
--- a/samples/drawing/makefile.unx
+++ b/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)

diff --git a/samples/dynamic/makefile.unx b/samples/dynamic/makefile.unx
index a90913c2fb221dc4207ccce2f68c33b00c1d5a91..d191d2fcc7163487d05d46132ca37715a8e249af 100644 (file)
--- a/samples/dynamic/makefile.unx
+++ b/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)

diff --git a/samples/erase/makefile.unx b/samples/erase/makefile.unx
index 31ed217aaaf43ac76b5760ecaa6a9c4afe845ef6..653c324fe5186868e1126ed0b05fe79b76a0a007 100644 (file)
--- a/samples/erase/makefile.unx
+++ b/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)

diff --git a/samples/event/makefile.unx b/samples/event/makefile.unx
index 5062d4f617db4fa625fef74dcb1ceeecb6353f1a..c31b23c009fcc7518b1b424f0d61d3c2f09db968 100644 (file)
--- a/samples/event/makefile.unx
+++ b/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)

diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx
index fdbb3cbc511899e2956314d80163bb7f7efe9838..01dc96c11fe6a60105806741e407ca9e117560cf 100644 (file)
--- a/samples/exec/makefile.unx
+++ b/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)

diff --git a/samples/font/makefile.unx b/samples/font/makefile.unx
index 0145d9434c29cb7d962a8b4cda71585d97920c02..73dd997a94905542ab3df852c394a801371bcc7f 100644 (file)
--- a/samples/font/makefile.unx
+++ b/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)

diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx
index 7c445357a66c61d9a57bc1dc0db8b557df0559c2..b0bb5f0ebe71efc9ef8b4e3c7406a950372a1684 100644 (file)
--- a/samples/grid/makefile.unx
+++ b/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)

diff --git a/samples/help/makefile.unx b/samples/help/makefile.unx
index 73ba16f9479a9cdeda805a385119a6b0645d447d..909786075ab114b4dbdd9e55998221edef8e5643 100644 (file)
--- a/samples/help/makefile.unx
+++ b/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)

diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx
index 9f68ac17b86f173df5a423ca21c33294d699b478..ab88e18b59bbbd7f81c0ce9338e673bc86994d94 100644 (file)
--- a/samples/image/makefile.unx
+++ b/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)

diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx
index e7da98471dad0a08dd14417c635d94bab4b08788..3af8359c54ce03ee31bd0480c103f505df599ed7 100644 (file)
--- a/samples/internat/makefile.unx
+++ b/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)

diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx
index 240a4d8d7b4832b2c6c9fdb756fc206fd8dfd4b8..e344ac08818ec2458c9c5cbc3dcaa134a2bbfcad 100644 (file)
--- a/samples/ipc/makefile.unx
+++ b/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)

diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx
index ba937e13dfcd2b58dbcfe40796c02530f830a285..23bdc6486ee0138f968833b8614c3332987d5646 100644 (file)
--- a/samples/joytest/makefile.unx
+++ b/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)

diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx
index 3521f1617b1918d220bf969bdcb9383b6eeab209..d03fae7a1f3a29ffeb343b0af9ba2c2b7a47dbf3 100644 (file)
--- a/samples/layout/makefile.unx
+++ b/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)

diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx
index c57c162fbdd66d64ee49a76d77383d0d2c4f49e0..44f34d670cb2ab5c3cd7f1a14f1404200e2f841f 100644 (file)
--- a/samples/listctrl/makefile.unx
+++ b/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)

diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx
index eec9d695b17e90606f695c29570bda18c251e9aa..21cb610b3c82146146334121e799f87187518316 100644 (file)
--- a/samples/mdi/makefile.unx
+++ b/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)

diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx
index 2e806b623bf28915ef7a1621fb784d571096d8b3..6e8605e394c9da8141d0ab8c218987ac5a093c76 100644 (file)
--- a/samples/memcheck/makefile.unx
+++ b/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)

diff --git a/samples/menu/makefile.unx b/samples/menu/makefile.unx
index 7a7f900211800ff5b0ce118be02953a6a424fce4..17d57205aa307e6c9cd9239591abe5e02a6d2f00 100644 (file)
--- a/samples/menu/makefile.unx
+++ b/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)

diff --git a/samples/minifram/makefile.unx b/samples/minifram/makefile.unx
index c743042307f64e51fe936c2f9c6e549e78a2c6f1..82971a6310da93dc4af706bc7ff22a629f43036e 100644 (file)
--- a/samples/minifram/makefile.unx
+++ b/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)

diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx
index 7ca58131fc09f5a4eee8220b9a9d6796ebfce1af..ab2ced9e766a51ee9cf1c6917da2f765eabc3b7a 100644 (file)
--- a/samples/minimal/makefile.unx
+++ b/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)

diff --git a/samples/newgrid/makefile.unx b/samples/newgrid/makefile.unx
index dd169f408a459a8951ecdca0524e33b418189f63..d91593e0df5bfc0d4967a88ce08897a1ae7a3657 100644 (file)
--- a/samples/newgrid/makefile.unx
+++ b/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)

diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx
index e7952d179745834dbf374652990ff06cdebcc7fa..c137b06024b561924904ea70860c0e61a810c29e 100644 (file)
--- a/samples/notebook/makefile.unx
+++ b/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)

diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx
index b68dbefcf4e49cc25bc49167c89a4c4b4010d22c..6c2b07cdc10cd4087d6e94e192380a7eceacc20b 100644 (file)
--- a/samples/opengl/cube/makefile.unx
+++ b/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)

diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx
index 1cdd977f444436bbd9c7034d61f91f95e8db1180..c0bce399417ff4517176aa6a482af8dda03fef15 100644 (file)
--- a/samples/opengl/isosurf/makefile.unx
+++ b/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)

diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx
index bfa2684f1d6ee555db657189fed8c369e57e45cb..778d9051841d745abe393ba48763355e0f1bc979 100644 (file)
--- a/samples/opengl/penguin/makefile.unx
+++ b/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

diff --git a/samples/png/makefile.unx b/samples/png/makefile.unx
index 537eaabf012a4c41b44d8193e8153c91961b57a0..158805052451b27262363db28bc9bd09315add28 100644 (file)
--- a/samples/png/makefile.unx
+++ b/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)

diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx
index 6a76b282a77475ee273a362db621958e736c5633..fc8a4663f562789b982bb9b4c794ec5717c50d1c 100644 (file)
--- a/samples/printing/makefile.unx
+++ b/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)

diff --git a/samples/proplist/makefile.unx b/samples/proplist/makefile.unx
index 15e59cc05ee16ce66bc24243b3773ecb862998dd..e7143b6c99dcfd14a5fbd26dd9021bb445d8a4bf 100644 (file)
--- a/samples/proplist/makefile.unx
+++ b/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)

diff --git a/samples/propsize/makefile.unx b/samples/propsize/makefile.unx
index ddf9816c000d3f4c2822170531ff100c060f2a7e..0b5b4a415b77a47076c7480e173be6845cbf3def 100644 (file)
--- a/samples/propsize/makefile.unx
+++ b/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)

diff --git a/samples/resource/makefile.unx b/samples/resource/makefile.unx
index 5e3defcff55f01b1443a1c58c708cf2efbe06b51..1792f2e851eeb9c5171d0656565de5e86c6e8978 100644 (file)
--- a/samples/resource/makefile.unx
+++ b/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)

diff --git a/samples/richedit/makefile.unx b/samples/richedit/makefile.unx
index a4f060f34b4169cc79fcd6523084c582d882f55d..604ae36065caf9590a4b3a7e2d8587ba95dee16c 100644 (file)
--- a/samples/richedit/makefile.unx
+++ b/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)

diff --git a/samples/rotate/makefile.unx b/samples/rotate/makefile.unx
index 530c7d8de48dc51a7feef3b33679b12344adf280..0cd9f8da10a59c14f437fc74df285b9114aeda6a 100644 (file)
--- a/samples/rotate/makefile.unx
+++ b/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)

diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx
index 643e09270d4798d235e86bca7b9e113086acbe85..8697a6362a73b429c8b5c95d5a3bdbab957377f0 100644 (file)
--- a/samples/sashtest/makefile.unx
+++ b/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)

diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx
index fc4879c13b18b563339a55e94a49d0beb8642b46..160983e3b4a95555d9966960e46adaf56f3a8223 100644 (file)
--- a/samples/scroll/makefile.unx
+++ b/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)

diff --git a/samples/scrollsub/makefile.unx b/samples/scrollsub/makefile.unx
index 3c2bc35c2fb0366d7b3cc8860ea9ef8bf1561fad..b6476d45fe0aeccec5677d43f86265c1ec75eec3 100644 (file)
--- a/samples/scrollsub/makefile.unx
+++ b/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)

diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx
index 4c3b55127a8e9f798565c905b0f38f16ce4ab9f3..c17ce68d36c5daa6e76c76c6923ba50b905de049 100644 (file)
--- a/samples/sockets/makefile.unx
+++ b/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)

diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx
index 0eedf9c3ef8d4a549e366273caca8f9a46fd1e49..951caaec6b48d0898196208440ff6632b6c3df7a 100644 (file)
--- a/samples/splitter/makefile.unx
+++ b/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)

diff --git a/samples/statbar/makefile.unx b/samples/statbar/makefile.unx
index 8906956c59adc7e46cd952b4a904bafb80f58d72..b74c2b5bfdba9dbffe2157c798cf45410447b8b5 100644 (file)
--- a/samples/statbar/makefile.unx
+++ b/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)

diff --git a/samples/tab/makefile.unx b/samples/tab/makefile.unx
index 55304b565735a73cfe009810a85613924b055a27..99cc875ad274c8b7403fd3ace2d04ea6bc300fd2 100644 (file)
--- a/samples/tab/makefile.unx
+++ b/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)

diff --git a/samples/text/makefile.unx b/samples/text/makefile.unx
index 24421279a4cfeee2d9227dd28e53546c6543612e..19a217691751d8e1dd6c716f8c544bcebce29813 100644 (file)
--- a/samples/text/makefile.unx
+++ b/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)

diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx
index e479b65e472d74baff759563ac0ff2bc4607c635..2604c437aee5e23bd9906624c1d24f8b1f43b1c8 100644 (file)
--- a/samples/thread/makefile.unx
+++ b/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)

diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx
index a4ea186d93fab21b74797a29f9d20972b5f1ddce..31b97789d036e79b3887d5703c8603bea6cc58e7 100644 (file)
--- a/samples/toolbar/makefile.unx
+++ b/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)

diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx
index 5f38c63afaa3e23e5374038366646c415dd9bd2a..cabc284bef40e87f5d2069226ebb80d8fbc06f83 100644 (file)
--- a/samples/treectrl/makefile.unx
+++ b/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)

diff --git a/samples/treelay/makefile.unx b/samples/treelay/makefile.unx
index a6c058e9ef50bb6cd56127b4c9de65d76a0711a2..468f519c0c900fab4744082eeebe052c2f8241b8 100644 (file)
--- a/samples/treelay/makefile.unx
+++ b/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)

diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx
index a4dfa43c896414f2f69deae965f7788a1cc228da..14d6679849e305b4ae67edc0ed467cdbb9451e5d 100644 (file)
--- a/samples/typetest/makefile.unx
+++ b/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)

diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx
index a35e5c2127d0c5c4b2d590d1152a036baf620807..ab717a272570cb47e92f31c0bd934927990d0e62 100644 (file)
--- a/samples/validate/makefile.unx
+++ b/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)

diff --git a/samples/wizard/makefile.unx b/samples/wizard/makefile.unx
index 985af9f68283b5732f6498cd0f104873efa673fb..ace02cfd3ad2595b5e96da63faf39c45d00a2e2e 100644 (file)
--- a/samples/wizard/makefile.unx
+++ b/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)

diff --git a/utils/tex2rtf/src/makefile.unx b/utils/tex2rtf/src/makefile.unx
index 7063ceaebc4e65693a9760e5ffc61a89f1f58c31..c4cac47118fc44e01bd282c99580016ced8dcbee 100644 (file)
--- a/utils/tex2rtf/src/makefile.unx
+++ b/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)