X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c448540d81ebf3dac4a3abc085c6a47c1522a17a..15cae9eb9e277bcc3c63b3c5c20defe981660c79:/src/makeg95.env?ds=inline

diff --git a/src/makeg95.env b/src/makeg95.env
index 64dc0d12fb..a84cdd4ab3 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -18,7 +18,7 @@ MINGW32=1
 MINGW32VERSION=2.95
 
 # If building DLL, the version
-WXVERSION=232
+WXVERSION=233
 
 ifndef UNICODE
   UNICODE=0
@@ -54,9 +54,19 @@ COPY=cp
 # C++ compiler
 # Put a comment before --pipe for Cygwin, remove comment for Mingw32 2.95
 
+# _GCC295 means GCC is GCC 2.95
+# _GCC3 mans GCC is 3.x or better (can actually just be 3.1 or better
+#                                  for Cygwin/MinGW)
+ifneq (,$(findstring 2.95, $(MINGW32VERSION)))
+  _GCC295=1
+endif
+ifneq (,$(findstring 3., $(MINGW32VERSION)))
+  _GCC3=1
+endif
+
 ifeq ($(MINGW32),1)
-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
-    CC = $(CROSS)gcc --pipe -fvtable-thunks
+  ifneq "$(_GCC295)$(_GCC3)" ""
+    CC = $(CROSS)gcc --pipe $(if $(_GCC3), , -fvtable-thunks)
   else
     CC = $(CROSS)gcc
   endif