X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f24e0b5b44f27c170a28e6d6c1addfe1dee8a23..a949e8fac2666418b2a6eb15e94959563cf8aad6:/src/makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index e53d90b25c..2daa2530dc 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -15,10 +15,17 @@
 MINGW32=1
 
 # Set to the version you have
-MINGW32VERSION=2.95
+#MINGW32VERSION=2.95
+MINGW32VERSION=3.0
+
+# If we're using MSYS, or other utilities that
+# use forward slashes, we need to set this when
+# invoking the makefile from DOS, or the wrong separators
+# will be assumed.
+#OSTYPE=msys
 
 # If building DLL, the version
-WXVERSION=233
+WXVERSION=250
 
 ifndef UNICODE
   UNICODE=0
@@ -46,29 +53,40 @@ RM=rm -f
 # You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site.
 COPY=cp
 
-# Cross compiling? Provide the target prefix (eg., i386-mingw32-)
-# CROSS=i386-mingw32-
-
 ########################## Compiler ##################################
 
 # 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)" ""
+    ifeq ($(_GCC3),1)
+      CC = gcc --pipe
+    else
+      CC = gcc --pipe -fvtable-thunks
+    endif
   else
-    CC = $(CROSS)gcc
+    CC = gcc
   endif
 else
-  CC = $(CROSS)gcc
+  CC = gcc
 endif
 
 # C compiler for pure C programs
 CCC = $(CC)
 
 # Compiler used for LEX generated C
-CCLEX=$(CROSS)gcc
+CCLEX=gcc
 
 # This shouldn't be needed as make is supposed to define this
 # variable itself. Uncomment it if your make complains.
@@ -84,7 +102,7 @@ YACC=byacc
 # Settings for Cyginw/Mingw32
 # Some versions of windres cannot cope with the --preprocessor
 # option. Uncomment the RCPREPROCESSOR line below if yours can.
-RESCOMP=$(CROSS)windres
+RESCOMP=windres
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
@@ -99,8 +117,8 @@ RCDEFSWITCH=--define
 RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
 # Needed to build a DLL if your linker does not support --shared option.
-AS = $(CROSS)as
-DLLTOOL = $(CROSS)dlltool
+AS = as
+DLLTOOL = dlltool
 
 ########################## Compiler flags #############################
 
@@ -109,6 +127,9 @@ DLLTOOL = $(CROSS)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__
@@ -165,9 +186,9 @@ endif
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
-AR = $(CROSS)ar
+AR = ar
 AROPTIONS = ruv
-RANLIB = $(CROSS)ranlib
+RANLIB = ranlib
 
 # Extra compiler libraries
 COMPLIBS=
@@ -263,18 +284,21 @@ 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
+.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .cc .c
 
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $*.c
 
+.cc.o:
+	$(CC) -c $(CPPFLAGS) -o $@ $*.cc
+
 .cxx.o:
 	$(CC) -c $(CPPFLAGS) -o $@ $*.cxx