X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b12915c104de03c9fd5102404e35051e9b8609a8..9e3cb9eefcb4e8d2d1fb45ad028468547ecc6ad9:/src/make.env.in?ds=sidebyside

diff --git a/src/make.env.in b/src/make.env.in
index 5e2fc03a9a..356a9fbbab 100644
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -10,9 +10,10 @@
 
 ####################### GENERAL SETTINGS ############################
 
-
-EXTRA_LIBS = @EXTRA_LIBS@
-LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_LIBS)
+# see comment near LDFLAGS at the end of file
+EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
+OPENGLLIBS = @OPENGL_LIBS@
+LDLIBS = $(APPEXTRALIBS) ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS)
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
@@ -20,7 +21,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS = @EXTRADEFS@
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
 
 ########################### VERSION #################################
 
@@ -56,6 +57,14 @@ MAKEINFO    = @MAKEINFO@
 
 SHARED_LD   = @SHARED_LD@
 
+RESFLAGS    = @RESFLAGS@
+RESCOMP     = @RESCOMP@
+REZ         = @REZ@
+REZFLAGS    = @REZFLAGS@
+DEREZ       = @DEREZ@
+DEREZFLAGS  = @DEREZFLAGS@
+DLLTOOL     = @DLLTOOL@
+
 ########################### Flags #################################
 
 #
@@ -65,9 +74,12 @@ SHARED_LD   = @SHARED_LD@
 # 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)
+CFLAGS = $(APPEXTRACFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS@
+CPPFLAGS = $(APPEXTRACXXFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS_CXX@
 PICFLAGS = @PIC_FLAG@
-LDFLAGS = @LDFLAGS@
 
+# 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@