wxSocekt now uses wxPostEvent.

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

diff --git a/src/make.env.in b/src/make.env.in
index 5e2fc03a9af8f203082fb919933ea1293e5333e4..621d3510e879d93f7c7f594036b30d81346e80a5 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -11,8 +11,8 @@
 ####################### 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@
@@ -20,7 +20,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS = @EXTRADEFS@
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
 
 ########################### VERSION #################################
 
@@ -65,8 +65,8 @@ 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 = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
+CPPFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
 PICFLAGS = @PIC_FLAG@
 LDFLAGS = @LDFLAGS@