summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Bright <hugh.m.bright@gmail.com>2013-11-24 00:38:45 (GMT)
committerDon Bright <hugh.m.bright@gmail.com>2013-11-24 00:38:45 (GMT)
commitb204aba444bd838bd3fe27675323dce6d4123b19 (patch)
tree3d81a709ef0cdd87121c1ee4a5925c95ddaf4db1
parentab102cec8518ffe1bc7ecefa7986e8390367c692 (diff)
mxe64 build fix. make 'qt disabled' message less confusing on test binary.
-rwxr-xr-xscripts/mingw-x-build-dependencies.sh6
-rw-r--r--src/PlatformUtils.cc2
2 files changed, 2 insertions, 6 deletions
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index e9f124b..df8572f 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -48,11 +48,7 @@ if [ ! -e $MXEDIR ]; then
mkdir -p $MXEDIR
cd $MXEDIR/..
echo "Downloading MXE into " $PWD
- if [ "`echo $* | grep 64`" ]; then
- git clone -b multi-rebase git://github.com/tonytheodore/mxe.git $MXEDIR
- else
- git clone git://github.com/mxe/mxe.git $MXEDIR
- fi
+ git clone git://github.com/mxe/mxe.git $MXEDIR
fi
echo "entering" $MXEDIR
diff --git a/src/PlatformUtils.cc b/src/PlatformUtils.cc
index cfa5731..b02b822 100644
--- a/src/PlatformUtils.cc
+++ b/src/PlatformUtils.cc
@@ -84,7 +84,7 @@ std::string PlatformUtils::info()
#ifdef QT_VERSION
std::string qtVersion = qVersion();
#else
- std::string qtVersion = "Qt disabled";
+ std::string qtVersion = "Qt disabled - Commandline Test Version";
#endif
#ifdef ENABLE_CGAL
contact: Jan Huwald // Impressum