завел переменные для удобной сборки под все платформы, указывая лишь в одном...

завел переменные для удобной сборки под все платформы, указывая лишь в одном месте путь к v8 checkout

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

DesktopEditor/doctrenderer/doctrenderer.pro

@@ -19,57 +19,15 @@ DEFINES += _UNICODE
 DEFINES += _USE_LIBXML2_READER_
 DEFINES += LIBXML_READER_ENABLED
 
-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
-    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
+V8_CHECKOUT_PATH = ../../../../../../../v8_trunk
+V8_BUILD_LIBRARY_PATH_WINDOWS = ../../../SDK/lib
+QT_SETUP_INCLUDES_PATH = C:/Qt/Qt5.4.1/5.4/msvc2013_64_opengl/include
 
-    message(linux64)
-}
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
-    LIBS += -L../../../SDK/lib/linux_32 -lgraphics
-
-    LIBS += -L../../../SDK/lib/linux_32 -llibxml2
-
-    LIBS += -L../../../SDK/lib/linux_32 -lv8_base
-    LIBS += -L../../../SDK/lib/linux_32 -lv8_libplatform
-    LIBS += -L../../../SDK/lib/linux_32 -lv8_libbase
-    LIBS += -L../../../SDK/lib/linux_32 -lv8_nosnapshot
-    LIBS += -L../../../SDK/lib/linux_32 -lv8_snapshot
-    LIBS += -L../../../SDK/lib/linux_32 -licui18n
-    LIBS += -L../../../SDK/lib/linux_32 -licuuc
-    LIBS += -L../../../SDK/lib/linux_32 -licudata
-
-    message(linux32)
-}
-
-mac {
-    DEFINES += \
-    LINUX \
-    _LINUX \
-    _LINUX_QT \
-    _MAC \
-    QT_MAC
-
-    LIBS += -L../../../../../../../../../v8/out/native -lv8_base.x64
-    LIBS += -L../../../../../../../../../v8/out/native -lv8_snapshot
-    LIBS += -L../../../../../../../../../v8/out/native -lv8_nosnapshot.x64
-    LIBS += -L../../../../../../../../../v8/out/native -licui18n
-    LIBS += -L../../../../../../../../../v8/out/native -licuuc
-    LIBS += -L../../../../../../../../../v8/out/native -licudata
-
-    message(mac)
-}
+INCLUDEPATH += \
+    $$V8_CHECKOUT_PATH \
+    $$V8_CHECKOUT_PATH/include
 
