Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build on Linux with non-gcc compilers #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build on Linux with non-gcc compilers #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ASCOfficeDocFile/Linux/DocFileConverter.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ CONFIG(debug, debug|release){

message(Debug)

linux-g++{
linux-*:contains(QMAKE_TARGET.arch, 64){

message(64 bit)

Expand Down Expand Up @@ -74,7 +74,7 @@ CONFIG(release, debug|release){

message(Release)

linux-g++{
linux-*:contains(QMAKE_TARGET.arch, 64){

message(64 bit)

Expand Down
4 changes: 2 additions & 2 deletions ASCOfficeRtfFile/Linux/RtfFileConverter.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CONFIG(debug, debug|release){

message(Debug)

linux-g++{
linux-*:contains(QMAKE_TARGET.arch, 64){

message(64 bit)

Expand Down Expand Up @@ -79,7 +79,7 @@ CONFIG(release, debug|release){

message(Release)

linux-g++{
linux-*:contains(QMAKE_TARGET.arch, 64){

message(64 bit)

Expand Down
6 changes: 3 additions & 3 deletions ASCOfficeXlsFile2/linux/XlsFileConverter.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
22 changes: 11 additions & 11 deletions Common/base.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions DesktopEditor/Qt_build/editor/project/native_control.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CONFIG += staticlib
DEFINES += \
_QT

linux-g++ | linux-g++-64 | linux-g++-32 {
linux-* {
DEFINES += \
_LINUX \
_LINUX_QT
Expand Down Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion DesktopEditor/Qt_build/editor_only/project/native_control.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CONFIG += staticlib
DEFINES += \
_QT

linux-g++ | linux-g++-64 | linux-g++-32 {
linux-* {
DEFINES += \
_LINUX \
_LINUX_QT
Expand Down
6 changes: 3 additions & 3 deletions DesktopEditor/Qt_build/test/control/control.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion DesktopEditor/Qt_build/test_web/control/control.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CONFIG(debug, debug|release) {
message(release)
}

linux-g++ | linux-g++-64 | linux-g++-32 {
linux-* {
DEFINES += \
LINUX \
_LINUX \
Expand Down
6 changes: 3 additions & 3 deletions DesktopEditor/doctrenderer/test/doctrenderer_test.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -50,7 +50,7 @@ CONFIG(debug, debug|release) {

LIBS += -L$$DESTINATION_SDK_PATH_DOCTRENDERER -ldoctrenderer

linux-g++ {
linux-* {
LIBS += -ldl
}

Expand Down
10 changes: 5 additions & 5 deletions DesktopEditor/doctrenderer/test_builder/docbuilder.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -29,7 +29,7 @@ win32 {
DEFINES += WIN32
}

linux-g++ | linux-g++-64 | linux-g++-32 {
linux-* {
DEFINES += \
LINUX \
_LINUX \
Expand Down Expand Up @@ -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
}
Expand All @@ -84,7 +84,7 @@ TARGET = docbuilder$$TARGET_PLATFORM

LIBS += -L$$DESTINATION_SDK_PATH_DOCTRENDERER/docbuilder -ldoctrenderer

linux-g++ {
linux-* {
LIBS += -ldl
}

Expand Down
7 changes: 2 additions & 5 deletions DesktopEditor/test/FontEngineTest/test.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -55,7 +55,4 @@ LIBS += -lgdi32 \
-lshell32
}

linux-g++ | linux-g++-64 | linux-g++-32 {
}

SOURCES += main.cpp
6 changes: 3 additions & 3 deletions HtmlFile/test/test.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions HtmlRenderer/test/test.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -66,7 +66,7 @@ LIBS += -lgdi32 \
-lshell32
}

linux-g++ | linux-g++-64 | linux-g++-32 {
linux-* {
LIBS += -lz
}

Expand Down
4 changes: 2 additions & 2 deletions UnicodeConverter/test/test.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down