From 136139ca018e1770e28457f63554622fbc1601ef Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Thu, 17 Jan 2013 16:16:45 +0100
Subject: CONFIG= should read CONFIG+= -- otherwise it causes bizare build
 errors


diff --git a/src/version_check.h b/src/version_check.h
index b6a63ab..db17962 100644
--- a/src/version_check.h
+++ b/src/version_check.h
@@ -24,26 +24,26 @@ a time, to avoid confusion.
 #define GMPPATCH 0
 #define SYS_GMP_VER  (__GNU_MP_VERSION * 10000 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL * 1)
 #if SYS_GMP_VER < GMPMAJOR * 10000 + GMPMINOR * 100 + GMPPATCH * 1
-#error GNU GMP library missing or version too old. See README.md. To force compile, run qmake CONFIG=skip-version-check
+#error GNU GMP library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
 #else
 
 
 #include <mpfr.h>
 #if MPFR_VERSION < MPFR_VERSION_NUM( 3,0,0 )
-#error GNU MPFR library missing or version too old. See README.md. To force compile, run qmake CONFIG=skip-version-check
+#error GNU MPFR library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
 #else
 
 
 #include <Eigen/Core>
 #if not EIGEN_VERSION_AT_LEAST( 2,0,13 )
-#error eigen2 library missing or version too old. See README.md. To force compile, run qmake CONFIG=skip-version-check
+#error eigen2 library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
 #else
 
 
 #include <boost/version.hpp>
 // boost 1.3.5 = 103500
 #if BOOST_VERSION < 103500
-#error boost library missing or version too old. See README.md. To force compile, run qmake CONFIG=skip-version-check
+#error boost library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
 #else
 
 
@@ -51,7 +51,7 @@ a time, to avoid confusion.
 #include <CGAL/version.h>
 
 #if CGAL_VERSION_NR < 1030601000
-#error CGAL library missing or version too old. See README.md. To force compile, run qmake CONFIG=skip-version-check
+#error CGAL library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
 #else
 
 #if CGAL_VERSION_NR < 1040021000
@@ -76,20 +76,20 @@ a time, to avoid confusion.
 #include <GL/glew.h>
 // kludge - GLEW doesnt have compiler-accessible version numbering
 #ifndef GLEW_ARB_occlusion_query2
-#error GLEW library missing or version too old. See README.md. To force compile, run qmake CONFIG=skip-version-check
+#error GLEW library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
 #else
 
 
 #include <opencsg.h>
 // 1.3.2 -> 0x0132
 #if OPENCSG_VERSION < 0x0132
-#error OPENCSG library missing or version too old. See README.md. To force compile, run qmake CONFIG=skip-version-check
+#error OPENCSG library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
 #else
 #endif // ENABLE_OPENCSG
 
 #include <QtCore/qglobal.h>
 #if QT_VERSION < 0x040400
-#error QT library missing or version too old. See README.md. To force compile, run qmake CONFIG=skip-version-check
+#error QT library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
 #endif // QT
 
 
-- 
cgit v0.10.1


From 017059c6865a62ee5b3ea63b079f4692a646c496 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Thu, 17 Jan 2013 16:41:04 +0100
Subject: mention that cross-building dependencies can take several hours


diff --git a/README.md b/README.md
index f1d9925..b98335a 100644
--- a/README.md
+++ b/README.md
@@ -195,7 +195,9 @@ Then run the script to download & compile all the prerequisite libraries above:
 
     ./scripts/mingw-x-build-dependencies.sh
 
-Then, build OpenSCAD and package it to an installer:
+Note that this process can take several hours, as it uses the 
+http://mxe.cc system to cross-build many libraries. After it is 
+complete, build OpenSCAD and package it to an installer:
 
     ./scripts/release-common.sh mingw32
 
-- 
cgit v0.10.1


From 05fa73b27aff81fdb2c092612a4d44a5000b469a Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Thu, 17 Jan 2013 16:43:46 +0100
Subject: US-style Trademark disclaimer


diff --git a/src/AboutDialog.html b/src/AboutDialog.html
index 0eee1cb..cc73255 100644
--- a/src/AboutDialog.html
+++ b/src/AboutDialog.html
@@ -136,6 +136,10 @@ benhowes ... and many others
 </p>
 
 <p>
+Trademarks are property of their owners and do not imply affiliation with OpenSCAD
+</p>
+
+<p>
 Apologies to anyone left out. Please file an issue on OpenSCAD's github if you know of someone who belongs here. 
 </p>
 
-- 
cgit v0.10.1


From 2336f6fe2a50daba977d3e51bd043a69157344e1 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Thu, 17 Jan 2013 16:57:58 +0100
Subject: point out that you need a clean shell to run the mingw crossbuild


diff --git a/README.md b/README.md
index b98335a..ddad806 100644
--- a/README.md
+++ b/README.md
@@ -186,8 +186,9 @@ attempt an MSVC build on Windows, please see this site:
 http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Building_on_Windows
 
 To cross-build, first make sure that you have development tools 
-installed to get GCC. Then after you've cloned this git repository, run 
-the script that sets up the environment variables.
+installed to get GCC. Then after you've cloned this git repository, 
+start a new clean shell and run the script that sets up the environment 
+variables.
 
     source ./scripts/setenv-mingw-xbuild.sh
 
-- 
cgit v0.10.1