From a6f762a646e1288dcc4be6fc9ccc22d9a88c2a0f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 28 Nov 2001 18:10:15 +0000 Subject: [PATCH] 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 | 6 ++--- contrib/samples/gizmos/splittree/makefile.unx | 6 ++--- contrib/samples/ogl/ogledit/makefile.unx | 13 +++++----- contrib/samples/ogl/studio/makefile.unx | 25 +++++++++---------- demos/bombs/makefile.unx | 6 ++--- demos/forty/makefile.unx | 4 +-- demos/fractal/makefile.unx | 6 ++--- demos/life/makefile.unx | 6 ++--- demos/poem/makefile.unx | 6 ++--- samples/calendar/makefile.unx | 6 ++--- samples/caret/makefile.unx | 6 ++--- samples/checklst/makefile.unx | 6 ++--- samples/config/makefile.unx | 6 ++--- samples/console/makefile.unx | 6 ++--- samples/controls/makefile.unx | 6 ++--- samples/db/makefile.unx | 6 ++--- samples/dialogs/makefile.unx | 6 ++--- samples/dialup/makefile.unx | 6 ++--- samples/dnd/makefile.unx | 6 ++--- samples/docview/makefile.unx | 6 ++--- samples/docvwmdi/makefile.unx | 6 ++--- samples/dragimag/makefile.unx | 6 ++--- samples/drawing/makefile.unx | 6 ++--- samples/dynamic/makefile.unx | 6 ++--- samples/erase/makefile.unx | 6 ++--- samples/event/makefile.unx | 6 ++--- samples/exec/makefile.unx | 6 ++--- samples/font/makefile.unx | 6 ++--- samples/grid/makefile.unx | 6 ++--- samples/help/makefile.unx | 6 ++--- samples/image/makefile.unx | 6 ++--- samples/internat/makefile.unx | 6 ++--- samples/ipc/makefile.unx | 8 +++--- samples/joytest/makefile.unx | 6 ++--- samples/layout/makefile.unx | 6 ++--- samples/listctrl/makefile.unx | 6 ++--- samples/mdi/makefile.unx | 6 ++--- samples/memcheck/makefile.unx | 6 ++--- samples/menu/makefile.unx | 6 ++--- samples/minifram/makefile.unx | 6 ++--- samples/minimal/makefile.unx | 6 ++--- samples/newgrid/makefile.unx | 6 ++--- samples/notebook/makefile.unx | 6 ++--- samples/opengl/cube/makefile.unx | 6 ++--- samples/opengl/isosurf/makefile.unx | 6 ++--- samples/opengl/penguin/makefile.unx | 4 +-- samples/png/makefile.unx | 6 ++--- samples/printing/makefile.unx | 6 ++--- samples/proplist/makefile.unx | 6 ++--- samples/propsize/makefile.unx | 6 ++--- samples/resource/makefile.unx | 6 ++--- samples/richedit/makefile.unx | 6 ++--- samples/rotate/makefile.unx | 6 ++--- samples/sashtest/makefile.unx | 6 ++--- samples/scroll/makefile.unx | 6 ++--- samples/scrollsub/makefile.unx | 6 ++--- samples/sockets/makefile.unx | 8 +++--- samples/splitter/makefile.unx | 6 ++--- samples/statbar/makefile.unx | 6 ++--- samples/tab/makefile.unx | 6 ++--- samples/text/makefile.unx | 6 ++--- samples/thread/makefile.unx | 6 ++--- samples/toolbar/makefile.unx | 6 ++--- samples/treectrl/makefile.unx | 6 ++--- samples/treelay/makefile.unx | 6 ++--- samples/typetest/makefile.unx | 6 ++--- samples/validate/makefile.unx | 6 ++--- samples/wizard/makefile.unx | 6 ++--- utils/tex2rtf/src/makefile.unx | 4 +-- 69 files changed, 218 insertions(+), 220 deletions(-) diff --git a/contrib/samples/gizmos/multicell/makefile.unx b/contrib/samples/gizmos/multicell/makefile.unx index ae85345f2f..27d3b2952c 100644 --- 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 7ca58131fc..ab2ced9e76 100644 --- 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 31404938a4..9972f16aee 100644 --- 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 2189eaae4b..51a15a4d4f 100644 --- 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 20a3228e72..c6383ef8b7 100644 --- 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 3623d3f33a..00d37ff25b 100644 --- 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 68b7ce389d..3101343e74 100644 --- 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 3a8141f1eb..a39e968d17 100644 --- 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 808a2bebc8..fe1fdce3c8 100644 --- 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 b2329a8c3c..17fbe094e6 100644 --- 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 0bb48965a0..f82a4c5990 100644 --- 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 ab8804db2c..851d4cfca3 100644 --- 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 973e6256a6..b79e297884 100644 --- 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 21aace827b..f8962b6522 100644 --- 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 6ca7bd454f..6519d521e3 100644 --- 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 a896e2965c..8162466601 100644 --- 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 2de880a541..c9be335bcb 100644 --- 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 45ea85294f..0de7955967 100644 --- 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 3624701187..fbb90b2456 100644 --- 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 655b66b759..9af3b76a7e 100644 --- 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 655b66b759..9af3b76a7e 100644 --- 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 4abfc99716..ad7cf511b2 100644 --- 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 b137ddd1d4..f7f9d02330 100644 --- 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 a90913c2fb..d191d2fcc7 100644 --- 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 31ed217aaa..653c324fe5 100644 --- 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 5062d4f617..c31b23c009 100644 --- 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 fdbb3cbc51..01dc96c11f 100644 --- 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 0145d9434c..73dd997a94 100644 --- 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 7c445357a6..b0bb5f0ebe 100644 --- 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 73ba16f947..909786075a 100644 --- 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 9f68ac17b8..ab88e18b59 100644 --- 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 e7da98471d..3af8359c54 100644 --- 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 240a4d8d7b..e344ac0881 100644 --- 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 -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 ba937e13df..23bdc6486e 100644 --- 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 3521f1617b..d03fae7a1f 100644 --- 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 c57c162fbd..44f34d670c 100644 --- 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 eec9d695b1..21cb610b3c 100644 --- 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 2e806b623b..6e8605e394 100644 --- 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 7a7f900211..17d57205aa 100644 --- 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 c743042307..82971a6310 100644 --- 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 7ca58131fc..ab2ced9e76 100644 --- 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 dd169f408a..d91593e0df 100644 --- 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 e7952d1797..c137b06024 100644 --- 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 b68dbefcf4..6c2b07cdc1 100644 --- 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 1cdd977f44..c0bce39941 100644 --- 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 bfa2684f1d..778d905184 100644 --- 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 537eaabf01..1588050524 100644 --- 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 6a76b282a7..fc8a4663f5 100644 --- 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 15e59cc05e..e7143b6c99 100644 --- 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 ddf9816c00..0b5b4a415b 100644 --- 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 5e3defcff5..1792f2e851 100644 --- 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 a4f060f34b..604ae36065 100644 --- 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 -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 530c7d8de4..0cd9f8da10 100644 --- 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 643e09270d..8697a6362a 100644 --- 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 fc4879c13b..160983e3b4 100644 --- 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 3c2bc35c2f..b6476d45fe 100644 --- 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 4c3b55127a..c17ce68d36 100644 --- 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 -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 0eedf9c3ef..951caaec6b 100644 --- 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 8906956c59..b74c2b5bfd 100644 --- 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 55304b5657..99cc875ad2 100644 --- 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 24421279a4..19a2176917 100644 --- 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 e479b65e47..2604c437ae 100644 --- 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 a4ea186d93..31b97789d0 100644 --- 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 5f38c63afa..cabc284bef 100644 --- 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 a6c058e9ef..468f519c0c 100644 --- 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 a4dfa43c89..14d6679849 100644 --- 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 a35e5c2127..ab717a2725 100644 --- 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 985af9f682..ace02cfd3a 100644 --- 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 7063ceaebc..c4cac47118 100644 --- 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) -- 2.45.2