+#################### WINDOWS #####################
 win32 {
     DEFINES += \
     WIN32
@@ -81,29 +39,19 @@ win32 {
 win32:contains(QMAKE_TARGET.arch, x86_64):{
 
 CONFIG(debug, debug|release) {
-    LIBS += -L../../../SDK/lib/win_64/DEBUG -lgraphics
+    LIBS += -L../../Qt_build/graphics/Debug/debug -lgraphics
 
     LIBS += -L../../../SDK/lib/win_64/DEBUG -llibxml2
 
-    LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_libbase
-    LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_base
-    LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_nosnapshot
-    LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_snapshot
-    LIBS += -L../../../SDK/lib/win_64/DEBUG -lv8_libplatform
-    LIBS += -L../../../SDK/lib/win_64/DEBUG -licui18n
-    LIBS += -L../../../SDK/lib/win_64/DEBUG -licuuc
+    LIBS += -L$$V8_BUILD_LIBRARY_PATH_WINDOWS/win_64/DEBUG -lv8_base -lv8_libbase -lv8_libplatform -lv8_nosnapshot -lv8_snapshot
+    LIBS += -L$$V8_BUILD_LIBRARY_PATH_WINDOWS/win_64/DEBUG -licui18n -licuuc
 } else {
-    LIBS += -L../../../SDK/lib/win_64 -lgraphics
+    LIBS += -L../../Qt_build/graphics/Release/release -lgraphics
 
     LIBS += -L../../../SDK/lib/win_64 -llibxml2
 
-    LIBS += -L../../../SDK/lib/win_64 -lv8_libbase
-    LIBS += -L../../../SDK/lib/win_64 -lv8_base
-    LIBS += -L../../../SDK/lib/win_64 -lv8_nosnapshot
-    LIBS += -L../../../SDK/lib/win_64 -lv8_snapshot
-    LIBS += -L../../../SDK/lib/win_64 -lv8_libplatform
-    LIBS += -L../../../SDK/lib/win_64 -licui18n
-    LIBS += -L../../../SDK/lib/win_64 -licuuc
+    LIBS += -L$$V8_BUILD_LIBRARY_PATH_WINDOWS/win_64 -lv8_base -lv8_libbase -lv8_libplatform -lv8_nosnapshot -lv8_snapshot
+    LIBS += -L$$V8_BUILD_LIBRARY_PATH_WINDOWS/win_64 -licui18n -licuuc
 }
 
     message(windows64)
@@ -111,64 +59,81 @@ CONFIG(debug, debug|release) {
 win32:!contains(QMAKE_TARGET.arch, x86_64):{
 
 CONFIG(debug, debug|release) {
-    LIBS += -L../../../SDK/lib/win_32/DEBUG -lgraphics
+    LIBS += -L../../Qt_build/graphics/Debug/debug -lgraphics
 
     LIBS += -L../../../SDK/lib/win_32/DEBUG -llibxml2
 
-    LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_libbase
-    LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_base
-    LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_nosnapshot
-    LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_snapshot
-    LIBS += -L../../../SDK/lib/win_32/DEBUG -lv8_libplatform
-    LIBS += -L../../../SDK/lib/win_32/DEBUG -licui18n
-    LIBS += -L../../../SDK/lib/win_32/DEBUG -licuuc
+    LIBS += -L$$V8_BUILD_LIBRARY_PATH_WINDOWS/win_32/DEBUG -lv8_base -lv8_libbase -lv8_libplatform -lv8_nosnapshot -lv8_snapshot
+    LIBS += -L$$V8_BUILD_LIBRARY_PATH_WINDOWS/win_32/DEBUG -licui18n -licuuc
 } else {
-    LIBS += -L../../../SDK/lib/win_32 -lgraphics
+    LIBS += -L../../Qt_build/graphics/Release/release -lgraphics
 
     LIBS += -L../../../SDK/lib/win_32 -llibxml2
 
-    LIBS += -L../../../SDK/lib/win_32 -lv8_libbase
-    LIBS += -L../../../SDK/lib/win_32 -lv8_base
-    LIBS += -L../../../SDK/lib/win_32 -lv8_nosnapshot
-    LIBS += -L../../../SDK/lib/win_32 -lv8_snapshot
-    LIBS += -L../../../SDK/lib/win_32 -lv8_libplatform
-    LIBS += -L../../../SDK/lib/win_32 -licui18n
-    LIBS += -L../../../SDK/lib/win_32 -licuuc
+    LIBS += -L$$V8_BUILD_LIBRARY_PATH_WINDOWS/win_32 -lv8_base -lv8_libbase -lv8_libplatform -lv8_nosnapshot -lv8_snapshot
+    LIBS += -L$$V8_BUILD_LIBRARY_PATH_WINDOWS/win_32 -licui18n -licuuc
 }
 
     message(windows32)
 }
+##################################################
 
-INCLUDEPATH += \
-    ../../../agg-2.4/include \
-    ../../../freetype-2.5.2/include \
-    ../../../../../../../v8_trunk \
-    ../../../../../../../v8_trunk/include \
-    ../../../Common/DocxFormat/Source/XML/libxml2/XML/include
+################### LINUX ########################
 
-INCLUDEPATH += C:/Qt/Qt5.4.0/5.4/msvc2013_64_opengl/include
+linux-g++ | linux-g++-64 | linux-g++-32 {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT \
 
+    LIBS += -L$$V8_CHECKOUT_PATH/out/native/obj.target/tools/gyp -lv8_base -lv8_libbase -lv8_libplatform -lv8_nosnapshot -lv8_snapshot
+    LIBS += -L$$V8_CHECKOUT_PATH/out/native/obj.target/third_party/icu -licui18n -licuuc -licudata
+}
 
-SOURCES += doctrenderer.cpp \
-    ../../../Common/DocxFormat/Source/XML/libxml2/libxml2.cpp \
-    ../../../Common/DocxFormat/Source/XML/stringcommon.cpp \
-    ../../../Common/DocxFormat/Source/Base/unicode_util.cpp
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    LIBS += -L../../../SDK/lib/linux_64 -lgraphics
 
-linux-g++ | linux-g++-64 | linux-g++-32 {
+    LIBS += -L../../../SDK/lib/linux_64 -llibxml2
+    message(linux64)
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    LIBS += -L../../../SDK/lib/linux_32 -lgraphics
+
+    LIBS += -L../../../SDK/lib/linux_32 -llibxml2
+    message(linux32)
+}
+
+##################################################
+
+#################### MAC #########################
+mac {
     DEFINES += \
     LINUX \
     _LINUX \
     _LINUX_QT \
+    _MAC \
+    QT_MAC
+
+    #TODO: graphics & libxml2
+
+    LIBS += -L$$V8_CHECKOUT_PATH/out/native/obj.target/tools/gyp -lv8_base -lv8_libbase -lv8_libplatform -lv8_nosnapshot -lv8_snapshot
+    LIBS += -L$$V8_CHECKOUT_PATH/out/native/obj.target/third_party/icu -licui18n -licuuc -licudata
+
+    message(mac)
 }
+##################################################
 
 INCLUDEPATH += \
-    ../../../../../../../v8_trunk \
-    ../../../../../../../v8_trunk/include \
-    ../../Common/DocxFormat/Source/XML/libxml2/XML/include \
             ../agg-2.4/include \
-    ../freetype-2.5.2/include
+            ../freetype-2.5.2/include \
+            ../../Common/DocxFormat/Source/XML/libxml2/XML/include
+
+INCLUDEPATH += $$QT_SETUP_INCLUDES_PATH
 
-INCLUDEPATH += /home/oleg/Qt5.4.0/5.4/gcc/include
+SOURCES +=  doctrenderer.cpp \
+            ../../../Common/DocxFormat/Source/XML/libxml2/libxml2.cpp \
+            ../../../Common/DocxFormat/Source/XML/stringcommon.cpp \
+            ../../../Common/DocxFormat/Source/Base/unicode_util.cpp
 
 HEADERS += doctrenderer.h \
     memorystream.h \