linux x64 doctrenderer

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

DesktopEditor/doctrenderer/doctrenderer.pro

@@ -10,6 +10,15 @@ TARGET = doctrenderer
 TEMPLATE = lib
 CONFIG += staticlib
 
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+    LINUX \
+    _LINUX \
+    _LINUX_QT \
+    UNICODE \
+    _UNICODE
+}
+
 INCLUDEPATH += \
     ../../../../../../../v8_trunk \
     ../../../../../../../v8_trunk/include \

DesktopEditor/doctrenderer/nativecontrol.h

@@ -109,7 +109,7 @@ public:
     }
 
 public:
-    void getFileData(std::wstring& strFile, BYTE*& pData, DWORD& dwLen)
+    void getFileData(const std::wstring& strFile, BYTE*& pData, DWORD& dwLen)
     {
         NSFile::CFileBinary oFile;
         oFile.OpenFile(strFile);
@@ -138,7 +138,7 @@ public:
         return m_strFileId;
     }
 
-    void ConsoleLog(/*UTF8*/std::string& strVal)
+    void ConsoleLog(/*UTF8*/const std::string& strVal)
     {
 #if 1
         FILE* f = fopen("C:/log.txt", "a+");

DesktopEditor/doctrenderer/test/doctrenderer_test.pro

@@ -30,16 +30,24 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
     DEFINES += \
     LINUX \
     _LINUX \
-    _LINUX_QT
+    _LINUX_QT \
+    UNICODE \
+    _UNICODE
 }
 
 linux-g++:contains(QMAKE_HOST.arch, x86_64):{
-    #LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_base.x64
-    #LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_snapshot
-    #LIBS += -L../../../../../../../../../v8/out/native/obj.target/tools/gyp -lv8_nosnapshot.x64
-    #LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licui18n
-    #LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licuuc
-    #LIBS += -L../../../../../../../../../v8/out/native/obj.target/third_party/icu -licudata
+    LIBS += -L../../../../SDK/lib/linux_64 -lgraphics
+
+    LIBS += -L../../../../SDK/lib/linux_64 -llibxml2
+
+    LIBS += -L../../../../SDK/lib/linux_64 -lv8_base
+    LIBS += -L../../../../SDK/lib/linux_64 -lv8_libplatform
+    LIBS += -L../../../../SDK/lib/linux_64 -lv8_libbase
+    LIBS += -L../../../../SDK/lib/linux_64 -lv8_nosnapshot
+    LIBS += -L../../../../SDK/lib/linux_64 -lv8_snapshot    
+    LIBS += -L../../../../SDK/lib/linux_64 -licui18n
+    LIBS += -L../../../../SDK/lib/linux_64 -licuuc
+    LIBS += -L../../../../SDK/lib/linux_64 -licudata
 
     message(linux64)
 }
@@ -153,4 +161,5 @@ INCLUDEPATH += \
 
 SOURCES += main.cpp \
     ../../../Common/DocxFormat/Source/XML/libxml2/libxml2.cpp \
-    ../../../Common/DocxFormat/Source/XML/stringcommon.cpp
+    ../../../Common/DocxFormat/Source/XML/stringcommon.cpp \
+    ../../../Common/DocxFormat/Source/Base/unicode_util.cpp

DesktopEditor/doctrenderer/test/main.cpp

@@ -6,6 +6,7 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
 
+#if 1
     std::wstring strXml = L"<Settings>\
 <SrcFileType>0</SrcFileType>\
 <DstFileType>0</DstFileType>\
@@ -18,6 +19,20 @@ int main(int argc, char *argv[])
 <Change>D:\\build_doc\\changes\\changes0.json</Change>\
 </Changes>\
 </Settings>";
+#else
+    std::wstring strXml = L"<Settings>\
+<SrcFileType>0</SrcFileType>\
+<DstFileType>0</DstFileType>\
+<SrcFilePath>/home/oleg/build_doc</SrcFilePath>\
+<DstFilePath>/home/oleg/build_doc/EditorWithChanges.bin</DstFilePath>\
+<FontsDirectory>/home/oleg/AVS/Sources/TeamlabOffice/trunk/OfficeWeb/Fonts/native</FontsDirectory>\
+<ImagesDirectory>/home/oleg/build_doc/media</ImagesDirectory>\
+<ThemesDirectory>/home/oleg/presentationthemes</ThemesDirectory>\
+<Changes TopItem=\"-1\">\
+<Change>/home/oleg/build_doc/changes/changes0.json</Change>\
+</Changes>\
+</Settings>";
+#endif
 
     NSDoctRenderer::CDoctrenderer oRenderer;