Commit cb856823 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov

right paths in include statements

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58837 954022d7-b5bf-4e40-9824-e11837661b57
parent 437c3e93
......@@ -3,12 +3,15 @@
#include "PPTXFormat/PPTXEvent.h"
#ifdef _WIN32
#include <shellapi.h>
#include <shlobj.h>
#include <shlwapi.h>
#pragma comment( lib, "shell32.lib" ) // shell32.lib
#else
#endif
#include "Editor\PPTXWriter.h"
#include "Editor/PPTXWriter.h"
CPPTXFile::CPPTXFile(load_from_resource fCallbackResource, extract_to_directory fCallbackExtract, compress_from_directory fCallbackCompress, progress_operation fCallbackProgress, void* pCallbackArg)
{
......@@ -389,4 +392,4 @@ INT32 CPPTXFile::RemoveDirOrFile(CString sPath, bool bIsRemoveHead)
return dwResult;
}// 0 -
return 0;
}
\ No newline at end of file
}
......@@ -10,7 +10,7 @@ TARGET = PPTXFormatLib
TEMPLATE = lib
CONFIG += staticlib
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers -g
DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _LINUX_QT _USE_XMLLITE_READER_ NODOCX
DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _LINUX_QT _USE_XMLLITE_READER_ NODOCX DISABLE_FILE_DOWNLOADER
INCLUDEPATH += \
/usr/include/libxml2
......
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