Commit 107e460d authored by konovalovsergey's avatar konovalovsergey Committed by Alexander Trofimov

edit DESTINATION_SDK_PATH

parent f149c7f0
...@@ -19,7 +19,7 @@ win32 { ...@@ -19,7 +19,7 @@ win32 {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
......
...@@ -22,7 +22,7 @@ win32 { ...@@ -22,7 +22,7 @@ win32 {
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
......
...@@ -19,7 +19,7 @@ win32 { ...@@ -19,7 +19,7 @@ win32 {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
...@@ -56,7 +56,7 @@ DEFINES += UNICODE \ ...@@ -56,7 +56,7 @@ DEFINES += UNICODE \
USE_LITE_READER USE_LITE_READER
INCLUDEPATH += ../include INCLUDEPATH += ../include
INCLUDEPATH += ../../../ServerComponents/DesktopEditor/freetype-2.5.2/include INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
DEFINES += _DEBUG DEFINES += _DEBUG
......
...@@ -19,7 +19,7 @@ win32 { ...@@ -19,7 +19,7 @@ win32 {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
......
...@@ -21,7 +21,7 @@ win32 { ...@@ -21,7 +21,7 @@ win32 {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
...@@ -75,7 +75,7 @@ win32 { ...@@ -75,7 +75,7 @@ win32 {
DEFINES += \ DEFINES += \
LIBXML_READER_ENABLED LIBXML_READER_ENABLED
INCLUDEPATH += ../../../ASCOfficeUtils/ZLIB/zlib-1.2.3 INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3
INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include
} }
#################### WINDOWS ##################### #################### WINDOWS #####################
......
...@@ -23,7 +23,7 @@ win32 { ...@@ -23,7 +23,7 @@ win32 {
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
...@@ -74,7 +74,7 @@ win32 { ...@@ -74,7 +74,7 @@ win32 {
DEFINES += \ DEFINES += \
LIBXML_READER_ENABLED LIBXML_READER_ENABLED
INCLUDEPATH += ../../../../ASCOfficeUtils/ZLIB/zlib-1.2.3 INCLUDEPATH += ../../../../OfficeUtils/src/zlib-1.2.3
INCLUDEPATH += ../../../../Common/DocxFormat/Source/XML/libxml2/XML/include INCLUDEPATH += ../../../../Common/DocxFormat/Source/XML/libxml2/XML/include
} }
#################### WINDOWS ##################### #################### WINDOWS #####################
......
...@@ -21,7 +21,7 @@ win32 { ...@@ -21,7 +21,7 @@ win32 {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
......
...@@ -20,7 +20,7 @@ win32 { ...@@ -20,7 +20,7 @@ win32 {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
......
...@@ -19,7 +19,7 @@ win32 { ...@@ -19,7 +19,7 @@ win32 {
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
......
...@@ -20,7 +20,7 @@ win32 { ...@@ -20,7 +20,7 @@ win32 {
} }
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../build/lib
# WINDOWS # WINDOWS
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
......
...@@ -86,7 +86,7 @@ win32 { ...@@ -86,7 +86,7 @@ win32 {
LIBXML_READER_ENABLED LIBXML_READER_ENABLED
INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include\ INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include\
INCLUDEPATH += ../../../ASCOfficeUtils/ZLIB/zlib-1.2.3 INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3
} }
#################### WINDOWS ##################### #################### WINDOWS #####################
...@@ -110,7 +110,7 @@ mac { ...@@ -110,7 +110,7 @@ mac {
LIBXML_READER_ENABLED LIBXML_READER_ENABLED
INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include\ INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include\
INCLUDEPATH += ../../../ASCOfficeUtils/ZLIB/zlib-1.2.3 INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3
} }
#################### LINUX ######################## #################### LINUX ########################
...@@ -126,8 +126,8 @@ DEPENDPATH += $$PWD/../../../ASCOfficePPTXFile/ ...@@ -126,8 +126,8 @@ DEPENDPATH += $$PWD/../../../ASCOfficePPTXFile/
INCLUDEPATH += $$PWD/../../../ASCOfficePPTXFile/Editor/ INCLUDEPATH += $$PWD/../../../ASCOfficePPTXFile/Editor/
DEPENDPATH += $$PWD/../../../ASCOfficePPTXFile/Editor/ DEPENDPATH += $$PWD/../../../ASCOfficePPTXFile/Editor/
INCLUDEPATH += $$PWD/../../../ASCOfficeUtils/ASCOfficeUtils INCLUDEPATH += $$PWD/../../../OfficeUtils/src
DEPENDPATH += $$PWD/../../../ASCOfficeUtils/ASCOfficeUtils DEPENDPATH += $$PWD/../../../OfficeUtils/src
INCLUDEPATH += $$PWD/../../../ASCOfficeDocxFile2 INCLUDEPATH += $$PWD/../../../ASCOfficeDocxFile2
DEPENDPATH += $$PWD/../../../ASCOfficeDocxFile2 DEPENDPATH += $$PWD/../../../ASCOfficeDocxFile2
...@@ -145,8 +145,8 @@ HEADERS += ../../src/cextracttools.h \ ...@@ -145,8 +145,8 @@ HEADERS += ../../src/cextracttools.h \
############################################################################################################### ###############################################################################################################
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../build/lib
DESTINATION_BIN_PATH = $$PWD/../../../SDK/bin DESTINATION_BIN_PATH = $$PWD/../../../build/bin
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
message(win64) message(win64)
......
...@@ -49,7 +49,7 @@ X2tConverter.depends = \ ...@@ -49,7 +49,7 @@ X2tConverter.depends = \
XlsFormatLib XlsFormatLib
############### destination path ############### ############### destination path ###############
DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib DESTINATION_SDK_PATH = $$PWD/../../../build/lib
DESTINATION_ICU = $$PWD/../../../UnicodeConverter/icubuilds DESTINATION_ICU = $$PWD/../../../UnicodeConverter/icubuilds
win32:contains(QMAKE_TARGET.arch, x86_64):{ win32:contains(QMAKE_TARGET.arch, x86_64):{
......
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