corrected appeaance of boxes und OSX

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

diff --git a/src/make.env.in b/src/make.env.in
index a8228ea8a4a9cee49b3c32dc94a7300e8d3eefb2..f9a251650cd7ba42e1ba17d7a05fb55c16de5091 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -1,19 +1,20 @@
 #
 # File:     make.env
 #
 # File:     make.env

-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee

 # Created:  1993
 # Created:  1993

-# Updated:  1999
+# Updated:  2001

 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling

+# Copyright:(c) 2001, Ron Lee

 #
 
 ####################### 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@
 OPENGLLIBS = @OPENGL_LIBS@

-LDLIBS = $(APPEXTRALIBS) ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS)
+LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}

 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@


@@ -21,8 +22,6 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 

-EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
-

 ########################### VERSION #################################
 
 WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
 ########################### VERSION #################################
 
 WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@


@@ -31,13 +30,8 @@ WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
 ########################### Programs #################################
 
 
 ########################### 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@
 
 # Compiler for lex/yacc .c programs
 CCLEX       = @CC@


@@ -49,28 +43,31 @@ AS          = @AS@
 NM          = @NM@
 LN_S        = @LN_S@
 STRIP       = @STRIP@
 NM          = @NM@
 LN_S        = @LN_S@
 STRIP       = @STRIP@

-MAKE        = make
-AROPTIONS   = ruv
+AROPTIONS   = rcu

 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
 RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@

+RM          = rm -f

 
 SHARED_LD   = @SHARED_LD@
 
 RESFLAGS    = @RESFLAGS@
 RESCOMP     = @RESCOMP@
 
 SHARED_LD   = @SHARED_LD@
 
 RESFLAGS    = @RESFLAGS@
 RESCOMP     = @RESCOMP@

-REZ         = @REZ@
-REZFLAGS    = @REZFLAGS@
+

 DEREZ       = @DEREZ@
 DEREZ       = @DEREZ@

-DEREZFLAGS  = @DEREZFLAGS@
+

 DLLTOOL     = @DLLTOOL@
 
 DLLTOOL     = @DLLTOOL@
 

+INSTALL         = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA    = @INSTALL_DATA@
+INSTALL_SCRIPT  = @INSTALL@
+

 ########################### Flags #################################
 
 ########################### Flags #################################
 

-CPPFLAGS = $(APPEXTRACPPFLAGS) @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@
-CFLAGS = $(APPEXTRACFLAGS) $(CPPFLAGS) @CODE_GEN_FLAGS@ @CFLAGS@
-CXXFLAGS = $(APPEXTRACXXFLAGS) $(CPPFLAGS) \
-           @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
+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
 PICFLAGS = @PIC_FLAG@
 
 # taking into account how SHARED_LD is defined, appending LDFLAGS to it


@@ -78,3 +75,7 @@ PICFLAGS = @PIC_FLAG@
 # EXTRALIBS instead (see above)
 # LDFLAGS = @LDFLAGS@
 
 # 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@