X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80d895cd3f624f28424cc45b9b516bf439da9c19..d3e90957cf70726bba42af977632223ff37439e1:/src/make.env.in?ds=sidebyside diff --git a/src/make.env.in b/src/make.env.in index 3070667152..d5ee1c213e 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="-DwxINSTALL_PREFIX=\"@prefix@\"" + ########################### VERSION ################################# WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@ @@ -56,7 +58,14 @@ SHARED_LD = @SHARED_LD@ ########################### Flags ################################# -CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ +# +# 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@ CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ PICFLAGS = @PIC_FLAG@ LDFLAGS = @LDFLAGS@