X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/741258ea5a5ab8ee810ad84762ffb5874bc95c6c..13053f649ba24225f7fd373afe472819da7a04df:/src/makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 4ecb310617..39f402da26 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -15,7 +15,8 @@
 MINGW32=1
 
 # Set to the version you have
-MINGW32VERSION=2.95
+#MINGW32VERSION=2.95
+MINGW32VERSION=3.0
 
 # If building DLL, the version
 WXVERSION=233
@@ -63,7 +64,11 @@ endif
 
 ifeq ($(MINGW32),1)
   ifneq "$(_GCC295)$(_GCC3)" ""
-    CC = gcc --pipe $(if $(_GCC3), , -fvtable-thunks)
+    ifeq ($(_GCC3),1)
+      CC = gcc --pipe
+    else
+      CC = gcc --pipe -fvtable-thunks
+    endif
   else
     CC = gcc
   endif
@@ -116,6 +121,9 @@ DLLTOOL = dlltool
 # add "-DHAVE_W32API_H" if you have w32api >= 0.5
 OPTIONS = -DSTRICT # -D__MINGW32__
 
+# Add "-mthreads" if you want to have threads under mingw32
+COMMON_THREADFLAGS =
+
 # Debugging information
 ifeq ($(FINAL),0)
   DEBUGFLAGS = -g -D__WXDEBUG__
@@ -270,12 +278,12 @@ endif
 
 
 # You shouldn't need to change these...
-CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS) $(EXTRADLLFLAGS)
-CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS) -DWIN32_LEAN_AND_MEAN
+CPPFLAGS = $(XINCLUDE) $(INC) $(COMMON_THREADFLAGS) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS) $(EXTRADLLFLAGS)
+CFLAGS = $(XINCLUDE) $(INC) $(COMMON_THREADFLAGS) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS) -DWIN32_LEAN_AND_MEAN
 ifeq ($(wxUSE_GUI),1)
     WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
 endif
-LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
+LDFLAGS = $(WINDOWSLDFLAGS) $(COMMON_THREADFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .c