X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48b1d0ff4ff220d8f2994723f936a1ffa60addce..aa8fb7a0164e989e09d2b78867633399a740f1d3:/src/make.env.in diff --git a/src/make.env.in b/src/make.env.in index a0ee460ddc..3070667152 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -11,10 +11,11 @@ ####################### GENERAL SETTINGS ############################ -EXTRALIBS = @EXTRA_LIBS@ +EXTRA_LIBS = @EXTRA_LIBS@ LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRA_LIBS) TOOLKIT = @TOOLKIT@ +TOOLKITDIR = @TOOLKIT_DIR@ WXLIB = @WX_LIBRARY_NAME_STATIC@ WXSHLIB = @WX_LIBRARY_NAME_SHARED@ @@ -25,10 +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 = @SHELL@ - ########################### Programs ################################# # C++ compiler @@ -60,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@