Add missing wxUSE_MARKUP checks in wxOSX code.

[wxWidgets.git] / docs / wine / install.txt

diff --git a/docs/wine/install.txt b/docs/wine/install.txt
index 6b0fffd2338d58a5dd689f1e61d1d09e1a1c4463..9a5cd5da1ad5e48505eb1a5bce7067f3642c739f 100644 (file)
--- a/docs/wine/install.txt
+++ b/docs/wine/install.txt
@@ -16,7 +16,7 @@ On all variants of Unix except Linux (and maybe except *BSD), shared libraries
 are not supported out of the box due to the utter stupidity of libtool, so you'll 
 have to do this to get shared library support:
 
 are not supported out of the box due to the utter stupidity of libtool, so you'll 
 have to do this to get shared library support:
 

-> ./configure --with-wine --disable-static --enable-shared
+> ./configure --with-wine --disable-unicode --disable-static --enable-shared

 
 Then you'll have to edit the wrongly created libtool script. There are two
 important entries with respect to shared library creation, which are
 
 Then you'll have to edit the wrongly created libtool script. There are two
 important entries with respect to shared library creation, which are


@@ -308,13 +308,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
 
 Using this way, a make file for the minimal sample would look
 like this
 

-CC = g++
+CXX = g++

 
 minimal: minimal.o
 
 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
+minimal.o: minimal.cpp
+    $(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o

 
 clean: 
     rm -f *.o minimal
 
 clean: 
     rm -f *.o minimal


@@ -379,3 +379,7 @@ wxWINE library will need recompiling with different options.
 
 Any progress on this front will be very welcome.
 
 
 Any progress on this front will be very welcome.
 

+Note that while wxWINE builds with --enable-unicode, samples
+don't run. Some samples will run when built with
+--disable-unicode, and others (such as auidemo) fail.
+