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 a83e732862558b2a308b7bfe8717bd19bd698ada..ae85345f2f63003f1c6636b4db2b673a05097e56 100644 (file)
--- 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 25521115902183ecb85e16ce1cc3c17c1b880c62..7ca58131fc09f5a4eee8220b9a9d6796ebfce1af 100644 (file)
--- 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 76d11a5ebbb3d9f224cb02e26c24fca380fef119..31404938a44963c98b0096590cc4ba3851a88e58 100644 (file)
--- 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 2070bc3b1303788a6f7c5d3949a61c76c87f0ff2..2189eaae4be1f7fcd5548798c94022cc5105cdb9 100644 (file)
--- 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 9b4f82a5016005cf729a0c26a5544ee55887b25c..20a3228e72f849cd8d54e935139adda7c0355276 100644 (file)
--- 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 0a689e8f1e27f4ac25c439fdcbb4c004de6d4c8c..3623d3f33a2dc1c6b4ffe74c79c8da0745444e2b 100644 (file)
--- 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 e23e9c3d27aa51d845bb0b87915964ef34b8b64e..68b7ce389d0ddbf98ef235e567227c2b7d97b7e3 100644 (file)
--- 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 4fe657b60e45a738a4836c3d16fab76e0439b681..3a8141f1eb7b713326a274280e37a108d744f6ba 100644 (file)
--- 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 93a2ce3c462239ef4a3a5b908af2f3f980020529..808a2bebc840656f43f03c272c7eff9a6ee8f83e 100644 (file)
--- 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 073df1b46d28017e6c47be64965b27e12544cfb2..609040bc9d6a88dce4e90d86e6898d5de4b0522f 100644 (file)
--- 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 c67a14ad148179760eb01086a0d0a9e415220c29..b2329a8c3c87ef4d0b9793a66e3594b27ae025f8 100644 (file)
--- 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 798e3973be208db9332bd5f05c2dadf764d423a0..0bb48965a008d7207d77214f93c48f3ba5bbca71 100644 (file)
--- 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 458356356e4ca83e7ffa55ec18d41f7e1517f449..ab8804db2ca72bb910418c2c766f2b760ba3c667 100644 (file)
--- 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 8fae35710343ba9845d2497447ad139c203ae101..973e6256a610c9d809bfa24050cdb41b1c31ef8d 100644 (file)
--- 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 7531db3accde5d78f15ddba143a1753f2bd061dc..21aace827bc1567ea610dae3f57e53f0acb2185a 100644 (file)
--- 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 ebf2d915758ce9851118d322cbe3be62eeca98db..6ca7bd454f4b735f12b82590009bc815027f1f05 100644 (file)
--- 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 5bfccd1f9166cd53f52c326ba1419c5fef449b19..a896e2965c87d2dcdf2db2cd2fdd767aa6f7420d 100644 (file)
--- 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 9c9fb558689eb4745b5890cba4dedb3b6e6c97f8..2de880a541ee191e619c7e63869833f4c0d0775c 100644 (file)
--- 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 f890694f847bd0ba48133ec7f3c9043bb46ac4e7..45ea85294f17d9cfdba1d74ad19bda9f3d628425 100644 (file)
--- 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 0337fb4179a2c1d06712974b277c8dcb366150ba..362470118708fefa2f2cc7d673d2d7104a31f65e 100644 (file)
--- 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 3a80cd2ecc231d4fd093ba5a32d20c5910b72fd2..655b66b7590e31925f97bc4086c7a8f0c752f272 100644 (file)
--- 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 3a80cd2ecc231d4fd093ba5a32d20c5910b72fd2..655b66b7590e31925f97bc4086c7a8f0c752f272 100644 (file)
--- 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 7022f314df5249c26c5ce528d6afc64ca81a64b0..4abfc997167c79d3022117e144555e4d030b9e50 100644 (file)
--- 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 ea24e4c3ea8a5f821f2665c09885f11770c3f7bb..b137ddd1d41d958381e4a25fd8242aeaaf93c652 100644 (file)
--- 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 c2cdc51dfe4c5d136e7f0e10341808b48ccfe200..a90913c2fb221dc4207ccce2f68c33b00c1d5a91 100644 (file)
--- 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 1e82bd01d4741a45b3eecbaec813c4831065618a..31ed217aaaf43ac76b5760ecaa6a9c4afe845ef6 100644 (file)
--- 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 f2e963d8ae82c48984bf13a8fb9bad47d6b676fd..5062d4f617db4fa625fef74dcb1ceeecb6353f1a 100644 (file)
--- 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 55d59a74d02bbbca2ef09ecbfa997bb32ccc289a..fdbb3cbc511899e2956314d80163bb7f7efe9838 100644 (file)
--- 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 19c54cc1ae842581e27c4cea96598c8411917666..0145d9434c29cb7d962a8b4cda71585d97920c02 100644 (file)
--- 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 a80a6ec93e24c8fee339d7e8924f99b77ad8b357..7c445357a66c61d9a57bc1dc0db8b557df0559c2 100644 (file)
--- 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 5369536ecc140ba842339553fba80ee4fc804d64..73ba16f9479a9cdeda805a385119a6b0645d447d 100644 (file)
--- 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 3bc068afd0c3488414b9b84dd20edb9c083ee76a..9f68ac17b86f173df5a423ca21c33294d699b478 100644 (file)
--- 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 34b7b8b293d646175c6a49ac993fd73a4b7c6add..e7da98471dad0a08dd14417c635d94bab4b08788 100644 (file)
--- 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 594658ab9c2659eb5a88dafdc86df3544c1a8631..240a4d8d7b4832b2c6c9fdb756fc206fd8dfd4b8 100644 (file)
--- 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 1f0d1027d31cf1617d54751ef5d8564d2908cf6f..ba937e13dfcd2b58dbcfe40796c02530f830a285 100644 (file)
--- 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 fabb56fd284261941427f9a3a954f3b69e5f3fab..3521f1617b1918d220bf969bdcb9383b6eeab209 100644 (file)
--- 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 47527dd294d1f18d0e3127150aac472bce402967..c57c162fbdd66d64ee49a76d77383d0d2c4f49e0 100644 (file)
--- 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 249c1380634e82317df7f61141a26af60a748388..eec9d695b17e90606f695c29570bda18c251e9aa 100644 (file)
--- 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 e43e74d7b4dd3053469d94da5f46c85e8bd3da69..2e806b623bf28915ef7a1621fb784d571096d8b3 100644 (file)
--- 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 c6811a77e1cddb3e0dbf30236bbb1fc81501b156..7a7f900211800ff5b0ce118be02953a6a424fce4 100644 (file)
--- 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 1dc2872c4da3bb3c2f5f410a6a2a38119414ba44..c743042307f64e51fe936c2f9c6e549e78a2c6f1 100644 (file)
--- 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 25521115902183ecb85e16ce1cc3c17c1b880c62..7ca58131fc09f5a4eee8220b9a9d6796ebfce1af 100644 (file)
--- 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 d689275e6f98ae174ab602089d114208cedf34d5..dd169f408a459a8951ecdca0524e33b418189f63 100644 (file)
--- 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 e3db4b798e9fddfe40da881c5ffca5c9d6894d0a..e7952d179745834dbf374652990ff06cdebcc7fa 100644 (file)
--- 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 f40497b3e5e0a5b4e95c49aba8a4f13b18312a6b..b68dbefcf4e49cc25bc49167c89a4c4b4010d22c 100644 (file)
--- 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 86c4c5a6a4643040dc2baabfd2bf28749ac5c472..1cdd977f444436bbd9c7034d61f91f95e8db1180 100644 (file)
--- 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 aaea80b74bf4e74eaba8f7b749cd288cd57b3977..bfa2684f1d6ee555db657189fed8c369e57e45cb 100644 (file)
--- 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 9cf7e6ed03492ca1347d8f28660b62209af67f7c..537eaabf012a4c41b44d8193e8153c91961b57a0 100644 (file)
--- 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 16345603c834de5baa36516c07229a5d6b9f4ff0..6a76b282a77475ee273a362db621958e736c5633 100644 (file)
--- 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 a4f6c6e98a63802930952a5ceabb41ab61533b5e..15e59cc05ee16ce66bc24243b3773ecb862998dd 100644 (file)
--- 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 df619418fa904f2a19c02650e9f287ada5a961e3..ddf9816c000d3f4c2822170531ff100c060f2a7e 100644 (file)
--- 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 727f7678246e3421d74632ffed23a224afaa0489..5e3defcff55f01b1443a1c58c708cf2efbe06b51 100644 (file)
--- 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 bd016fe74abd85a02fcec45af7a2a0c50b7b886c..a4f060f34b4169cc79fcd6523084c582d882f55d 100644 (file)
--- 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 b4e1b2ef88354bccfdba99d9ecfaeb3e5998ba97..530c7d8de48dc51a7feef3b33679b12344adf280 100644 (file)
--- 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 4145bb6a72f70e8d08015bdedaba907da3997c80..643e09270d4798d235e86bca7b9e113086acbe85 100644 (file)
--- 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 57d2bcdc931f02baba469ab159bee75da1ede741..fc4879c13b18b563339a55e94a49d0beb8642b46 100644 (file)
--- 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 42654ffb827544a6329558be964a074e7f7cc36a..3c2bc35c2fb0366d7b3cc8860ea9ef8bf1561fad 100644 (file)
--- 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 ba32b1fcf8ed79b527e7da61c1b23bd892674044..4c3b55127a8e9f798565c905b0f38f16ce4ab9f3 100644 (file)
--- 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 6d25508915cd8b4314fc1a9e77bd9ee0d352b754..0eedf9c3ef8d4a549e366273caca8f9a46fd1e49 100644 (file)
--- 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 468a658a0ad56176833c6c93dc4e509fab8b405e..8906956c59adc7e46cd952b4a904bafb80f58d72 100644 (file)
--- 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 c496a336b3a2d032cfc08e36c00ff20f37ee0cda..55304b565735a73cfe009810a85613924b055a27 100644 (file)
--- 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 b5bf4c617509e2c6714cb937b89eb8207d3ef170..24421279a4cfeee2d9227dd28e53546c6543612e 100644 (file)
--- 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 43224c12649b7c0f6680db5d3db1604dc8e17d74..e479b65e472d74baff759563ac0ff2bc4607c635 100644 (file)
--- 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 91d51a0bd1502a2eef796219ec3fd2d80963b868..a4ea186d93fab21b74797a29f9d20972b5f1ddce 100644 (file)
--- 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 71b7088089368da371704c9f3709a46190df6d23..5f38c63afaa3e23e5374038366646c415dd9bd2a 100644 (file)
--- 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 f1eee838a4a394a79bfc0cebb7e72163cb1e3de3..a6c058e9ef50bb6cd56127b4c9de65d76a0711a2 100644 (file)
--- 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 3ec01bb431e0bf25813931bb8b20ea4b23cbdb59..a4dfa43c896414f2f69deae965f7788a1cc228da 100644 (file)
--- 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 ef20878024252dfd1817dd7831498dee453a8b18..a35e5c2127d0c5c4b2d590d1152a036baf620807 100644 (file)
--- 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 f0e1abaec91ee4bd9472f7b5f6312ed98d69be2b..985af9f68283b5732f6498cd0f104873efa673fb 100644 (file)
--- 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 4a818458f97a2ed89514b27e1f6126b7f44c1173..7063ceaebc4e65693a9760e5ffc61a89f1f58c31 100644 (file)
--- 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)