Applied [ 716064 ] Second part of wxFileCtrl & wxDirCtrl patch

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

diff --git a/src/make.env.in b/src/make.env.in
index 97cfd5d948b811d22cedf15178695a121a4599ad..d72dc2c558fe7e2116bacaad90beb07123670a8a 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -1,20 +1,27 @@
 #
 # File:     make.env
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
-# Updated:  1999
-# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Updated:  2001
+# Copyright:,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
+# Copyright:(c) 2001, Ron Lee
 #
 
-########################### VERSION #################################
+####################### GENERAL SETTINGS ############################
 
-LDLIBS = @LD_LIBS@
+# see comment near LDFLAGS at the end of file
+EXTRALIBS = @LDFLAGS@ @LDFLAGS_VERSIONING@ @LIBS@ @DMALLOC_LIBS@
+OPENGLLIBS = @OPENGL_LIBS@
+LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 
 TOOLKIT = @TOOLKIT@
+TOOLKITDIR = @TOOLKIT_DIR@
 
-WXLIB = lib@WX_LIBRARY@.a
+WXLIB = @WX_LIBRARY_NAME_STATIC@
+WXSHLIB = @WX_LIBRARY_NAME_SHARED@
+WXLIBBASE = @WX_LIBRARY_BASENAME@
 
 ########################### VERSION #################################
 
@@ -22,19 +29,10 @@ WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
 WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
-########################### Misc #################################
-
-SHELL = @SHELL@
-
 ########################### Programs #################################
 
-# C++ compiler
-CC          = @CXX@
-CCPP        = @CXXCPP@
-
-# C compiler
-CCC         = @CC@
-CCCPP       = @CPP@
+CXX         = @CXX@
+CC          = @CC@
 
 # Compiler for lex/yacc .c programs
 CCLEX       = @CC@
@@ -46,27 +44,41 @@ AS          = @AS@
 NM          = @NM@
 LN_S        = @LN_S@
 STRIP       = @STRIP@
-MAKE        = make
-AROPTIONS   = ruv
+AROPTIONS   = rcu
 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
+RM          = rm -f
 
-########################### Flags #################################
+SHARED_LD   = @SHARED_LD@
+
+RESFLAGS    = @RESFLAGS@
+RESCOMP     = @RESCOMP@
 
-CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@
+DEREZ       = @DEREZ@
 
-########################### Rules #################################
+SETFILE     = @SETFILE@
 
-# Clears all default suffixes
-.SUFFIXES:     .o .cpp .c
+DLLTOOL     = @DLLTOOL@
 
-.c.o :
-       $(CCC) -c $(CFLAGS) -o $@ $<
+INSTALL         = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA    = @INSTALL_DATA@
+INSTALL_SCRIPT  = @INSTALL@
 
-.cpp.o :
-       $(CC) -c $(CPPFLAGS) -o $@ $<
+########################### Flags #################################
 
+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@
+PICFLAGS = @PIC_FLAG@
 
+# taking into account how SHARED_LD is defined, appending LDFLAGS to it
+# doesn't work, so we put them in the end of the linker command line in
+# 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@