X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66635d688cc4b7570e83945706bf9c51c9d97859..aa8fb7a0164e989e09d2b78867633399a740f1d3:/src/make.env.in diff --git a/src/make.env.in b/src/make.env.in index 720d554abb..3070667152 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -11,7 +11,7 @@ ####################### GENERAL SETTINGS ############################ -EXTRALIBS = @EXTRA_LIBS@ +EXTRA_LIBS = @EXTRA_LIBS@ LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRA_LIBS) TOOLKIT = @TOOLKIT@ @@ -26,12 +26,6 @@ WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@ WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@ WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@ -########################### Misc ################################# - - -#@SHELL@ not supported by my autoconf version Is this really needed? -#SHELL = @SHELL@ -SHELL=/bin/sh ########################### Programs ################################# # C++ compiler @@ -63,8 +57,8 @@ SHARED_LD = @SHARED_LD@ ########################### Flags ################################# CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ -CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ +CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ PICFLAGS = @PIC_FLAG@ - +LDFLAGS = @LDFLAGS@