X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e006f096ad08d25db5b7893eb3b6abf29c14e7bd..211cc8dc907ee50ca6d383b8df16bba9a4d3ce2d:/src/make.env.in

diff --git a/src/make.env.in b/src/make.env.in
index e070a1d66c..c835ab3fab 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@
@@ -20,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@
@@ -56,17 +55,20 @@ MAKEINFO    = @MAKEINFO@
 
 SHARED_LD   = @SHARED_LD@
 
+RESFLAGS    = @RESFLAGS@
+RESCOMP     = @RESCOMP@
+REZ         = @REZ@
+REZFLAGS    = @REZFLAGS@
+DEREZ       = @DEREZ@
+DEREZFLAGS  = @DEREZFLAGS@
+DLLTOOL     = @DLLTOOL@
+
 ########################### Flags #################################
 
-#
-# CPPFLAGS  (gnu standard) is not C++ flags, but flags for the "cpp"
-# preprocessor. Unfortunately whoever wrote this now uses CPPFLAGS for
-# C++ like CFLAGS for C. :-(
-# 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@
+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@
 
 # taking into account how SHARED_LD is defined, appending LDFLAGS to it