X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a7f306263595bff3b74e96e4c2bee6f0a008500..d45d30c8682f858321600e2958167d7ef54ebeb5:/docs/gtk/install.txt

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index ff425b0529..838b2bd455 100644
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -90,7 +90,7 @@ program - or due to using a broken compiler (and its optimisation) such as GCC 2
 
 Now create your super-application myfoo.app and compile anywhere with
 
-g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo
+gcc myfoo.cpp `wx-config --libs --cflags` -o myfoo
 
 * General
 -----------------------
@@ -143,7 +143,7 @@ make install
 ldconfig
 exit
   
-NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE ALL PROGRAMS WILL CRASH UPON 
+NB: DO NOT COMPILE WXGTK WITH GCC 2.7 AND THREADS, SINCE ALL PROGRAMS WILL CRASH UPON 
 START-UP! Just always use egcs and be happy.
 
 * Building wxGTK on OS/2
@@ -151,11 +151,11 @@ START-UP! Just always use egcs and be happy.
 
 Please send comments and question about the OS/2 installation
 to Andrea Venturoli <a.ventu@flashnet.it> and patches to
-make the installation work (better) to me (Robert Roebling).
+make to me (Robert Roebling) or the wxWindows mailing list.
 
-You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3), 
-gtk+ (?), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), 
-korn shell (5.2.13), Autoconf (?),  GNU file utilities (3.6), 
+You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), 
+GTK+ (1.2.1 or newer), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), 
+korn shell (5.2.13), Autoconf (2.13),  GNU file utilities (3.6), 
 GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), 
 sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1).
 
@@ -163,11 +163,17 @@ Open an OS/2 prompt and switch to the directory above.
 First set some global environment variables we need:
 
 SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__
+SET CFLAGS=-Zmtd -D__ST_MT_ERRNO__
 SET OSTYPE=OS2X              
 SET COMSPEC=sh
 
 Notice you can choose whatever you want, if you don't like OS2X.
 
+After running configure, you'll have to apply to modifications manually
+to the created Makefile:
+- Replace all ":" with ";" in the VPATH variable
+- Replace "ley.yy.c" with "lexyy.c"
+
 * Building wxGTK on SGI
 --------------------------
 
@@ -239,12 +245,12 @@ toolkit. You must do this by running configure with either of:
 
 The following options handle the kind of library you want to build.
 
-	--disable-threads       Compile without thread support. Threads
-	                        support is also required for the
-				socket code to work.
+	--disable-threads       Compile without thread support.
 
 	--disable-shared        Do not create shared libraries.
 
+	--enable-static         Create static libraries.
+
 	--disable-optimise	Do not optimise the code. Can
 	                        sometimes be useful for debugging
 				and is required on some architectures
@@ -270,9 +276,9 @@ The following options handle the kind of library you want to build.
 				
 	--enable-permissive     Enable compilation without creation of
 	                        giving erros as soon as you compile with
-				Solaris ANSI-defying headers...
+				Solaris' ANSI-defying headers...
 				
-	--enable-mem_tracing    Add built-in memory tracing. 
+	--enable-mem_tracing    Add built-in memory tracing.
 				
 	--enable-dmalloc        Use the dmalloc memory debugger.
 	                        Read more at www.letters.com/dmalloc/
@@ -305,7 +311,13 @@ are
 	
 	--without-libjpeg	Disables JPEG image format code.
 	
-{	--without-odbc          Disables ODBC code. Not yet. }
+	--disable-pnm		Disables PNM image format code.
+	
+	--disable-gif		Disables GIF image format code.
+	
+	--disable-pcx		Disables PCX image format code.
+	
+	--without-odbc          Disables ODBC code.
 	
         --disable-resources     Disables the use of *.wxr type
 	                        resources.