X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80d895cd3f624f28424cc45b9b516bf439da9c19..cc160ba62b1b635a6c74a8ede9af19e93c025f6e:/src/make.env.in?ds=sidebyside

diff --git a/src/make.env.in b/src/make.env.in
index 3070667152..d48323dce8 100644
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -20,6 +20,8 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
+EXTRADEFS = -D"wxINSTALL_PREFIX=\"@prefix@\""
+
 ########################### VERSION #################################
 
 WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
@@ -56,8 +58,15 @@ SHARED_LD   = @SHARED_LD@
 
 ########################### Flags #################################
 
-CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
+#
+# @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@