Small changes

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 2250b07a5c423c63b9b86282fa6bce28c85b4f82..d014e9d8271bf2d8315d8de976c9542f91bad8c6 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -7,7 +7,10 @@
 
 # If using Cygwin, set this to 0.
 # If using Mingw32, set this to 1.
-MINGW32=0
+MINGW32=1
+
+# Set to the version you have
+MINGW32VERSION=2.95
 
 ########################## Compiler ##################################
 
@@ -15,9 +18,13 @@ MINGW32=0
 # Put a comment before --pipe for Cygwin, remove comment for Mingw32 2.95
 
 ifeq ($(MINGW32),1)
-CC = gcc --pipe -fvtable-thunks
+  ifeq ($(MINGW32VERSION),2.95)
+    CC = gcc --pipe -fvtable-thunks
+  else
+    CC = gcc
+  endif
 else
-CC = gcc
+  CC = gcc
 endif
 
 # C compiler for pure C programs
@@ -119,6 +126,14 @@ WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
 
+GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32 
+
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32),2.95)
+    GNUWIN32EXTRA=
+  endif
+endif
+
 ifeq ($(MINGW32),1)
 INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
 else