Merge branch 'hotfix/build-4.1'

Common/3dParty/boost/fetch.sh

@@ -34,7 +34,7 @@ echo "boost already extracted"
 else
 if [[ "$platform" == *"linux"* ]]
 then
-7z x "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
+7z x -y "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
 else
 hdiutil mount "$SCRIPTPATH/7zX_1.7.1.dmg"
 /Volumes/7zX/7zX.app/Contents/Resources/7za x "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"

Common/base.pri

@@ -17,16 +17,31 @@ win32:!contains(QMAKE_TARGET.arch, x86_64): {
     CONFIG += core_win_32
 }
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-g++
+{
     CONFIG += core_linux
-}
 linux-g++:contains(QMAKE_HOST.arch, x86_64): {
+    message("linux-64")
     CONFIG += core_linux_64
 }
 linux-g++:!contains(QMAKE_HOST.arch, x86_64): {
+    message("linux-32")
+    CONFIG += core_linux_32
+}
+}
+
+linux-g++-64 {
+    message("linux-64")
+    CONFIG += core_linux
+    CONFIG += core_linux_64
+}
+linux-g++-32 {
+    message("linux-32")
+    CONFIG += core_linux
     CONFIG += core_linux_32
 }
 
+
 mac {
     CONFIG += core_mac
     CONFIG += core_mac_64

X2tConverter/build/Qt/X2tConverter.pro

@@ -22,6 +22,7 @@ PWD_ROOT_DIR = $$PWD
 CONFIG += core_static_link_libstd
 CONFIG += core_x2t
 include(../../../Common/base.pri)
+include(../../../Common/3dParty/icu/icu.pri)
 
 core_win_32 {
     TARGET = x2t32
@@ -114,8 +115,13 @@ DESTDIR = $$PWD/../../../build/bin
 core_windows {
     DESTDIR = $$DESTDIR/windows
 }
-core_linux {
-    DESTDIR = $$DESTDIR/linux
+core_linux_64 {
+    message("x2t linux 64 build")
+    DESTDIR = $$DESTDIR/linux_64
+}
+core_linux_32 {
+    message("x2t linux 32 build")
+    DESTDIR = $$DESTDIR/linux_32
 }
 core_mac {
     DESTDIR = $$DESTDIR/mac