X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3cb1afc37b1ad2d3bcb501c9debe8fdc5f13924..f94dd12dc18afd8518a88e9edac75f6dff907c9c:/src/make.env.in diff --git a/src/make.env.in b/src/make.env.in index a8228ea8a4..473217cd2f 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -1,19 +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 ############################ # 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) +LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS} TOOLKIT = @TOOLKIT@ TOOLKITDIR = @TOOLKIT_DIR@ @@ -21,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@ @@ -31,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@ @@ -49,28 +43,31 @@ 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 SHARED_LD = @SHARED_LD@ RESFLAGS = @RESFLAGS@ RESCOMP = @RESCOMP@ -REZ = @REZ@ -REZFLAGS = @REZFLAGS@ + DEREZ = @DEREZ@ -DEREZFLAGS = @DEREZFLAGS@ + DLLTOOL = @DLLTOOL@ +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL@ + ########################### 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