лицензия для онлиофис

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

DesktopEditor/AllFontsGen/AllFontsGen.pro

@@ -3,6 +3,8 @@ CONFIG += console
 CONFIG -= app_bundle
 CONFIG -= qt
 
+CONFIG += c++11
+
 ############### destination path ###############
 DESTDIR = $$PWD/../../SDK/bin/AllFontsGen
 
@@ -21,6 +23,10 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
     TARGET = linux_32
 }
 
+mac {
+    TARGET = mac_64
+}
+
 ################################################
 
 ################# dependencies #################
@@ -47,8 +53,12 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
     DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
 }
 
+mac {
+    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/mac_64
+}
+
 LIBS += -L$$DESTINATION_SDK_PATH -lgraphics
-LIBS += -L$$DESTINATION_SDK_PATH -lASCOfficeUtilsLib
+LIBS += -L$$DESTINATION_SDK_PATH -lOfficeUtils
 linux-g++ | linux-g++-64 | linux-g++-32 {
     LIBS += -lz
 }

DesktopEditor/AllFontsGen/main.cpp

@@ -919,19 +919,27 @@ int main(int argc, char** argv)
 #endif
 
 #if 0
+
 #ifdef WIN32
     //std::wstring strFontsFolder = L"C:/Windows/Fonts";
-    std::wstring strFontsFolder = L"D:/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb/Fonts/native";
-    std::wstring strAllFontsJSPath = L"D:/AllFontsGenTest/AllFonts.js";
-    std::wstring strThumbnailsFolder = L"D:/AllFontsGenTest";
-    std::wstring strFontsSelectionBin = L"D:/AllFontsGenTest/font_selection.bin";
+    strFontsFolder = L"D:/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb/Fonts/native";
+    strAllFontsJSPath = L"D:/AllFontsGenTest/AllFonts.js";
+    strThumbnailsFolder = L"D:/AllFontsGenTest";
+    strFontsSelectionBin = L"D:/AllFontsGenTest/font_selection.bin";
 #endif
 
-#ifdef _LINUX
-    std::wstring strFontsFolder = L"";
-    std::wstring strAllFontsJSPath = L"/home/oleg/AllFontsGen/AllFonts.js";
-    std::wstring strThumbnailsFolder = L"/home/oleg/AllFontsGen/";
-    std::wstring strFontsSelectionBin = L"/home/oleg/AllFontsGen/font_selection.bin";
+#if defined(_LINUX) && !defined(_MAC)
+    strFontsFolder = L"";
+    strAllFontsJSPath = L"/home/oleg/AllFontsGen/AllFonts.js";
+    strThumbnailsFolder = L"/home/oleg/AllFontsGen/";
+    strFontsSelectionBin = L"/home/oleg/AllFontsGen/font_selection.bin";
+#endif
+
+#ifdef _MAC
+    strFontsFolder = L"";
+    strAllFontsJSPath = L"/Users/Oleg/Desktop/activex/AllFonts.js";
+    strThumbnailsFolder = L"/Users/Oleg/Desktop/activex/";
+    strFontsSelectionBin = L"/Users/Oleg/Desktop/activex/font_selection.bin";
 #endif
 
 #endif