X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/711df835d34672eef54d922844b69fb0cab0a1fc..f1d93f0beeec9d88f8a225aa35a9ccc163dcdb15:/src/makeg95.env?ds=sidebyside

diff --git a/src/makeg95.env b/src/makeg95.env
index f10eae21fa..a0461f5fa3 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -10,15 +10,15 @@
 # CVS_ID: $Id$
 #
 
-# If using Cygwin, set this to 0.
-# If using Mingw32, set this to 1.
+# If using Cygwin beta, set this to 0.
+# If using Mingw32 or Cygwin 1.0 or later, set this to 1.
 MINGW32=1
 
 # Set to the version you have
 MINGW32VERSION=2.95
 
 # If building DLL, the version
-WXVERSION=21_11
+WXVERSION=22_0
 
 # Say yes if you have a "modern" linker that supports --shared option.
 # Note that you're probably going to wait forever for dlltool/gcc/etc
@@ -81,7 +81,9 @@ RCDEFSWITCH=--define
 # but commenting out RCPREPROCESSOR then does the trick.
 #RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
 
-RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCINCSWITCH) $(WXDIR)/contrib/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
+# Don't make this too long (e.g. by adding contrib/include/wx) because it will
+# truncate the command line
+RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
 # Needed to build a DLL if your linker does not support --shared option.
 AS = $(CROSS)as
@@ -152,7 +154,7 @@ WINLIBS=-lstdc++ -lgcc \
 	-lwinspool -lwinmm -lshell32 \
 	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
 	-lole32 -loleaut32 -luuid \
-	-lodbc32 -lwsock32#  -loldnames
+	-lodbc32 -lwsock32 -lopengl32 -lglu32 #  -loldnames
 
 #WINLIBS=-lstdc++ -lgcc \
 #	-lwinspool -lwinmm -lshell32 \
@@ -172,11 +174,11 @@ ifeq ($(MINGW32),1)
   endif
 endif
 
-ifeq ($(MINGW32),1)
-INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
-else
+#ifeq ($(MINGW32),1)
+#INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
+#else
 INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 
-endif
+#endif
 
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"