Updated README.win32 and VS9 Readme.txt

-Set README.win32 to have Windows EOL
-Updated README.win32 regarding the situation of modules on Windows
 under different build approaches.
-Tell people in both Readme files about the GNOME Live! page that
 describes building Pango and its dependencies with Visual Studio
 in better detail.

diff --git a/README.win32 b/README.win32
index 283b6cb..c184873 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -1,34 +1,43 @@
-The Pango backends written for Win32 is pangowin32. Pangowin32 uses
-the Win32 GDI font API. GTK+ 2.8 and later on Win32 however actually
-uses the pangocairo backend (which then uses only small parts of
-pangowin32). Much of the GDI font API calls are in cairo.
-
-The pangoft2 backend was originally written with Win32 in mind, but
-its main use nowadays is on other platforms than Win32.
-
-There are three ways to build Pango for Win32:
-
-1) Use gcc (mingw), libtool, make, like on Unix.
-
-If building from git, run the autogen.sh script that runs aclocal,
-automake, autoconf and configure to build makefiles etc. This is what
-tml@novell.com uses. Pass the same switches to autogen.sh that you
-would pass to the configure script.
-
-If building from a tarball, just running the configure script and then
-make should be enough. But, as always, you need to understand what is
-happening and follow the progress in case manual intervention is
-needed.
-
-tml ran the configure script like this when building binaries for
-Pango 1.10.0:
-
-PATH=/devel/dist/glib-2.8.0/bin:$PATH ACLOCAL_FLAGS="-I /devel/dist/glib-2.8.0/share/aclocal" PKG_CONFIG_PATH=/devel/dist/glib-2.8.0/lib/pkgconfig:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3' CPPFLAGS='-I/opt/gnu/include' LDFLAGS='-L/opt/gnu/lib' CFLAGS=-O ./configure --disable-gtk-doc  --without-x --prefix=c:/devel/target/pango-1.10.0
-
-2) Use Visual Studio 2008. Use the solution file in
-build/win32/vs9. See the README.txt there for more information.
-
-3) Use MSVC and nmake. Use the makefile.msc makefiles. These makefiles
-are supported by Hans Breuer. They requires manual editing. You need
-to have the source code to some suitable version of glib in a sibling
-directory. Ask Hans for advice.
+The Pango backends written for Win32 is pangowin32. Pangowin32 uses\r
+the Win32 GDI font API. GTK+ 2.8 and later on Win32 however actually\r
+uses the pangocairo backend (which then uses only small parts of\r
+pangowin32). Much of the GDI font API calls are in cairo.\r
+\r
+The pangoft2 backend was originally written with Win32 in mind, but\r
+its main use nowadays is on other platforms than Win32.\r
+\r
+There are three ways to build Pango for Win32:\r
+\r
+1) Use gcc (mingw), libtool, make, like on Unix.\r
+\r
+If building from git, run the autogen.sh script that runs aclocal,\r
+automake, autoconf and configure to build makefiles etc. This is what\r
+tml@novell.com uses. Pass the same switches to autogen.sh that you\r
+would pass to the configure script.\r
+\r
+If building from a tarball, just running the configure script and then\r
+make should be enough. But, as always, you need to understand what is\r
+happening and follow the progress in case manual intervention is\r
+needed.\r
+\r
+tml ran the configure script like this when building binaries for\r
+Pango 1.10.0:\r
+\r
+PATH=/devel/dist/glib-2.8.0/bin:$PATH ACLOCAL_FLAGS="-I /devel/dist/glib-2.8.0/share/aclocal" PKG_CONFIG_PATH=/devel/dist/glib-2.8.0/lib/pkgconfig:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3' CPPFLAGS='-I/opt/gnu/include' LDFLAGS='-L/opt/gnu/lib' CFLAGS=-O ./configure --disable-gtk-doc  --without-x --prefix=c:/devel/target/pango-1.10.0\r
+\r
+2) Use Visual Studio 2008 (Express or above). Use the solution file in\r
+build/win32/vs9. See the README.txt there for more information,\r
+or see the following GNOME Live! page for a more detailed description\r
+of building Pango and its dependencies with Visual Studio 2008:\r
+\r
+https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack\r
+\r
+3) Use MSVC and nmake. Use the makefile.msc makefiles. These makefiles\r
+are supported by Hans Breuer. They requires manual editing. You need\r
+to have the source code to some suitable version of glib in a sibling\r
+directory. Ask Hans for advice.\r
+\r
+Please note that approaches 2 and 3 (involving building with MSVC) will\r
+build Pango modules directly into the main Pango, PangoWin32 and\r
+(if applicable) PangoFT2 DLLs-the GCC builds will build each Pango module\r
+as a seperate DLL.\r

diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index d4ef37e..58066ef 100644 (file)
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -4,6 +4,11 @@ Please do not compile Pango in a path with spaces to avoid potential
 problems during the build and/or during the usage of the Pango\r
 library.\r
 \r
+Please refer to the following GNOME Live! page for more detailed\r
+instructions on building Pango and its dependencies with Visual C++:\r
+\r
+https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack\r
+\r
 This VS9 solution and the projects it includes are intented to be used\r
 in a Pango source tree unpacked from a tarball. In a git checkout you\r
 first need to use some Unix-like environment or manual work to expand\r