X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8461a0598cfc7adbae539ce2e8f0e6b717bff313..b326e313a0ce8ba54f6f0baac517faa80a2b744b:/src/make.env.in?ds=sidebyside

diff --git a/src/make.env.in b/src/make.env.in
index e727bacff9..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) $(APPEXTRALIBS)
+OPENGLLIBS = @OPENGL_LIBS@
+LDLIBS = $(APPEXTRALIBS) ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS)
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
@@ -20,7 +21,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\"" $(APPEXTRADEFS)
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
 
 ########################### VERSION #################################
 
@@ -58,6 +59,10 @@ SHARED_LD   = @SHARED_LD@
 
 RESFLAGS    = @RESFLAGS@
 RESCOMP     = @RESCOMP@
+REZ         = @REZ@
+REZFLAGS    = @REZFLAGS@
+DEREZ       = @DEREZ@
+DEREZFLAGS  = @DEREZFLAGS@
 DLLTOOL     = @DLLTOOL@
 
 ########################### Flags #################################
@@ -69,8 +74,8 @@ DLLTOOL     = @DLLTOOL@
 # 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