X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b97ee33d73653216512fd634a27b6135191ece9..69e9bc09b8925c84435077dc31edd0140b668649:/src/makeg95.env?ds=sidebyside

diff --git a/src/makeg95.env b/src/makeg95.env
index 390f8bb931..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,11 +26,13 @@ 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
-COPY=copy
+# 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-
@@ -54,24 +58,28 @@ CCC = $(CC)
 # Compiler used for LEX generated C
 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
+# 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
-RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
+# 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=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
@@ -97,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