Make wxMMedia2 compile on VC++ 5

[wxWidgets.git] / BuildCVS.txt

diff --git a/BuildCVS.txt b/BuildCVS.txt
index 420989f63de4eafb2e94d0823088dc5f24f3c617..f086d038209a921d28f9d99d4501578bac0fbb6f 100644 (file)
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -29,34 +29,55 @@ and its make.exe).
    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_SOCKETS       0
-   #define wxUSE_HTML          0
+   #define wxUSE_HTML          1
    #define wxUSE_THREADS       1
    #define wxUSE_FS_INET       0
-   #define wxUSE_FS_ZIP        0
+   #define wxUSE_FS_ZIP        1
    #define wxUSE_BUSYINFO      1
    #define wxUSE_DYNLIB_CLASS  1
    #define wxUSE_ZIPSTREAM     1
-   #define wxUSE_JPEGLIB       1
-   #define wxUSE_PNGLIB        1
+   #define wxUSE_LIBJPEG       1
+   #define wxUSE_LIBPNG        1
 
-   and disable iostreams with
+   and iostreams ares disabled with
    #define wxUSE_STD_IOSTREAM   0
 -> type: cd c:\wxWin\src\msw
 -> type: make -f makefile.g95
 
-II) GTK port on Unix using plain makefiles.
-------------------------------------------
+II) Unix ports
+--------------
+
+Building wxGTK or wxMotif completely without configure
+won't ever work, but there is now a new makefile system
+that works without libtool and automake, using only
+configure to create what is needed. 
+
+In order to create configure, you need to have the
+GNU autoconf package (version 2.13 or 2.14) installed
+on your system and type run "autoconf" in the base
+directory (or run the autogen.sh script in the same
+directory, which just calls autoconf).
 
 Set WXWIN environment variable to the base directory such
-as ~/wxWindows
+as ~/wxWindows (this is actually not really needed).
 
 -> type: export WXWIN=~/wxWindows
--> edit ~/wxWindows/src/gtk.env as you wish.
--> type: cd ~/wxWindows/src/gtk
--> type: cp ./setup0.h setup.h
+-> type: md mybuild
+-> type: cd mybuild
+-> type: ../configure --with-motif
+or type: ../configure --with-gtk
 -> type: make
+-> type: su <type root password>
+-> type: make install
+-> type: ldconfig
+-> type: exit
 
+Call configure with --disable-shared to create a static
+library. Calling "make uninstall" will remove the installed
+library and "make dist" will create a distribution (not
+yet complete).
 
 III) Windows using configure
 ----------------------------------------
@@ -70,40 +91,6 @@ ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
 Of course, you can also build the library using plain makefiles (see 
 section I).
 
-IV) Unix using configure
-----------------------------------------
-
-a) You have all the newest and greatest GNU tools installed on your system 
-and in the same directory hierachy (e.g. either all tools in /usr or all 
-in /usr/local), these tools are:
-- GNU libtool 1.2e (1.3 doesn't work here)
-- GNU autoconf 2.13 (including autoheader 2.13)
-- GNU automake 1.4 (including aclocal 1.4)
-and possibly but not forcibly
-- GNU make 3.76.1
-- GNU C++ (EGCS)
-
--> Go to the base directory
--> type: ./autogen.sh
-
-b) You don't know what autos are and have no driver's licence anyway:
-
--> Go to the testconf directory
--> type: ./apply
-
-a+b) Then proceed in either case with:
-
--> Choose a directory name that seems fit for building wxWindows, e.g. mybuild
--> Go the base directory
--> type: mkdir mybuild
--> type: cd mybuild
--> type: ../configure --with-gtk   
-or type: ../configure --with-motif
-or type: ../configure --with-wine
--> type make
--> drink lots of coffee and go shopping
-
-
 V) MacOS
 ----------------------------------------