X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3cb1afc37b1ad2d3bcb501c9debe8fdc5f13924..b838cfc9151aea38402ad2b1ba5d2f97cf94e973:/src/make.env.in diff --git a/src/make.env.in b/src/make.env.in index a8228ea8a4..c835ab3fab 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -13,7 +13,7 @@ # 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) +LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS} TOOLKIT = @TOOLKIT@ TOOLKITDIR = @TOOLKIT_DIR@ @@ -21,8 +21,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@ @@ -67,9 +65,9 @@ DLLTOOL = @DLLTOOL@ ########################### Flags ################################# -CPPFLAGS = $(APPEXTRACPPFLAGS) @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ -CFLAGS = $(APPEXTRACFLAGS) $(CPPFLAGS) @CODE_GEN_FLAGS@ @CFLAGS@ -CXXFLAGS = $(APPEXTRACXXFLAGS) $(CPPFLAGS) \ +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@