[gtkmm-documentation/gtkmm-3-24] Update the "gtkmm and Win32" appendix



commit d9840c87c55515f7f4dc817260da9cdefc36231d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Oct 22 10:12:53 2020 +0200

    Update the "gtkmm and Win32" appendix
    
    Links in the patch added by Kjell Ahlstedt.
    Fixes #4

 docs/tutorial/C/index-in.docbook | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/docs/tutorial/C/index-in.docbook b/docs/tutorial/C/index-in.docbook
index a6fa0f9..8970005 100644
--- a/docs/tutorial/C/index-in.docbook
+++ b/docs/tutorial/C/index-in.docbook
@@ -10,6 +10,7 @@
   <!ENTITY url_figures_base "figures/">
   <!ENTITY url_examples_branch "gtkmm-3-24">
   <!ENTITY url_examples_base 
"https://gitlab.gnome.org/GNOME/gtkmm-documentation/tree/&url_examples_branch;/examples/book/";>
+  <!ENTITY url_gtkmm_base "https://gitlab.gnome.org/GNOME/gtkmm/tree/&url_examples_branch;/";>
   <!ENTITY gtkmm "<application>gtkmm</application>">
   <!ENTITY uuml "&#252;" >
   <!ENTITY szlig "&#223;" >
@@ -295,8 +296,12 @@ be downloaded from <ulink url="http://www.gtkmm.org/";></ulink>.
 
 <sect1 id="sec-packages-windows">
 <title>Microsoft Windows</title>
-<para>GTK+ and &gtkmm; were designed to work well with Microsoft Windows, and the developers encourage its 
use on the win32 platform. However, Windows has no standard installation system for development libraries. 
Please see the <ulink url="https://wiki.gnome.org/Projects/gtkmm/MSWindows";>Windows Installation</ulink>
-page for Windows-specific installation instructions and notes.</para>
+<para>GTK+ and &gtkmm; were designed to work well with Microsoft Windows, and the
+developers encourage its use on the win32 platform. However, Windows has no standard
+installation system for development libraries. Please see the
+<ulink url="https://wiki.gnome.org/Projects/gtkmm/MSWindows";>Windows Installation</ulink>
+page or the <link linkend="sec-windows-installation">&gtkmm; and Win32</link> appendix
+for Windows-specific installation instructions and notes.</para>
 </sect1>
 
 </chapter>
@@ -9269,23 +9274,20 @@ practical - and sensible - to subclass a button for that purpose.
       versa) with few modifications to the source.
     </para>
     <para>
-      &gtkmm; currently works with the <ulink
-        url="http://mingw.org/";>MingW/GCC3.4 compiler</ulink> and Microsoft
-      Visual C++ 2005 or later (including the freely available express
+      The latest stable &gtkmm; currently works with the
+      <ulink url="http://mingw.org/";>MinGW-w64/GCC4.8 compiler</ulink> and Microsoft
+      Visual C++ 2015 or later (including the freely available express/community
       editions) on the Windows platform. There is an
-      <ulink url="ftp://ftp.gnome.org/pub/GNOME/binaries/win32/gtkmm";>
-      installer</ulink> available for gtkmm on Microsoft Windows. Refer to
-      <ulink url="https://wiki.gnome.org/Projects/gtkmm/MSWindows/";>
-      https://wiki.gnome.org/Projects/gtkmm/MSWindows</ulink> for instructions how to
-      use it.
+      <ulink url="ftp://ftp.gnome.org/pub/GNOME/binaries/win32/gtkmm";>installer</ulink>
+      available for &gtkmm; on Microsoft Windows, albeit for older versions of &gtkmm;.
+      Please be aware that although normally it is fine to mix builds done with
+      Visual Studio 2015, 2017 and 2019, please do not do so when building
+      &gtkmm; with its -mm dependencies.
     </para>
-  <sect1 id="sec-building-on-win32">
-        <title>Building &gtkmm; on Win32</title>
-    <para>Please see <ulink url="https://wiki.gnome.org/Projects/gtkmm/MSWindows/BuildingGtkmm";>
-    https://wiki.gnome.org/Projects/gtkmm/MSWindows/BuildingGtkmm</ulink> for instructions on how to build 
gtkmm on Windows.
+    <para>Refer to the <ulink url="&url_gtkmm_base;README.win32">README.win32</ulink>,
+    as well as the <ulink url="&url_gtkmm_base;MSVC_NMake/README">README</ulink>
+    files in the &gtkmm;, pangomm and glibmm for instructions on how to build &gtkmm; on Windows.
     </para>
-
-    </sect1>
 </appendix>
 
 <appendix id="chapter-working-with-source">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]