Last correction for makefile.g95: win32 mkdir does not like forward slashes as directory

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

diff --git a/src/make.env.in b/src/make.env.in
index f085a09f1d62d9e66c798c6ee2bb3946dae15278..76f5c5406d5a2e92352b118b88bea595fc0522bb 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
-EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
+EXTRALIBS = @LDFLAGS@ @LIBS@ @DMALLOC_LIBS@
 OPENGLLIBS = @OPENGL_LIBS@
 LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 
@@ -44,7 +44,7 @@ NM          = @NM@
 LN_S        = @LN_S@
 STRIP       = @STRIP@
 MAKE        = make
-AROPTIONS   = ruv
+AROPTIONS   = rcu
 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
@@ -62,8 +62,7 @@ DLLTOOL     = @DLLTOOL@
 
 CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@ @WXDEBUG_DEFINE@
 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