X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e006f096ad08d25db5b7893eb3b6abf29c14e7bd..fae5c452834a398c06a318e5da65cff7791eff2b:/src/make.env.in diff --git a/src/make.env.in b/src/make.env.in index e070a1d66c..356a9fbbab 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -12,7 +12,8 @@ # see comment near LDFLAGS at the end of file EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@ -LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS) +OPENGLLIBS = @OPENGL_LIBS@ +LDLIBS = $(APPEXTRALIBS) ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS) TOOLKIT = @TOOLKIT@ TOOLKITDIR = @TOOLKIT_DIR@ @@ -56,6 +57,14 @@ MAKEINFO = @MAKEINFO@ SHARED_LD = @SHARED_LD@ +RESFLAGS = @RESFLAGS@ +RESCOMP = @RESCOMP@ +REZ = @REZ@ +REZFLAGS = @REZFLAGS@ +DEREZ = @DEREZ@ +DEREZFLAGS = @DEREZFLAGS@ +DLLTOOL = @DLLTOOL@ + ########################### Flags ################################# # @@ -65,8 +74,8 @@ SHARED_LD = @SHARED_LD@ # We *must* include CPPFLAGS in both of these, to make sure that all # header files get found. (KB) -CFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@ -CPPFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ +CFLAGS = $(APPEXTRACFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS@ +CPPFLAGS = $(APPEXTRACXXFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS_CXX@ PICFLAGS = @PIC_FLAG@ # taking into account how SHARED_LD is defined, appending LDFLAGS to it