X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4aad9613aa33ee9220a62b3fea866a0e781ae57..2035e10e83324c6925d12725b842768f6e2b00a2:/src/make.env.in?ds=sidebyside

diff --git a/src/make.env.in b/src/make.env.in
index 3c5921b784..289b3bf062 100644
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -10,9 +10,9 @@
 
 ####################### GENERAL SETTINGS ############################
 
-
-EXTRALIBS = @EXTRA_LIBS@
-LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_LIBS)
+# see comment near LDFLAGS at the end of file
+EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
+LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS) $(APPEXTRALIBS)
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
@@ -20,16 +20,14 @@ 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@
 WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
-########################### Misc #################################
-
-SHELL = @SHELL@
-
 ########################### Programs #################################
 
 # C++ compiler
@@ -58,11 +56,25 @@ MAKEINFO    = @MAKEINFO@
 
 SHARED_LD   = @SHARED_LD@
 
+RESFLAGS    = @RESFLAGS@
+RESCOMP     = @RESCOMP@
+DLLTOOL     = @DLLTOOL@
+
 ########################### Flags #################################
 
-CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@
+#
+# 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@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
+CPPFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
 PICFLAGS = @PIC_FLAG@
 
-
+# taking into account how SHARED_LD is defined, appending LDFLAGS to it
+# doesn't work, so we put them in the end of the linker command line in
+# EXTRALIBS instead (see above)
+# LDFLAGS = @LDFLAGS@