X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a925b006781f0ca0c93ac342b5bbb3deeb4409d6..e17978953a7e6e5cc01823c07d717b7c1ce7f1ae:/docs/motif/install.txt

diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index f1269cfc7c..2eada2b3f4 100644
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -1,4 +1,4 @@
-wxWindows 2.1 for Motif installation
+wxWindows 2.3 for Motif installation
 ------------------------------------
 
 IMPORTANT NOTE:
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
   
   When sending bug reports tell us what version of wxWindows you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxMotif 2.1 beta 6, egcs 1.1.1, Redhat 5.0
+  example: wxMotif 2.3.0, egcs 1.1.1, Redhat 5.0
 
 First steps
 -----------
@@ -19,17 +19,12 @@ First steps
 - Prerequisites: Motif 1.2 or above, or Lesstif
   (not yet tested). Motif 2.0 and above may also be suitable.
 
-- Download the appropriate .tgz archive, or alternatively the files
-  wx2_x_y_gen.zip and wx2_x_y_mot.zip. Download documentation in a
-  preferred format, such as wx2_x_y_htm.zip or wx2_x_y_pdf.zip.
+- Download wxMotif-x.y.z.tgz, where x.y.z is the version number.
+  Download documentation in a preferred format, such as
+  wxWindows-HTML.zip or wxWindows-PDF.zip.
 
 - Make a directory such as ~/wx and unarchive the files into this
-  directory. If using the zip archives, use the -a option if available
-  to convert the ASCII files to Unix format. Don't worry about files being
-  overwritten: they should be identical anyway.
-
-  (See http://www.cdrom.com/pub/infozip/ if you don't have zip/unzip
-  already installed. Zip isn't the same as gzip!)
+  directory.
 
 - It is recommended that you install bison and flex; using yacc
   and lex may require tweaking of the makefiles. You also need
@@ -180,6 +175,49 @@ exit
 NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE ALL PROGRAMS WILL
 CRASH UPON START-UP! Just always use egcs and be happy.
 
+* Building wxGTK on OS/2
+--------------------------
+
+Please send comments and question about the OS/2 installation
+to Andrea Venturoli <a.ventu@flashnet.it> and patches to
+the wxWindows mailing list.
+
+You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), 
+Lesstif (0.89.1 or newer), emx (0.9d fix 1), flex (2.5.4),
+yacc (1.8), unix like shell, e.g. 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).
+
+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.
+
+Now, run autoconf in the main directory and in the samples, demos
+and utils subdirectory. This will generate the OS/2 specific
+versions of the configure scripts. Now run
+    configure --with-motif
+as described above.
+
+To verify Lesstif installation, configure will try to compile a
+sample program that requires X headers/libraries to be either
+available via C_INCLUDE_PATH and LIBRARY_PATH or you need to
+explicitly set CFLAGS prior to running configure.
+
+If you have pthreads library installed, it will be autodetected
+and the library will be compiled with thread-support.
+
+Note that configure assumes your flex will generate files named
+"lexyy.c", not "lex.yy.c". If you have a version which does
+generate "lex.yy.c", you need to manually change the generated
+makefile.
+
 * Building wxMotif on SGI
 --------------------------
 
@@ -205,10 +243,10 @@ Usage:
 	./configure options
 
 If you want to use system's C and C++ compiler,
-set environment variables CC and CCC as
+set environment variables CXX and CC as
 
 	% setenv CC cc
-	% setenv CCC CC
+	% setenv CXX CC
 	% ./configure options
 
 to see all the options please use:
@@ -315,7 +353,7 @@ are
 	
 	--without-libjpeg	Disables JPEG image format code.
 	
-	--without-odbc          Disables ODBC code.
+{	--without-odbc          Disables ODBC code. Not yet. }
 	
         --disable-resources     Disables the use of *.wxr type
 	                        resources.
@@ -394,13 +432,13 @@ g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo
 Using this way, a make file for the minimal sample would look
 like this
 
-CC = g++
+CXX = g++
 
 minimal: minimal.o
-    $(CC) -o minimal minimal.o `wx-config --libs` 
+    $(CXX) -o minimal minimal.o `wx-config --libs` 
 
 minimal.o: minimal.cpp mondrian.xpm
-    $(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o
+    $(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o
 
 clean: 
 	rm -f *.o minimal