tried to correct the colour problems

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

diff --git a/src/make.env.in b/src/make.env.in
index d48323dce8a71617dd3db1525101a982e8a780f3..621d3510e879d93f7c7f594036b30d81346e80a5 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -11,8 +11,8 @@
 ####################### GENERAL SETTINGS ############################
 
 
 ####################### GENERAL SETTINGS ############################
 
 

-EXTRA_LIBS = @EXTRA_LIBS@
-LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_LIBS)
+EXTRALIBS = @EXTRA_LIBS@
+LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRALIBS)

 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@


@@ -20,7 +20,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 

-EXTRADEFS = -D"wxINSTALL_PREFIX=\"@prefix@\""
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""

 
 ########################### VERSION #################################
 
 
 ########################### VERSION #################################
 


@@ -59,14 +59,14 @@ SHARED_LD   = @SHARED_LD@
 ########################### Flags #################################
 
 #
 ########################### 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. :-(
 # 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)
 
 # 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@
 
 PICFLAGS = @PIC_FLAG@
 LDFLAGS = @LDFLAGS@