From 107e460daa6c2cb3dec8ee4e51a9ae79eb3eb362 Mon Sep 17 00:00:00 2001 From: konovalovsergey Date: Thu, 31 Mar 2016 17:24:28 +0300 Subject: [PATCH] edit DESTINATION_SDK_PATH --- ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro | 2 +- ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro | 2 +- ASCOfficeOdfFile/linux/OdfFileReaderLib.pro | 4 ++-- ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro | 2 +- ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro | 4 ++-- .../PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro | 4 ++-- ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro | 2 +- .../TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro | 2 +- ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro | 2 +- Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro | 2 +- X2tConverter/build/Qt/X2tConverter.pro | 12 ++++++------ X2tConverter/build/Qt/X2tSLN.pro | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro b/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro index af9cbef702..c3359ef933 100644 --- a/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro +++ b/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro @@ -19,7 +19,7 @@ win32 { QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ diff --git a/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro b/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro index 38d5ea2b50..8b19917111 100644 --- a/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro +++ b/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro @@ -22,7 +22,7 @@ win32 { } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ diff --git a/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro b/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro index 1ce176b027..a42f4cf2f9 100644 --- a/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro +++ b/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro @@ -19,7 +19,7 @@ win32 { QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ @@ -56,7 +56,7 @@ DEFINES += UNICODE \ USE_LITE_READER INCLUDEPATH += ../include -INCLUDEPATH += ../../../ServerComponents/DesktopEditor/freetype-2.5.2/include +INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include CONFIG(debug, debug|release){ DEFINES += _DEBUG diff --git a/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro b/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro index 7de7427d1d..b777174a13 100644 --- a/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro +++ b/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro @@ -19,7 +19,7 @@ win32 { QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ diff --git a/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro b/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro index 3f7b42da4a..835b09da18 100644 --- a/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro +++ b/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro @@ -21,7 +21,7 @@ win32 { QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ @@ -75,7 +75,7 @@ win32 { DEFINES += \ 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 } #################### WINDOWS ##################### diff --git a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro index 494d588eef..ce46a751fd 100644 --- a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro +++ b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro @@ -23,7 +23,7 @@ win32 { } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ @@ -74,7 +74,7 @@ win32 { DEFINES += \ 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 } #################### WINDOWS ##################### diff --git a/ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro b/ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro index 28be058b1d..c2dfaaa478 100644 --- a/ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro +++ b/ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro @@ -21,7 +21,7 @@ win32 { QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ diff --git a/ASCOfficeTxtFile/TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro b/ASCOfficeTxtFile/TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro index 86aab25d0c..cf553168a7 100644 --- a/ASCOfficeTxtFile/TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro +++ b/ASCOfficeTxtFile/TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro @@ -20,7 +20,7 @@ win32 { QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ diff --git a/ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro b/ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro index ae9ff8f1db..b18453182d 100644 --- a/ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro +++ b/ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro @@ -19,7 +19,7 @@ win32 { QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ diff --git a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro index cf609b63f5..905a9b521d 100644 --- a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro +++ b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro @@ -20,7 +20,7 @@ win32 { } ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../../build/lib # WINDOWS win32:contains(QMAKE_TARGET.arch, x86_64):{ diff --git a/X2tConverter/build/Qt/X2tConverter.pro b/X2tConverter/build/Qt/X2tConverter.pro index cc0b2e8456..74874d546c 100644 --- a/X2tConverter/build/Qt/X2tConverter.pro +++ b/X2tConverter/build/Qt/X2tConverter.pro @@ -86,7 +86,7 @@ win32 { LIBXML_READER_ENABLED INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include\ -INCLUDEPATH += ../../../ASCOfficeUtils/ZLIB/zlib-1.2.3 +INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3 } #################### WINDOWS ##################### @@ -110,7 +110,7 @@ mac { LIBXML_READER_ENABLED INCLUDEPATH += ../../../Common/DocxFormat/Source/XML/libxml2/XML/include\ -INCLUDEPATH += ../../../ASCOfficeUtils/ZLIB/zlib-1.2.3 +INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3 } #################### LINUX ######################## @@ -126,8 +126,8 @@ DEPENDPATH += $$PWD/../../../ASCOfficePPTXFile/ INCLUDEPATH += $$PWD/../../../ASCOfficePPTXFile/Editor/ DEPENDPATH += $$PWD/../../../ASCOfficePPTXFile/Editor/ -INCLUDEPATH += $$PWD/../../../ASCOfficeUtils/ASCOfficeUtils -DEPENDPATH += $$PWD/../../../ASCOfficeUtils/ASCOfficeUtils +INCLUDEPATH += $$PWD/../../../OfficeUtils/src +DEPENDPATH += $$PWD/../../../OfficeUtils/src INCLUDEPATH += $$PWD/../../../ASCOfficeDocxFile2 DEPENDPATH += $$PWD/../../../ASCOfficeDocxFile2 @@ -145,8 +145,8 @@ HEADERS += ../../src/cextracttools.h \ ############################################################################################################### ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib -DESTINATION_BIN_PATH = $$PWD/../../../SDK/bin +DESTINATION_SDK_PATH = $$PWD/../../../build/lib +DESTINATION_BIN_PATH = $$PWD/../../../build/bin win32:contains(QMAKE_TARGET.arch, x86_64):{ message(win64) diff --git a/X2tConverter/build/Qt/X2tSLN.pro b/X2tConverter/build/Qt/X2tSLN.pro index 9ed99b3531..2d43283025 100644 --- a/X2tConverter/build/Qt/X2tSLN.pro +++ b/X2tConverter/build/Qt/X2tSLN.pro @@ -49,7 +49,7 @@ X2tConverter.depends = \ XlsFormatLib ############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../../SDK/lib +DESTINATION_SDK_PATH = $$PWD/../../../build/lib DESTINATION_ICU = $$PWD/../../../UnicodeConverter/icubuilds win32:contains(QMAKE_TARGET.arch, x86_64):{