X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e469ea37f1edbd6b2b6a0cbc43a3314c337e6f9..ad0dc53bffdcc40f0b8528c30927d6ebc1fe9cbd:/src/make.env.in

diff --git a/src/make.env.in b/src/make.env.in
index d8874b6aad..5e2fc03a9a 100644
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -20,7 +20,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS = -D"wxINSTALL_PREFIX=\"@prefix@\""
+EXTRADEFS = @EXTRADEFS@
 
 ########################### VERSION #################################
 
@@ -58,7 +58,14 @@ SHARED_LD   = @SHARED_LD@
 
 ########################### Flags #################################
 
-CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ $(EXTRADEFS)
+#
+# CPPFLAGS  (gnu standard) is not C++ flags, but flags for the "cpp"
+# preprocessor. Unfortunately whoever wrote this now uses CPPFLAGS for
+# C++ like CFLAGS for C. :-(
+# We *must* include CPPFLAGS in both of these, to make sure that all
+# header files get found.  (KB)
+
+CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@ $(EXTRADEFS)
 CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ $(EXTRADEFS)
 PICFLAGS = @PIC_FLAG@
 LDFLAGS = @LDFLAGS@