Commit d04f0441 authored by Alexey Golubev's avatar Alexey Golubev Committed by GitHub

Fixed error

g++ -m64 -Wl,-O1 -o ../../../build/bin/AllFontsGen/AllFontsGen main.o   -L/var/lib/onlyoffice/core/DesktopEditor/AllFontsGen/../../build/lib -lgraphics -lOfficeUtils -lz -pthread 
/usr/bin/ld: cannot find -lgraphics
/usr/bin/ld: cannot find -lOfficeUtils
collect2: error: ld returned 1 exit status
parent 09ee909e
...@@ -16,13 +16,24 @@ win32:!contains(QMAKE_TARGET.arch, x86_64):{ ...@@ -16,13 +16,24 @@ win32:!contains(QMAKE_TARGET.arch, x86_64):{
TARGET = win_32 TARGET = win_32
} }
linux-g++:contains(QMAKE_HOST.arch, x86_64):{ linux-g++{
linux-g++:contains(QMAKE_HOST.arch, x86_64):{
TARGET = linux_64
}
linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
TARGET = linux_32
}
}
linux-g++-64{
TARGET = linux_64 TARGET = linux_64
} }
linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
linux-g++-32{
TARGET = linux_32 TARGET = linux_32
} }
mac { mac {
TARGET = mac_64 TARGET = mac_64
} }
...@@ -45,11 +56,19 @@ CONFIG(debug, debug|release) { ...@@ -45,11 +56,19 @@ CONFIG(debug, debug|release) {
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32 DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32
} }
} }
linux-g++{
linux-g++:contains(QMAKE_HOST.arch, x86_64):{
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
}
linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
}
}
linux-g++:contains(QMAKE_HOST.arch, x86_64):{ linux-g++-64{
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64 DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
} }
linux-g++:!contains(QMAKE_HOST.arch, x86_64):{ linux-g++-32{
DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32 DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment