Removed rundant files, updated readme.txt.

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index e53d90b25c2d510aaadd705d4bd284cbd865ae9c..f896f4ef1877cba5a8583f62608cf44514f3015f 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -46,29 +46,36 @@ RM=rm -f
 # You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site.
 COPY=cp
 
 # 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
 
 ########################## 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)
 ifeq ($(MINGW32),1)

-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
-    CC = $(CROSS)gcc --pipe -fvtable-thunks
+  ifneq "$(_GCC295)$(_GCC3)" ""
+    CC = gcc --pipe $(if $(_GCC3), , -fvtable-thunks)

   else
   else

-    CC = $(CROSS)gcc
+    CC = gcc

   endif
 else
   endif
 else

-  CC = $(CROSS)gcc
+  CC = gcc

 endif
 
 # C compiler for pure C programs
 CCC = $(CC)
 
 # Compiler used for LEX generated C
 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.
 
 # This shouldn't be needed as make is supposed to define this
 # variable itself. Uncomment it if your make complains.


@@ -84,7 +91,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.
 # 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
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir


@@ -99,8 +106,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.
 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 #############################
 
 
 ########################## Compiler flags #############################
 


@@ -109,6 +116,9 @@ DLLTOOL = $(CROSS)dlltool
 # add "-DHAVE_W32API_H" if you have w32api >= 0.5
 OPTIONS = -DSTRICT # -D__MINGW32__
 
 # 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__
 # Debugging information
 ifeq ($(FINAL),0)
   DEBUGFLAGS = -g -D__WXDEBUG__


@@ -165,9 +175,9 @@ endif
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).

-AR = $(CROSS)ar
+AR = ar

 AROPTIONS = ruv
 AROPTIONS = ruv

-RANLIB = $(CROSS)ranlib
+RANLIB = ranlib

 
 # Extra compiler libraries
 COMPLIBS=
 
 # Extra compiler libraries
 COMPLIBS=


@@ -263,12 +273,12 @@ endif
 
 
 # You shouldn't need to change these...
 
 
 # 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
 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 .c