Fix build on Linux with non-gcc compilers

Fix building on Linux with compilers other than gcc by not hardcoding the linux-g++ combo Signed-off-by: Bernhard Rosenkränzer <[email protected]>
ONLYOFFICE · Jan 14, 2017 · b50a382 · b50a382
1 parent 06dea56
commit b50a382
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 46 deletions.
diff --git a/ASCOfficeDocFile/Linux/DocFileConverter.pro b/ASCOfficeDocFile/Linux/DocFileConverter.pro
@@ -35,7 +35,7 @@ CONFIG(debug, debug|release){
 
 message(Debug)
 
-linux-g++{
+linux-*:contains(QMAKE_TARGET.arch, 64){
 
     message(64 bit)
 
@@ -74,7 +74,7 @@ CONFIG(release, debug|release){
 
 message(Release)
 
-linux-g++{
+linux-*:contains(QMAKE_TARGET.arch, 64){
 
     message(64 bit)
 

diff --git a/ASCOfficeRtfFile/Linux/RtfFileConverter.pro b/ASCOfficeRtfFile/Linux/RtfFileConverter.pro
@@ -40,7 +40,7 @@ CONFIG(debug, debug|release){
 
 message(Debug)
 
-linux-g++{
+linux-*:contains(QMAKE_TARGET.arch, 64){
 
     message(64 bit)
 
@@ -79,7 +79,7 @@ CONFIG(release, debug|release){
 
 message(Release)
 
-linux-g++{
+linux-*:contains(QMAKE_TARGET.arch, 64){
 
     message(64 bit)
 

diff --git a/ASCOfficeXlsFile2/linux/XlsFileConverter.pro b/ASCOfficeXlsFile2/linux/XlsFileConverter.pro
@@ -58,16 +58,16 @@ CONFIG(debug, debug|release) {
 }
 }
 
-linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
+linux-*:contains(QMAKE_HOST.arch, x86_64):{
     DESTDIR = $$DESTINATION_SDK_PATH/linux_64
 }
-linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
+linux-*:!contains(QMAKE_HOST.arch, x86_64):{
     DESTDIR = $$DESTINATION_SDK_PATH/linux_32
 }
 
 ############### destination path ###############
 
-linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
+linux-*:contains(QMAKE_HOST.arch, x86_64):{
 
     message(64 bit)
 

diff --git a/Common/base.pri b/Common/base.pri
@@ -17,24 +17,24 @@ win32:!contains(QMAKE_TARGET.arch, x86_64): {
     CONFIG += core_win_32
 }
 
-linux-g++ {
+linux-* {
     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
-}
+    contains(QMAKE_HOST.arch, x86_64): {
+        message("linux-64")
+        CONFIG += core_linux_64
+    }
+    !contains(QMAKE_HOST.arch, x86_64): {
+        message("linux-32")
+        CONFIG += core_linux_32
+    }
 }
 
-linux-g++-64 {
+linux*:contains(QMAKE_TARGET.arch, 64) {
     message("linux-64")
     CONFIG += core_linux
     CONFIG += core_linux_64
 }
-linux-g++-32 {
+linux*:!contains(QMAKE_TARGET.arch, 64) {
     message("linux-32")
     CONFIG += core_linux
     CONFIG += core_linux_32

diff --git a/DesktopEditor/Qt_build/editor/project/native_control.pro b/DesktopEditor/Qt_build/editor/project/native_control.pro
@@ -15,7 +15,7 @@ CONFIG += staticlib
 DEFINES += \
     _QT
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-* {
     DEFINES += \
     _LINUX \
     _LINUX_QT
@@ -65,7 +65,7 @@ SOURCES += \
     ../../../editor/Viewer.cpp \
     NativeControl.cpp
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-* {
     SOURCES += ../../../editor/GLplatform/gl_linux_qt.cpp
 }
 

diff --git a/DesktopEditor/Qt_build/editor_only/project/native_control.pro b/DesktopEditor/Qt_build/editor_only/project/native_control.pro
@@ -12,7 +12,7 @@ CONFIG += staticlib
 DEFINES += \
     _QT
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-* {
     DEFINES += \
     _LINUX \
     _LINUX_QT

diff --git a/DesktopEditor/Qt_build/test/control/control.pro b/DesktopEditor/Qt_build/test/control/control.pro
@@ -24,14 +24,14 @@ CONFIG(debug, debug|release) {
     message(release)
 }
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-* {
     DEFINES += \
     LINUX \
     _LINUX \
     _LINUX_QT
 }
 
-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+linux-*:contains(QMAKE_HOST.arch, x86_64):{
     LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_base.x64
     LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_snapshot
     LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_nosnapshot.x64
@@ -41,7 +41,7 @@ linux-g++:contains(QMAKE_HOST.arch, x86_64):{
 
     message(linux64)
 }
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+linux-*:!contains(QMAKE_HOST.arch, x86_64):{
     LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_base.ia32
     LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_snapshot
     LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_nosnapshot.ia32

diff --git a/DesktopEditor/Qt_build/test_web/control/control.pro b/DesktopEditor/Qt_build/test_web/control/control.pro
@@ -25,7 +25,7 @@ CONFIG(debug, debug|release) {
     message(release)
 }
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-* {
     DEFINES += \
     LINUX \
     _LINUX \

diff --git a/DesktopEditor/doctrenderer/test/doctrenderer_test.pro b/DesktopEditor/doctrenderer/test/doctrenderer_test.pro
@@ -33,10 +33,10 @@ CONFIG(debug, debug|release) {
 }
 }
 
-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+linux-*:contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH_DOCTRENDERER = $$DESTINATION_SDK_PATH/linux_64
 }
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+linux-*:!contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH_DOCTRENDERER = $$DESTINATION_SDK_PATH/linux_32
 }
 
@@ -50,7 +50,7 @@ CONFIG(debug, debug|release) {
 
 LIBS += -L$$DESTINATION_SDK_PATH_DOCTRENDERER -ldoctrenderer
 
-linux-g++ {
+linux-* {
 LIBS += -ldl
 }
 

diff --git a/DesktopEditor/doctrenderer/test_builder/docbuilder.pro b/DesktopEditor/doctrenderer/test_builder/docbuilder.pro
@@ -16,7 +16,7 @@ TEMPLATE = app
 CONFIG -= debug_and_release debug_and_release_target
 CONFIG += c++11
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-* {
     QMAKE_LFLAGS += -Wl,--rpath=./
     QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
 }
@@ -29,7 +29,7 @@ win32 {
 DEFINES += WIN32
 }
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-* {
     DEFINES += \
         LINUX \
         _LINUX \
@@ -63,11 +63,11 @@ CONFIG(debug, debug|release) {
 TARGET_PLATFORM = _win32
 }
 
-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+linux-*:contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH_DOCTRENDERER = $$DESTINATION_SDK_PATH/linux_64
     TARGET_PLATFORM = _linux64
 }
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+linux-*:!contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH_DOCTRENDERER = $$DESTINATION_SDK_PATH/linux_32
     TARGET_PLATFORM = _linux32
 }
@@ -84,7 +84,7 @@ TARGET = docbuilder$$TARGET_PLATFORM
 
 LIBS += -L$$DESTINATION_SDK_PATH_DOCTRENDERER/docbuilder -ldoctrenderer
 
-linux-g++ {
+linux-* {
 LIBS += -ldl
 }
 

diff --git a/DesktopEditor/test/FontEngineTest/test.pro b/DesktopEditor/test/FontEngineTest/test.pro
@@ -39,10 +39,10 @@ CONFIG(debug, debug|release) {
 }
 }
 
-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+linux-*:contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
 }
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+linux-*:!contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
 }
 
@@ -55,7 +55,4 @@ LIBS += -lgdi32 \
         -lshell32
 }
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
-}
-
 SOURCES += main.cpp
diff --git a/HtmlFile/test/test.pro b/HtmlFile/test/test.pro
@@ -44,18 +44,18 @@ CONFIG(debug, debug|release) {
 }
 }
 
-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+linux-*:contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
 }
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+linux-*:!contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
 }
 
 LIBS += -L$$DESTINATION_SDK_PATH -lHtmlFile
 LIBS += -L$$DESTINATION_SDK_PATH -lUnicodeConverter
 LIBS += -L$$DESTINATION_SDK_PATH -lgraphics
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-* {
     QMAKE_LFLAGS += -Wl,--rpath=./
 
     LIBS        += $$PWD/../../build/bin/icu/linux_64/libicuuc.so.55

diff --git a/HtmlRenderer/test/test.pro b/HtmlRenderer/test/test.pro
@@ -44,10 +44,10 @@ CONFIG(debug, debug|release) {
 }
 }
 
-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+linux-*:contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
 }
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+linux-*:!contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
 }
 
@@ -66,7 +66,7 @@ LIBS += -lgdi32 \
         -lshell32
 }
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+linux-* {
     LIBS += -lz
 }
 

diff --git a/UnicodeConverter/test/test.pro b/UnicodeConverter/test/test.pro
@@ -38,13 +38,13 @@ CONFIG(debug, debug|release) {
 }
 }
 
-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+linux-*:contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
     #LIBS += -L$$PWD/../icubuilds/linux64/usr/local/lib -licuuc -licudata
     LIBS        += $$PWD/../icubuilds/linux64/usr/local/lib/libicuuc.so.55
     LIBS        += $$PWD/../icubuilds/linux64/usr/local/lib/libicudata.so.55
 }
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+linux-*:!contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
 }