cosmetic fixes to font encoding names

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 90614fde8c382484bf3f764c72ca6f0476b6535c..a0461f5fa3ed900cb874ec22221e4d4b6cb5f1a9 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -10,15 +10,15 @@
 # CVS_ID: $Id$
 #
 
 # CVS_ID: $Id$
 #
 

-# If using Cygwin, set this to 0.
-# If using Mingw32, set this to 1.
-MINGW32=0
+# If using Cygwin beta, set this to 0.
+# If using Mingw32 or Cygwin 1.0 or later, set this to 1.
+MINGW32=1

 
 # Set to the version you have
 MINGW32VERSION=2.95
 
 # If building DLL, the version
 
 # Set to the version you have
 MINGW32VERSION=2.95
 
 # If building DLL, the version

-WXVERSION=21_11
+WXVERSION=22_0

 
 # Say yes if you have a "modern" linker that supports --shared option.
 # Note that you're probably going to wait forever for dlltool/gcc/etc
 
 # Say yes if you have a "modern" linker that supports --shared option.
 # Note that you're probably going to wait forever for dlltool/gcc/etc


@@ -154,7 +154,7 @@ WINLIBS=-lstdc++ -lgcc \
        -lwinspool -lwinmm -lshell32 \
        -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
        -lole32 -loleaut32 -luuid \
        -lwinspool -lwinmm -lshell32 \
        -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
        -lole32 -loleaut32 -luuid \

-       -lodbc32 -lwsock32#  -loldnames
+       -lodbc32 -lwsock32 -lopengl32 -lglu32 #  -loldnames

 
 #WINLIBS=-lstdc++ -lgcc \
 #      -lwinspool -lwinmm -lshell32 \
 
 #WINLIBS=-lstdc++ -lgcc \
 #      -lwinspool -lwinmm -lshell32 \