X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2b8b0662c6132c0076dd703e80f9751caa439cf..88594d02eb59a55ac85d3210a49d02918124617b:/src/make.env.in diff --git a/src/make.env.in b/src/make.env.in index d5ee1c213e..b716123672 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -1,18 +1,20 @@ # # File: make.env -# Author: Julian Smart, Robert Roebling, Vadim Zeitlin +# Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee # 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) 2001, Ron Lee # ####################### GENERAL SETTINGS ############################ - -EXTRA_LIBS = @EXTRA_LIBS@ -LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRA_LIBS) +# see comment near LDFLAGS at the end of file +EXTRALIBS = @LDFLAGS@ @LIBS@ @DMALLOC_LIBS@ +OPENGLLIBS = @OPENGL_LIBS@ +LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS} TOOLKIT = @TOOLKIT@ TOOLKITDIR = @TOOLKIT_DIR@ @@ -20,8 +22,6 @@ TOOLKITDIR = @TOOLKIT_DIR@ WXLIB = @WX_LIBRARY_NAME_STATIC@ WXSHLIB = @WX_LIBRARY_NAME_SHARED@ -EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\"" - ########################### VERSION ################################# WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@ @@ -30,13 +30,8 @@ WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@ ########################### 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@ @@ -48,26 +43,29 @@ AS = @AS@ NM = @NM@ LN_S = @LN_S@ STRIP = @STRIP@ -MAKE = make -AROPTIONS = ruv +AROPTIONS = rcu RANLIB = @RANLIB@ LD = @LD@ MAKEINFO = @MAKEINFO@ SHARED_LD = @SHARED_LD@ +RESFLAGS = @RESFLAGS@ +RESCOMP = @RESCOMP@ + +DEREZ = @DEREZ@ + +DLLTOOL = @DLLTOOL@ + ########################### Flags ################################# -# -# CPPFLAGS (gnu standard) is not C++ flags, but flags for the "cpp" -# preprocessor. Unfortunately whoever wrote this now uses CPPFLAGS for -# C++ like CFLAGS for C. :-( -# We *must* include CPPFLAGS in both of these, to make sure that all -# header files get found. (KB) - -CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@ -CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ +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@ -LDFLAGS = @LDFLAGS@ +# 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@