From 102f951d7f6db7795d6a7d04cb7458db53c20650 Mon Sep 17 00:00:00 2001
From: Guillermo Rodriguez Garcia <guille@iies.es>
Date: Wed, 16 Feb 2000 23:46:07 +0000
Subject: [PATCH] added a few comments and remove $(COPYSEP)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/g95.t |  4 ++--
 src/makeg95.env         | 22 +++++++++++++---------
 src/msw/makefile.g95    |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index a7ad909a72..d830757770 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -384,10 +384,10 @@ $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
-	$(COPY) ..$(COPYSEP)common$(COPYSEP)dosyacc.c ..$(COPYSEP)common$(COPYSEP)y_tab.c
+	$(COPY) ../common/dosyacc.c ../common/y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-	$(COPY) ..$(COPYSEP)common$(COPYSEP)doslex.c ..$(COPYSEP)common$(COPYSEP)lex_yy.c
+	$(COPY) ../common/doslex.c ../common/lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
diff --git a/src/makeg95.env b/src/makeg95.env
index 0e65d8146b..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,13 +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.
+# 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
-COPYSEP=/
 
 # Cross compiling? Provide the target prefix (eg., i386-mingw32-)
 # CROSS=i386-mingw32-
@@ -56,18 +58,20 @@ 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
@@ -101,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
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index bcf223fb66..2c5ffa5468 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -544,10 +544,10 @@ $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c   	
-	$(COPY) ..$(COPYSEP)common$(COPYSEP)dosyacc.c ..$(COPYSEP)common$(COPYSEP)y_tab.c
+	$(COPY) ../common/dosyacc.c ../common/y_tab.c
 
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-	$(COPY) ..$(COPYSEP)common$(COPYSEP)doslex.c ..$(COPYSEP)common$(COPYSEP)lex_yy.c
+	$(COPY) ../common/doslex.c ../common/lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
-- 
2.45.2