From: Vadim Zeitlin Date: Wed, 28 Nov 2001 12:30:26 +0000 (+0000) Subject: replaced `wx-config --cflags` with `wx-config --cxxflags` and mentioned that X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f6656ccb149683950e871b5022d2b88b03712165 replaced `wx-config --cflags` with `wx-config --cxxflags` and mentioned that it must be done in user makefiles too in changes.txt git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/contrib/samples/gizmos/multicell/makefile.unx b/contrib/samples/gizmos/multicell/makefile.unx index a83e732862..ae85345f2f 100644 --- a/contrib/samples/gizmos/multicell/makefile.unx +++ b/contrib/samples/gizmos/multicell/makefile.unx @@ -13,7 +13,7 @@ EXTRAINC=-I../include .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/contrib/samples/gizmos/splittree/makefile.unx b/contrib/samples/gizmos/splittree/makefile.unx index 2552111590..7ca58131fc 100644 --- a/contrib/samples/gizmos/splittree/makefile.unx +++ b/contrib/samples/gizmos/splittree/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/contrib/samples/ogl/ogledit/makefile.unx b/contrib/samples/ogl/ogledit/makefile.unx index 76d11a5ebb..31404938a4 100644 --- a/contrib/samples/ogl/ogledit/makefile.unx +++ b/contrib/samples/ogl/ogledit/makefile.unx @@ -24,16 +24,16 @@ ogledit: $(OBJECTS) $(CPP) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl ogledit.o: ogledit.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c ogledit.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c ogledit.cpp palette.o: palette.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c palette.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c palette.cpp doc.o: doc.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp view.o: view.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp + $(CPP) `$(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 2070bc3b13..2189eaae4b 100644 --- a/contrib/samples/ogl/studio/makefile.unx +++ b/contrib/samples/ogl/studio/makefile.unx @@ -24,34 +24,34 @@ studio: $(OBJECTS) $(CPP) -o studio $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl studio.o: studio.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c studio.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c studio.cpp cspalette.o: cspalette.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c cspalette.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c cspalette.cpp doc.o: doc.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c doc.cpp view.o: view.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c view.cpp dialogs.o: dialogs.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c dialogs.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c dialogs.cpp mainfrm.o: mainfrm.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c mainfrm.cpp project.o: project.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c project.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c project.cpp shapes.o: shapes.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c shapes.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c shapes.cpp symbols.o: symbols.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c symbols.cpp + $(CPP) `$(WXCONFIG) --cxxflags` -I../../src $(WXINCLUDE) -c symbols.cpp csprint.o: csprint.cpp - $(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c csprint.cpp + $(CPP) `$(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 9b4f82a501..20a3228e72 100644 --- a/demos/bombs/makefile.unx +++ b/demos/bombs/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o game.o bombs1.o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/demos/forty/makefile.unx b/demos/forty/makefile.unx index 0a689e8f1e..3623d3f33a 100644 --- a/demos/forty/makefile.unx +++ b/demos/forty/makefile.unx @@ -24,7 +24,7 @@ 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 --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/demos/fractal/makefile.unx b/demos/fractal/makefile.unx index e23e9c3d27..68b7ce389d 100644 --- a/demos/fractal/makefile.unx +++ b/demos/fractal/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/demos/life/makefile.unx b/demos/life/makefile.unx index 4fe657b60e..3a8141f1eb 100644 --- a/demos/life/makefile.unx +++ b/demos/life/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o dialogs.o game.o reader.o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/demos/poem/makefile.unx b/demos/poem/makefile.unx index 93a2ce3c46..808a2bebc8 100644 --- a/demos/poem/makefile.unx +++ b/demos/poem/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/docs/changes.txt b/docs/changes.txt index 073df1b46d..609040bc9d 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -53,6 +53,13 @@ wxMSW: style to avoid it, wxFRAME_FLOAT_ON_PARENT style is now obsolete and has no effect +Unix ports: + +- You should use `wx-config --cxxflags` in your makefiles instead of + `wx-config --cflags` for compiling C++ files. CXXFLAGS contains CFLAGS + and the compiler flags for C++ files only, CFLAGS should still be used + to compile pure C files. + 2.3.2 ----- diff --git a/samples/calendar/makefile.unx b/samples/calendar/makefile.unx index c67a14ad14..b2329a8c3c 100644 --- a/samples/calendar/makefile.unx +++ b/samples/calendar/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx index 798e3973be..0bb48965a0 100644 --- a/samples/caret/makefile.unx +++ b/samples/caret/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/checklst/makefile.unx b/samples/checklst/makefile.unx index 458356356e..ab8804db2c 100644 --- a/samples/checklst/makefile.unx +++ b/samples/checklst/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx index 8fae357103..973e6256a6 100644 --- a/samples/config/makefile.unx +++ b/samples/config/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/console/makefile.unx b/samples/console/makefile.unx index 7531db3acc..21aace827b 100644 --- a/samples/console/makefile.unx +++ b/samples/console/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx index ebf2d91575..6ca7bd454f 100644 --- a/samples/controls/makefile.unx +++ b/samples/controls/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/db/makefile.unx b/samples/db/makefile.unx index 5bfccd1f91..a896e2965c 100644 --- a/samples/db/makefile.unx +++ b/samples/db/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o listdb.o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx index 9c9fb55868..2de880a541 100644 --- a/samples/dialogs/makefile.unx +++ b/samples/dialogs/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/dialup/makefile.unx b/samples/dialup/makefile.unx index f890694f84..45ea85294f 100644 --- a/samples/dialup/makefile.unx +++ b/samples/dialup/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx index 0337fb4179..3624701187 100644 --- a/samples/dnd/makefile.unx +++ b/samples/dnd/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx index 3a80cd2ecc..655b66b759 100644 --- a/samples/docview/makefile.unx +++ b/samples/docview/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o view.o doc.o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/docvwmdi/makefile.unx b/samples/docvwmdi/makefile.unx index 3a80cd2ecc..655b66b759 100644 --- a/samples/docvwmdi/makefile.unx +++ b/samples/docvwmdi/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o view.o doc.o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/dragimag/makefile.unx b/samples/dragimag/makefile.unx index 7022f314df..4abfc99716 100644 --- a/samples/dragimag/makefile.unx +++ b/samples/dragimag/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx index ea24e4c3ea..b137ddd1d4 100644 --- a/samples/drawing/makefile.unx +++ b/samples/drawing/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/dynamic/makefile.unx b/samples/dynamic/makefile.unx index c2cdc51dfe..a90913c2fb 100644 --- a/samples/dynamic/makefile.unx +++ b/samples/dynamic/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/erase/makefile.unx b/samples/erase/makefile.unx index 1e82bd01d4..31ed217aaa 100644 --- a/samples/erase/makefile.unx +++ b/samples/erase/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/event/makefile.unx b/samples/event/makefile.unx index f2e963d8ae..5062d4f617 100644 --- a/samples/event/makefile.unx +++ b/samples/event/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx index 55d59a74d0..fdbb3cbc51 100644 --- a/samples/exec/makefile.unx +++ b/samples/exec/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/font/makefile.unx b/samples/font/makefile.unx index 19c54cc1ae..0145d9434c 100644 --- a/samples/font/makefile.unx +++ b/samples/font/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx index a80a6ec93e..7c445357a6 100644 --- a/samples/grid/makefile.unx +++ b/samples/grid/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/help/makefile.unx b/samples/help/makefile.unx index 5369536ecc..73ba16f947 100644 --- a/samples/help/makefile.unx +++ b/samples/help/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx index 3bc068afd0..9f68ac17b8 100644 --- a/samples/image/makefile.unx +++ b/samples/image/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx index 34b7b8b293..e7da98471d 100644 --- a/samples/internat/makefile.unx +++ b/samples/internat/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx index 594658ab9c..240a4d8d7b 100644 --- a/samples/ipc/makefile.unx +++ b/samples/ipc/makefile.unx @@ -11,7 +11,7 @@ PROGRAMS = client server .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAMS) diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx index 1f0d1027d3..ba937e13df 100644 --- a/samples/joytest/makefile.unx +++ b/samples/joytest/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx index fabb56fd28..3521f1617b 100644 --- a/samples/layout/makefile.unx +++ b/samples/layout/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx index 47527dd294..c57c162fbd 100644 --- a/samples/listctrl/makefile.unx +++ b/samples/listctrl/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx index 249c138063..eec9d695b1 100644 --- a/samples/mdi/makefile.unx +++ b/samples/mdi/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx index e43e74d7b4..2e806b623b 100644 --- a/samples/memcheck/makefile.unx +++ b/samples/memcheck/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/menu/makefile.unx b/samples/menu/makefile.unx index c6811a77e1..7a7f900211 100644 --- a/samples/menu/makefile.unx +++ b/samples/menu/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/minifram/makefile.unx b/samples/minifram/makefile.unx index 1dc2872c4d..c743042307 100644 --- a/samples/minifram/makefile.unx +++ b/samples/minifram/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx index 2552111590..7ca58131fc 100644 --- a/samples/minimal/makefile.unx +++ b/samples/minimal/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/newgrid/makefile.unx b/samples/newgrid/makefile.unx index d689275e6f..dd169f408a 100644 --- a/samples/newgrid/makefile.unx +++ b/samples/newgrid/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx index e3db4b798e..e7952d1797 100644 --- a/samples/notebook/makefile.unx +++ b/samples/notebook/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx index f40497b3e5..b68dbefcf4 100644 --- a/samples/opengl/cube/makefile.unx +++ b/samples/opengl/cube/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx index 86c4c5a6a4..1cdd977f44 100644 --- a/samples/opengl/isosurf/makefile.unx +++ b/samples/opengl/isosurf/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) isosurf.dat diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx index aaea80b74b..bfa2684f1d 100644 --- a/samples/opengl/penguin/makefile.unx +++ b/samples/opengl/penguin/makefile.unx @@ -20,13 +20,13 @@ Penguin: penguin.o trackball.o lw.o `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS) penguin.o: penguin.cpp - $(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp + $(CPP) `wx-config --cxxflags` -I../../gtk -c penguin.cpp lw.o: lw.cpp - $(CPP) `wx-config --cflags` -I../../gtk -c lw.cpp + $(CPP) `wx-config --cxxflags` -I../../gtk -c lw.cpp trackball.o: trackball.c - $(CC) `wx-config --cflags` -I../../gtk -c trackball.c + $(CC) `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 9cf7e6ed03..537eaabf01 100644 --- a/samples/png/makefile.unx +++ b/samples/png/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx index 16345603c8..6a76b282a7 100644 --- a/samples/printing/makefile.unx +++ b/samples/printing/makefile.unx @@ -22,7 +22,7 @@ $(PROGRAM): $(PROGRAM).o $(PROGRAM).o `wx-config --libs` $(PROGRAM).o: $(PROGRAM).cpp - $(CC) `wx-config --cflags` -c $(PROGRAM).cpp + $(CC) `wx-config --cxxflags` -c $(PROGRAM).cpp clean: rm -f *.o $(PROGRAM) diff --git a/samples/proplist/makefile.unx b/samples/proplist/makefile.unx index a4f6c6e98a..15e59cc05e 100644 --- a/samples/proplist/makefile.unx +++ b/samples/proplist/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/propsize/makefile.unx b/samples/propsize/makefile.unx index df619418fa..ddf9816c00 100644 --- a/samples/propsize/makefile.unx +++ b/samples/propsize/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/resource/makefile.unx b/samples/resource/makefile.unx index 727f767824..5e3defcff5 100644 --- a/samples/resource/makefile.unx +++ b/samples/resource/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/richedit/makefile.unx b/samples/richedit/makefile.unx index bd016fe74a..a4f060f34b 100644 --- a/samples/richedit/makefile.unx +++ b/samples/richedit/makefile.unx @@ -13,7 +13,7 @@ OBJECTS = $(PROGRAM).o kbList.o wxllist.o wxlparser.o wxlwindow.o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< $(PROGRAM): $(OBJECTS) $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` diff --git a/samples/rotate/makefile.unx b/samples/rotate/makefile.unx index b4e1b2ef88..530c7d8de4 100644 --- a/samples/rotate/makefile.unx +++ b/samples/rotate/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx index 4145bb6a72..643e09270d 100644 --- a/samples/sashtest/makefile.unx +++ b/samples/sashtest/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx index 57d2bcdc93..fc4879c13b 100644 --- a/samples/scroll/makefile.unx +++ b/samples/scroll/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/scrollsub/makefile.unx b/samples/scrollsub/makefile.unx index 42654ffb82..3c2bc35c2f 100644 --- a/samples/scrollsub/makefile.unx +++ b/samples/scrollsub/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx index ba32b1fcf8..4c3b55127a 100644 --- a/samples/sockets/makefile.unx +++ b/samples/sockets/makefile.unx @@ -11,7 +11,7 @@ PROGRAMS = client server .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAMS) diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx index 6d25508915..0eedf9c3ef 100644 --- a/samples/splitter/makefile.unx +++ b/samples/splitter/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/statbar/makefile.unx b/samples/statbar/makefile.unx index 468a658a0a..8906956c59 100644 --- a/samples/statbar/makefile.unx +++ b/samples/statbar/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/tab/makefile.unx b/samples/tab/makefile.unx index c496a336b3..55304b5657 100644 --- a/samples/tab/makefile.unx +++ b/samples/tab/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/text/makefile.unx b/samples/text/makefile.unx index b5bf4c6175..24421279a4 100644 --- a/samples/text/makefile.unx +++ b/samples/text/makefile.unx @@ -24,7 +24,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx index 43224c1264..e479b65e47 100644 --- a/samples/thread/makefile.unx +++ b/samples/thread/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx index 91d51a0bd1..a4ea186d93 100644 --- a/samples/toolbar/makefile.unx +++ b/samples/toolbar/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx index 71b7088089..5f38c63afa 100644 --- a/samples/treectrl/makefile.unx +++ b/samples/treectrl/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/treelay/makefile.unx b/samples/treelay/makefile.unx index f1eee838a4..a6c058e9ef 100644 --- a/samples/treelay/makefile.unx +++ b/samples/treelay/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx index 3ec01bb431..a4dfa43c89 100644 --- a/samples/typetest/makefile.unx +++ b/samples/typetest/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx index ef20878024..a35e5c2127 100644 --- a/samples/validate/makefile.unx +++ b/samples/validate/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/samples/wizard/makefile.unx b/samples/wizard/makefile.unx index f0e1abaec9..985af9f682 100644 --- a/samples/wizard/makefile.unx +++ b/samples/wizard/makefile.unx @@ -12,7 +12,7 @@ OBJECTS = $(PROGRAM).o .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM) diff --git a/utils/tex2rtf/src/makefile.unx b/utils/tex2rtf/src/makefile.unx index 4a818458f9..7063ceaebc 100644 --- a/utils/tex2rtf/src/makefile.unx +++ b/utils/tex2rtf/src/makefile.unx @@ -11,7 +11,7 @@ OBJECTS = tex2rtf.o tex2any.o texutils.o rtfutils.o xlputils.o htmlutil.o readsh .SUFFIXES: .o .cpp .cpp.o : - $(CC) -c `wx-config --cflags` -o $@ $< + $(CC) -c `wx-config --cxxflags` -o $@ $< all: $(PROGRAM)