From d66d3ce6ddd5e5b69449305a46c5c40ed0e85db6 Mon Sep 17 00:00:00 2001
From: "J. Russell Smyth" <drfish@cox.net>
Date: Mon, 11 Oct 1999 05:56:43 +0000
Subject: [PATCH] Updated instructions for Mingw32/gcc-2.95

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 BuildCVS.txt | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/BuildCVS.txt b/BuildCVS.txt
index 4668a0bc8e..bcc040f3d7 100644
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -35,7 +35,25 @@ and its make.exe).
 -> Set your path so that it includes the directory
    where your compiler and tools reside
 
+b-2) Using Mingw32 with gcc-2.95 and Anders Norlander's 
+	Win32 headers
 
+Using the newer gcc-2.95/Noralander header combination
+will allow you to compile more of the MSW code, such
+as OLE and Drag-n-Drop.
+
+Instructions are similar to those for Regular Mingw32 except
+
+->Get the compiler from 
+    ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
+
+->patch the gcc headers with info in wxWin\Mingw32-gcc295.patches. 
+  PLEASE APPLY THESE PATCHES BY HAND! There are apparently a few
+  different versions of the headers floating around.
+
+->copy wxWin\src\makeg295.env to wxWin\src\makeg95.env
+
+    
 c) Build instructions
 
 -> Assumming that you installed the wxWindows sources
@@ -44,7 +62,7 @@ c) Build instructions
    to   c:\wxWin\include\wx\msw\setup.h
 -> Edit c:\wxWin\include\wx\msw\setup.h so that
    most features are enabled (i.e. defined to 1) with
-   #define wxUSE_ODBC          0
+   #define wxUSE_ODBC          0	
    #define wxUSE_SOCKETS       0
    #define wxUSE_HTML          1
    #define wxUSE_THREADS       1
@@ -58,9 +76,13 @@ c) Build instructions
 
    and iostreams ares disabled with
    #define wxUSE_STD_IOSTREAM   0
+   
+   note: ODBC and SOCKETS can be 1 for gcc-2.95
+   
 -> type: cd c:\wxWin\src\msw
--> type: make -f makefile.g95 (if using GNU tools)
-or type: make -f makefile.vc  (if using MS VC++)
+-> type: make -f makefile.g95  (if using GNU tools)
+or type: make -f makefile.g295 (if using Mingw32/gcc-2.95)	
+or type: make -f makefile.vc   (if using MS VC++)
 
 
 II) Unix ports
-- 
2.45.2