From de3545fe27b0ee973c19bfff9e819f4e4e48e69d Mon Sep 17 00:00:00 2001
From: "Alexey.Golubev" <alexey.golubev@onlyoffice.com>
Date: Wed, 6 Apr 2016 14:15:03 +0300
Subject: [PATCH] fixed build errors

---
 UnicodeConverter/UnicodeConverter.pro | 12 ++++++------
 XpsFile/XpsFile.cpp                   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/UnicodeConverter/UnicodeConverter.pro b/UnicodeConverter/UnicodeConverter.pro
index 3932e51276..f5a1776393 100644
--- a/UnicodeConverter/UnicodeConverter.pro
+++ b/UnicodeConverter/UnicodeConverter.pro
@@ -32,7 +32,7 @@ CONFIG(debug, debug|release) {
 } else {
     DESTDIR = $$DESTINATION_SDK_PATH/win_64
 }
-ICU_BUILDS_PLATFORM = win64
+ICU_BUILDS_PLATFORM = win_64
 }
 win32:!contains(QMAKE_TARGET.arch, x86_64):{
 CONFIG(debug, debug|release) {
@@ -40,16 +40,16 @@ CONFIG(debug, debug|release) {
 } else {
     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):{
     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):{
     DESTDIR = $$DESTINATION_SDK_PATH/linux_32
-    ICU_BUILDS_PLATFORM = linux32
+    ICU_BUILDS_PLATFORM = linux_32
 }
 
 mac {
@@ -79,8 +79,8 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
     TARGET_EXT = .so
 
     INCLUDEPATH += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/usr/local/include
-    LIBS        += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/usr/local/lib/libicuuc.so.55
-    LIBS        += $$PWD/icubuilds/$$ICU_BUILDS_PLATFORM/usr/local/lib/libicudata.so.55
+    LIBS        += $$PWD/../build/bin/icu/$$ICU_BUILDS_PLATFORM/libicuuc.so.55
+    LIBS        += $$PWD/../build/bin/icu/$$ICU_BUILDS_PLATFORM/libicudata.so.55
     message(linux)
 }
 
diff --git a/XpsFile/XpsFile.cpp b/XpsFile/XpsFile.cpp
index dbc3546456..2b39cdf367 100644
--- a/XpsFile/XpsFile.cpp
+++ b/XpsFile/XpsFile.cpp
@@ -8,7 +8,7 @@
 #include "../DesktopEditor/graphics/GraphicsRenderer.h"
 #include "../PdfWriter/PdfRenderer.h"
 
-#include "../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
+#include "../OfficeUtils/src/OfficeUtils.h"
 
 using namespace XPS;