правка путей в линуховой ветке

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65763 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficePPTXFile/Editor/Drawing/Attributes.h

@@ -4,17 +4,17 @@
 	#include <atlcoll.h>
 	#include <gdiplus.h>
 #else
-    #include "../../ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/linux_gdiplus.h"
+    #include "../../PPTXLib/Linux/PPTXFormatLib/linux_gdiplus.h"
 #endif
 
 #include "Metric.h"
 #include "Effects.h"
-//#include "../../Common/DocxFormat/Source/XML/xmlutils.h"
-#include "../../Common/ASCUtils.h"
-#include "./XmlWriter.h"
 
-#include "../../DesktopEditor/graphics/IRenderer.h"
-#include "../../DesktopEditor/graphics/structures.h"
+#include "../../../Common/ASCUtils.h"
+#include "./XmlStringWriter.h"
+
+#include "../../../DesktopEditor/graphics/IRenderer.h"
+#include "../../../DesktopEditor/graphics/structures.h"
 
 
 namespace NSPresentationEditor

ASCOfficePPTXFile/Editor/Drawing/Effects.h

@@ -6,7 +6,7 @@
     #include <atlbase.h>
     #include <atlstr.h>
 #else
-	#include "../../Common/DocxFormat/Source/Base/ASCString.h"
+    #include "../../../Common/DocxFormat/Source/Base/ASCString.h"
 #endif
 
 

ASCOfficePPTXFile/Editor/Drawing/Elements.h

@@ -3,7 +3,7 @@
 #include "Shapes/Shape.h"
 
 #ifndef DISABLE_FILE_DOWNLOADER
-	#include "../../Common/FileDownloader.h"
+    #include "../../../Common/FileDownloader.h"
 #endif
 
 

ASCOfficePPTXFile/Editor/Drawing/Interactive.h

@@ -2,7 +2,7 @@
 #include "Attributes.h"
 
 #if !defined(_WIN32) && !defined(_WIN64)
-    #include "../../DesktopEditor/common/ASCVariant.h"
+    #include "../../../DesktopEditor/common/ASCVariant.h"
 #endif
 
 namespace NSPresentationEditor

ASCOfficePPTXFile/Editor/Drawing/Metric.h

@@ -2,8 +2,8 @@
 #include <math.h>
 
 #if !defined(_WIN32) && !defined(_WIN64)
-    #include "./../../DesktopEditor/common/ASCVariant.h"
-    #include "../../Common/DocxFormat/Source/Base/ASCString.h"
+    #include "../../../DesktopEditor/common/ASCVariant.h"
+    #include "../../../Common/DocxFormat/Source/Base/ASCString.h"
 #endif
 
 namespace NSPresentationEditor

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.cpp

 #pragma once
-//#include "stdafx.h"
+
 #include "Formula.h"
+
 LONG NSGuidesVML::CFormula::Calculate(NSGuidesVML::CFormulasManager* pManager)
 {
 	if ((0 > m_lIndex) || (m_lIndex >= pManager->m_arResults.size()))

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h

@@ -1718,7 +1718,7 @@ namespace NSGuidesVML
 
 #else
 
-#include "../../../XmlWriter.h"
+#include "../../../../XmlWriter.h"
 
 namespace NSGuidesVML
 {

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTXShape/Formula.h

@@ -6,7 +6,7 @@
 
 #include <math.h>
 #include "./../Common.h"
-#include "../../../../../Common/DocxFormat/Source/XML/xmlutils.h"
+#include "../../../../../../Common/DocxFormat/Source/XML/xmlutils.h"
 
 namespace NSGuidesOOXML
 {

ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.h

@@ -3,7 +3,7 @@
 #include "TextStructures.h"
 
 #if !defined(_WIN32) && !defined (_WIN64)
-    #include "../../DesktopEditor/graphics/aggplustypes.h"
+    #include "../../../DesktopEditor/graphics/aggplustypes.h"
 #endif
 
 namespace NSPresentationEditor

ASCOfficePPTXFile/Editor/Drawing/TextStructures.h

 #pragma once
 #include "Structures.h"
-#include "../../Common/DocxFormat/Source/Base/Nullable.h"
+#include "../../../Common/DocxFormat/Source/Base/Nullable.h"
 
 namespace NSPresentationEditor
 {

ASCOfficePPTXFile/Editor/Drawing/XmlStringWriter.h

 #pragma once
-#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
+#include "../../../Common/DocxFormat/Source/SystemUtility/File.h"
 
 namespace NSPresentationEditor
 {

ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp

-//#include "stdafx.h"
 
 #include "Geometry.h"
-#include "../Editor/Drawing/Elements.h"
-#include "../Editor/Drawing/Shapes/BaseShape/Common.h"
+#include "../../Editor/Drawing/Elements.h"
+#include "../../Editor/Drawing/Shapes/BaseShape/Common.h"
 
 namespace PPTX
 {

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -553,7 +553,7 @@ HEADERS += pptxformatlib.h \
     ../../../Editor/imagemanager.h \
     ../../../Editor/PPTXWriter.h \
     ../../../Editor/WMFToImageConverter.h \
-    ../../../Editor/XmlWriter.h \
+    ../../../Editor/XmlStringWriter.h \
     ../../../Editor/PresentationDrawingsDef.h \
     ../../../Editor/DefaultNotesMaster.h \
     ../../../Editor/DefaultNotesTheme.h \

ASCOfficeXlsFile2/linux/XlsFileConverter.pro

@@ -39,7 +39,35 @@ SOURCES += \
     ../../Common/DocxFormat/Source/XML/stringcommon.cpp
 
 
-linux-g++{
+############### destination path ###############
+DESTINATION_SDK_PATH = $$PWD/../../SDK/lib
+
+# WINDOWS
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_64
+}
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+CONFIG(debug, debug|release) {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG
+} else {
+    DESTDIR = $$DESTINATION_SDK_PATH/win_32
+}
+}
+
+linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_64
+}
+linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{
+    DESTDIR = $$DESTINATION_SDK_PATH/linux_32
+}
+
+############### destination path ###############
+
+linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{
 
     message(64 bit)