Merged some STC fixes over to the main branch

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

diff --git a/src/make.env.in b/src/make.env.in
index e21dc7fef2c3ae13a9aa42a09600657031024cf1..bff33e5385fc3614048a23ddf7295dfa17ce69d1 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -10,9 +10,10 @@
 
 ####################### GENERAL SETTINGS ############################
 
 
 ####################### GENERAL SETTINGS ############################
 

-
-EXTRALIBS = @EXTRA_LIBS@
-LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRALIBS)
+# 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@
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@


@@ -56,6 +57,10 @@ MAKEINFO    = @MAKEINFO@
 
 SHARED_LD   = @SHARED_LD@
 
 
 SHARED_LD   = @SHARED_LD@
 

+RESFLAGS    = @RESFLAGS@
+RESCOMP     = @RESCOMP@
+DLLTOOL     = @DLLTOOL@
+

 ########################### Flags #################################
 
 #
 ########################### Flags #################################
 
 #


@@ -65,9 +70,12 @@ SHARED_LD   = @SHARED_LD@
 # We *must* include CPPFLAGS in both of these, to make sure that all
 # header files get found.  (KB)
 
 # 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@
+CFLAGS = $(APPEXTRACFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
+CPPFLAGS = $(APPEXTRACXXFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@

 PICFLAGS = @PIC_FLAG@
 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@