get opengl samples going again

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 26fff919289cc0118108bf1e380c0461871bbc66..f097455c0459b603e164520799a676bdbc98988a 100644 (file)
--- 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.
 #
 # 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$
 #
 
 # CVS_ID: $Id$
 #
 


@@ -24,16 +26,13 @@ WXVERSION=21_11
 # supports --shared.
 LD_SUPPORTS_SHARED=yes
 
 # 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 
 
 RM=rm -f 
 

-# Set to the appropriate copy command
-# Some possible alternatives:
-# COPY=cp and COPYSEP=/
-# COPY=copy and COPYSEP=\
-#
-COPY=copy
-COPYSEP=\
+# 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-
 
 # Cross compiling? Provide the target prefix (eg., i386-mingw32-)
 # CROSS=i386-mingw32-


@@ -59,18 +58,20 @@ CCC = $(CC)
 # Compiler used for LEX generated C
 CCLEX=$(CROSS)gcc
 
 # 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
 
 LEX=flex # -t -L
 

-# YACC. yacc or bison
+# YACC (currently unused)

 YACC=byacc
 #YACC=bison
 
 # Settings for Cyginw/Mingw32
 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
 RESCOMP=$(CROSS)windres
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o


@@ -104,7 +105,7 @@ ifeq ($(WIN95),0)
 APPVER=3.50
 WINVERSION=-DWINVER=0x0350 -D__GNUWIN32__ -D__WIN32__ # Generic WIN32
 else
 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
 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
 WINVERSION=-DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__
 endif