From 869a28d64186d7ad1e3b446b34ad81056adecc12 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Wed, 17 Jan 2018 18:49:25 +0300
Subject: [PATCH] add support linux x86 build

---
 win-linux/ASCDocumentEditor.pro |  8 ++++----
 win-linux/defaults.pri          | 27 ++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/win-linux/ASCDocumentEditor.pro b/win-linux/ASCDocumentEditor.pro
index a9da3b0fb..bde36ea77 100644
--- a/win-linux/ASCDocumentEditor.pro
+++ b/win-linux/ASCDocumentEditor.pro
@@ -4,16 +4,16 @@ TARGET = DesktopEditors
 #CONFIG += build_for_centos6
 #CONFIG += core_build_deploy
 
+include(defaults.pri)
+
 core_build_deploy {
     build_for_centos6 {
-        DESTDIR=$$PWD/../../core/build/linux_desktop/app/CentOS6
+        DESTDIR=$$PWD/../../core/build/linux_desktop/app/$$PLATFORM_BUILD/CentOS6
     } else {
-        DESTDIR=$$PWD/../../core/build/linux_desktop/app
+        DESTDIR=$$PWD/../../core/build/linux_desktop/app/$$PLATFORM_BUILD
     }
 }
 
-include(defaults.pri)
-
 INCLUDEPATH += $$PWD/src/prop \
                 $$PWD/src
 
diff --git a/win-linux/defaults.pri b/win-linux/defaults.pri
index a86abc79f..f791fcb34 100644
--- a/win-linux/defaults.pri
+++ b/win-linux/defaults.pri
@@ -74,12 +74,29 @@ SOURCES += \
 RESOURCES += $$PWD/resources.qrc
 
 linux-g++ {
-    contains(QMAKE_HOST.arch, x86_64):{
-        PLATFORM_BUILD = linux_64
-    } else {
-        PLATFORM_BUILD = linux_32
-    }
+    CONFIG += app_linux
+	linux-g++:contains(QMAKE_HOST.arch, x86_64): {
+		CONFIG += app_linux_64
+		PLATFORM_BUILD = linux_64
+	}
+	linux-g++:!contains(QMAKE_HOST.arch, x86_64): {
+		CONFIG += app_linux_32
+		PLATFORM_BUILD = linux_32
+	}
+}
 
+linux-g++-64 {
+    CONFIG += app_linux
+    CONFIG += app_linux_64
+    PLATFORM_BUILD = linux_64
+}
+linux-g++-32 {
+    CONFIG += app_linux
+    CONFIG += app_linux_32
+    PLATFORM_BUILD = linux_32
+}
+
+app_linux {
     QT += network x11extras
 
     QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\'"