X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9b77fb236dcaafffd4bada3d03e686e780e7272..e6adf05834e880312efa3d59914ecc1d4f5f78a6:/src/make.env.in diff --git a/src/make.env.in b/src/make.env.in index d48323dce8..c835ab3fab 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -10,9 +10,10 @@ ####################### 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@ @EXTRA_LIBS@ +OPENGLLIBS = @OPENGL_LIBS@ +LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS} TOOLKIT = @TOOLKIT@ TOOLKITDIR = @TOOLKIT_DIR@ @@ -20,8 +21,6 @@ TOOLKITDIR = @TOOLKIT_DIR@ WXLIB = @WX_LIBRARY_NAME_STATIC@ WXSHLIB = @WX_LIBRARY_NAME_SHARED@ -EXTRADEFS = -D"wxINSTALL_PREFIX=\"@prefix@\"" - ########################### VERSION ################################# WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@ @@ -56,18 +55,24 @@ MAKEINFO = @MAKEINFO@ SHARED_LD = @SHARED_LD@ +RESFLAGS = @RESFLAGS@ +RESCOMP = @RESCOMP@ +REZ = @REZ@ +REZFLAGS = @REZFLAGS@ +DEREZ = @DEREZ@ +DEREZFLAGS = @DEREZFLAGS@ +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@ $(EXTRADEFS) -CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ $(EXTRADEFS) +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@ 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@