X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b53e38fed51f88117e571676b3d12d7da86310f0..fa1c12bdd76acc21ddb45b90bb53b2f58aed946d:/src/make.env.in diff --git a/src/make.env.in b/src/make.env.in index e6d0c7cc7d..8a70f3f955 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -12,7 +12,7 @@ ####################### 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} @@ -60,10 +60,9 @@ DLLTOOL = @DLLTOOL@ ########################### Flags ################################# -CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@ @WXDEBUG_DEFINE@ +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@ +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