undid WS_EX_CONTROLPARENT change -- I recall now why we can't use it

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

diff --git a/src/make.env.in b/src/make.env.in
index e6d0c7cc7dd124256737f468e5520ed244622ff8..f9a251650cd7ba42e1ba17d7a05fb55c16de5091 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}
 
@@ -43,11 +43,11 @@ AS          = @AS@
 NM          = @NM@
 LN_S        = @LN_S@
 STRIP       = @STRIP@
-MAKE        = make
 AROPTIONS   = rcu
 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
+RM          = rm -f
 
 SHARED_LD   = @SHARED_LD@
 
@@ -58,12 +58,16 @@ DEREZ       = @DEREZ@
 
 DLLTOOL     = @DLLTOOL@
 
+INSTALL         = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA    = @INSTALL_DATA@
+INSTALL_SCRIPT  = @INSTALL@
+
 ########################### 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@
-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
@@ -71,3 +75,7 @@ PICFLAGS = @PIC_FLAG@
 # EXTRALIBS instead (see above)
 # LDFLAGS = @LDFLAGS@
 
+# specific linker flags for when building executables since there
+# Mac OS X requires specific linker flags for executables linked
+# against dynamic shared libraries
+LDFLAGS_EXE = @LDFLAGS_EXE@