A little different fix for how to delay the call to __wxCleanup

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

diff --git a/src/make.env.in b/src/make.env.in
index e6d0c7cc7dd124256737f468e5520ed244622ff8..c847908904bdfd29661f38860f4aa2bbec1fa1c8 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -12,7 +12,7 @@
 ####################### GENERAL SETTINGS ############################
 
 # see comment near LDFLAGS at the end of file
 ####################### GENERAL SETTINGS ############################
 
 # see comment near LDFLAGS at the end of file

-EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
+EXTRALIBS = @LDFLAGS@ @LIBS@ @DMALLOC_LIBS@

 OPENGLLIBS = @OPENGL_LIBS@
 LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 
 OPENGLLIBS = @OPENGL_LIBS@
 LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 


@@ -43,11 +43,11 @@ AS          = @AS@
 NM          = @NM@
 LN_S        = @LN_S@
 STRIP       = @STRIP@
 NM          = @NM@
 LN_S        = @LN_S@
 STRIP       = @STRIP@

-MAKE        = make

 AROPTIONS   = rcu
 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
 AROPTIONS   = rcu
 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@

+RM          = rm -f

 
 SHARED_LD   = @SHARED_LD@
 
 
 SHARED_LD   = @SHARED_LD@
 


@@ -60,10 +60,9 @@ DLLTOOL     = @DLLTOOL@
 
 ########################### Flags #################################
 
 
 ########################### Flags #################################
 

-CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@ @WXDEBUG_DEFINE@
+CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@@TOOLCHAIN_DLL_DEFS@ @WXDEBUG_DEFINE@

 CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
 CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@

-CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS} \
-           @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
+CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@@CODE_GEN_FLAGS_CXX@ @CXXFLAGS@

 PICFLAGS = @PIC_FLAG@
 
 # taking into account how SHARED_LD is defined, appending LDFLAGS to it
 PICFLAGS = @PIC_FLAG@
 
 # taking into account how SHARED_LD is defined, appending LDFLAGS to it