Found bug that skrewed up display wrt horizontal

[wxWidgets.git] / src / make.env.in

diff --git a/src/make.env.in b/src/make.env.in
index d48323dce8a71617dd3db1525101a982e8a780f3..289b3bf062add7be9220e115db0ba1e266a93d93 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -10,9 +10,9 @@
 
 ####################### 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@
+LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS) $(APPEXTRALIBS)
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
@@ -20,7 +20,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS = -D"wxINSTALL_PREFIX=\"@prefix@\""
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
 
 ########################### VERSION #################################
 
@@ -56,18 +56,25 @@ MAKEINFO    = @MAKEINFO@
 
 SHARED_LD   = @SHARED_LD@
 
+RESFLAGS    = @RESFLAGS@
+RESCOMP     = @RESCOMP@
+DLLTOOL     = @DLLTOOL@
+
 ########################### Flags #################################
 
 #
-# @CPPFLAGS@  (gnu standard) is not C++ flags, but flags for the "cpp"
+# 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
+# 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 = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
+CPPFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
 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@