X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75515c52a48086d39f1584caec03fefaacb37306..af547d51b7494fd365ae29e048d458ff72b27056:/src/makeg95.env?ds=inline

diff --git a/src/makeg95.env b/src/makeg95.env
index 7dfcb53b0a..f097455c04 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -5,6 +5,8 @@
 # made here take effect everywhere (except where overriden).
 # The settings are for GnuWin32-derived compilers, i.e. Cygwin and Mingw32.
 #
+# Customize this file to match your own settings.
+#
 # CVS_ID: $Id$
 #
 
@@ -24,12 +26,17 @@ WXVERSION=21_11
 # supports --shared.
 LD_SUPPORTS_SHARED=yes
 
-# Set to the appropriate remove command
+# Set to the appropriate remove command (must support forward slashes)
+# You can get a suitable rm.exe from ports/mingw32/extra.zip on the ftp site.
 RM=rm -f 
 
-# Set to the appropriate copy command and separator
+# Set to the appropriate copy command (must support forward slashes)
+# 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
@@ -37,43 +44,48 @@ COPY=cp
 
 ifeq ($(MINGW32),1)
   ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
-    CC = gcc --pipe -fvtable-thunks
+    CC = $(CROSS)gcc --pipe -fvtable-thunks
   else
-    CC = gcc
+    CC = $(CROSS)gcc
   endif
 else
-  CC = gcc
+  CC = $(CROSS)gcc
 endif
 
 # C compiler for pure C programs
 CCC = $(CC)
 
 # Compiler used for LEX generated C
-CCLEX=gcc
+CCLEX=$(CROSS)gcc
 
-# GRG: This shouldn't be here! make is supposed to define the
-# MAKE variable itself.
-MAKE=make
+# This shouldn't be needed as make is supposed to define this
+# variable itself. Uncomment it if your make complains.
+#MAKE=make
 
-# LEX
+# LEX (currently unused)
 LEX=flex # -t -L
 
-# YACC. yacc or bison
+# YACC (currently unused)
 YACC=byacc
 #YACC=bison
 
 # Settings for Cyginw/Mingw32
-RESCOMP=windres
+# Some versions of windres cannot cope with the --preprocessor
+# option. Uncomment the RCPREPROCESSOR line below if yours can.
+RESCOMP=$(CROSS)windres
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
 RCDEFSWITCH=--define
+# Note that this can cause windres to fail (Win95/98 problem?)
+# but commenting out RCPREPROCESSOR then does the trick.
+#RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
 
-RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
+RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
 # Needed to build a DLL if your linker does not support --shared option.
-AS = as
-DLLTOOL = dlltool
+AS = $(CROSS)as
+DLLTOOL = $(CROSS)dlltool
 
 ########################## Compiler flags #############################
 
@@ -93,7 +105,7 @@ ifeq ($(WIN95),0)
 APPVER=3.50
 WINVERSION=-DWINVER=0x0350 -D__GNUWIN32__ -D__WIN32__ # Generic WIN32
 else
-APPVER=3.50 # 4.0
+APPVER=4.0 # 3.50
 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
 WINVERSION=-DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__
 endif
@@ -124,9 +136,9 @@ OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
-AR = ar
+AR = $(CROSS)ar
 AROPTIONS = ruv
-RANLIB = ranlib
+RANLIB = $(CROSS)ranlib
 
 # Extra compiler libraries
 COMPLIBS=
@@ -205,10 +217,11 @@ LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS)
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
 
-.$(SRCSUFF).$(OBJSUFF):
-	$(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
 
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $*.c
 
+.$(SRCSUFF).$(OBJSUFF):
+	$(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
+