last line missing

[wxWidgets.git] / BuildCVS.txt

diff --git a/BuildCVS.txt b/BuildCVS.txt
index 4668a0bc8e48e1e7574e096c463e2db9db8d2e4c..75480522d01cb74b4a561a89e7874c6ab59de263 100644 (file)
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -35,6 +35,27 @@ 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.
+
+->Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
+  the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
+  If using MINGW32, also set the MINGW32VERSION variable
+  appropriately.
+
 
 c) Build instructions
 
@@ -58,9 +79,12 @@ 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.vc   (if using MS VC++)
 
 
 II) Unix ports
@@ -141,7 +165,7 @@ To cross compile the windows library, do
 (or whatever you called it)
 Now run configure. There are two ways to do this
 -> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw \
-   --enable-dnd=no
+   --enable-dnd=no --without-odbc
 where --build= should read whatever platform you're building on. Configure
 will notice that build and host platforms differ, and automatically prepend
 i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
@@ -157,6 +181,9 @@ Drag'n'drop is disabled because mingw32 lacks (AFAIK) OLE headers.
 [ Update: some new mingw32 versions now have a new set of windows header
 files, which apparently can handle ole. Untested at the moment ]
 
+ODBC files don't compile as of 13.10.99 - may be this will be fixed by the
+moment you're reading these lines.
+
 Configure will conclude that shared libraries are out of the question and
 opt for a static one. I haven't looked into DLL creation yet.
 
@@ -165,14 +192,37 @@ Type
 and wait, wait, wait. Don't leave the room, because the minute you do there
 will be a compile error :-)
 
+NB: you risk to get quite a few warnings about "ANSI C++ forbids implicit
+    conversion from 'void *'" in all places where va_arg macro is used. This
+    is due to a bug in (some versions of) mingw32 headers which may be
+    corrected by editing the file
+
+    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
+
+    (instead of egcs-2.91.57 you may have something different), searching for
+    the lines
+
+/* Define __gnuc_va_list.  */
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
+typedef char *__gnuc_va_list;
+#else
+typedef void *__gnuc_va_list;
+#endif
+#endif
+
+    and adding "|| defined(_WIN32)" to the list of platforms on which
+    __gnuc_va_list is char *.
+
 If this is successful, you end up with a libwx_msw.a in win32/lib.  Now try
 building the minimal sample:
 
 -> cd samples/minimal
 -> make
--> mv minimal minimal.exe
 
-and run it with wine, for example
+and run it with wine, for example (or copy to a Windows box)
 -> wine minimal.exe
 
 If all is well, do an install; from win32