Commit de3545fe authored by Alexey.Golubev's avatar Alexey.Golubev Committed by Alexander Trofimov

fixed build errors

parent 38815a78
...@@ -32,7 +32,7 @@ CONFIG(debug, debug|release) { ...@@ -32,7 +32,7 @@ CONFIG(debug, debug|release) {
} else { } else {
DESTDIR = $$DESTINATION_SDK_PATH/win_64 DESTDIR = $$DESTINATION_SDK_PATH/win_64
} }
ICU_BUILDS_PLATFORM = win64 ICU_BUILDS_PLATFORM = win_64
} }
win32:!contains(QMAKE_TARGET.arch, x86_64):{ win32:!contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
...@@ -40,16 +40,16 @@ CONFIG(debug, debug|release) { ...@@ -40,16 +40,16 @@ CONFIG(debug, debug|release) {
} else { } else {
DESTDIR = $$DESTINATION_SDK_PATH/win_32 DESTDIR = $$DESTINATION_SDK_PATH/win_32
} }
ICU_BUILDS_PLATFORM = win32 ICU_BUILDS_PLATFORM = win_32
} }
linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_64 DESTDIR = $$DESTINATION_SDK_PATH/linux_64
ICU_BUILDS_PLATFORM = linux64 ICU_BUILDS_PLATFORM = linux_64
} }
linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{ linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
DESTDIR = $$DESTINATION_SDK_PATH/linux_32 DESTDIR = $$DESTINATION_SDK_PATH/linux_32
ICU_BUILDS_PLATFORM = linux32 ICU_BUILDS_PLATFORM = linux_32
} }
mac { mac {
...@@ -79,8 +79,8 @@ linux-g++ | linux-g++-64 | linux-g++-32 { ...@@ -79,8 +79,8 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
TARGET_EXT = .so TARGET_EXT = .so
INCLUDEPATH += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/usr/local/include INCLUDEPATH += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/usr/local/include
LIBS += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/usr/local/lib/libicuuc.so.55 LIBS += $$PWD/../build/bin/icu/$$ICU_BUILDS_PLATFORM/libicuuc.so.55
LIBS += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/usr/local/lib/libicudata.so.55 LIBS += $$PWD/../build/bin/icu/$$ICU_BUILDS_PLATFORM/libicudata.so.55
message(linux) message(linux)
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "../DesktopEditor/graphics/GraphicsRenderer.h" #include "../DesktopEditor/graphics/GraphicsRenderer.h"
#include "../PdfWriter/PdfRenderer.h" #include "../PdfWriter/PdfRenderer.h"
#include "../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h" #include "../OfficeUtils/src/OfficeUtils.h"
using namespace XPS; using namespace XPS;
......
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