window clipper added

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index e53d90b25c2d510aaadd705d4bd284cbd865ae9c..a84cdd4ab3cfedc555ef94b46e011580196475f8 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -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