project structure

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

DesktopEditor/ChromiumBasedEditors 2/app/test/ASCDocumentEditor.pro

@@ -3,12 +3,30 @@ QT  += core gui widgets gui-private widgets-private core-private printsupport
 TEMPLATE = app
 CONFIG += app_bundle
 
+CONFIG -= debug_and_release debug_and_release_target
+
 CONFIG(debug, debug|release) {
     DESTDIR = $$PWD/build/windows/Debug
 } else {
     DESTDIR = $$PWD/build/windows/Release
 }
 
+win32:contains(QMAKE_TARGET.arch, x86_64):{
+    PLATFORM_BUILD = win64
+    message(windows64)
+}
+win32:!contains(QMAKE_TARGET.arch, x86_64):{
+    PLATFORM_BUILD = win32
+    message(windows32)
+}
+
+CONFIG(debug, debug|release) {
+    PLATFORM_BUILD2 = $$PLATFORM_BUILD/debug
+    message(debug)
+} else {
+    PLATFORM_BUILD2 = $$PLATFORM_BUILD
+}
+
 HEADERS += \
     mainwindow.h \
     qmainpanel.h \
@@ -60,43 +78,7 @@ LIBS += -lwininet \
         -ldwmapi \
         -lOpenGL32
 
-win32:contains(QMAKE_TARGET.arch, x86_64):{
-
-DEFINES += JAS_WIN_MSVC_BUILD WIN32
-
 QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.02
 
-CONFIG(debug, debug|release) {
-
-    LIBS += -L../../cefbuilds/win64 -llibcef
-    LIBS += -L../../../lib/build/Debug/debug -lascdocumentscore
-
-} else {
-
-    LIBS += -L../../cefbuilds/win64 -llibcef
-    LIBS += -L../../../lib/build/Release/release -lascdocumentscore
-
-}
-
-    message(windows64)
-}
-win32:!contains(QMAKE_TARGET.arch, x86_64):{
-
-DEFINES += JAS_WIN_MSVC_BUILD WIN32 _WIN32
-
-QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01
-
-CONFIG(debug, debug|release) {
-
-    LIBS += -L../../cefbuilds/win32 -llibcef
-    LIBS += -L../../../lib/build/Debug/debug -lascdocumentscore
-
-} else {
-
-    LIBS += -L../../cefbuilds/win32 -llibcef
-    LIBS += -L../../../lib/build/Release/release -lascdocumentscore
-
-}
-
-    message(windows32)
-}
+LIBS += -L$$PWD/../cefbuilds/$$PLATFORM_BUILD -llibcef
+LIBS += -L$$PWD/../corebuilds/$$PLATFORM_BUILD2 -lascdocumentscore

DesktopEditor/ChromiumBasedEditors 2/lib/AscDocumentsCore_windows.pro

@@ -4,19 +4,26 @@ QT -= gui
 TARGET = ascdocumentscore
 TEMPLATE = lib
 
-CONFIG += static
 CONFIG += shared
 CONFIG += plugin
 
-DEFINES += HUNSPELL_STATIC
+DEFINES += \
+    WIN32 \
+    NOMINMAX \
+    _QT
+
+CONFIG -= debug_and_release debug_and_release_target
+QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 
 win32:contains(QMAKE_TARGET.arch, x86_64):{
     PLATFORM_BUILD = win64
+    PLATFORM_BUILD2 = win_64
     message(windows64)
 }
 win32:!contains(QMAKE_TARGET.arch, x86_64):{
     PLATFORM_BUILD = win32
-    message(windows64)
+    PLATFORM_BUILD2 = win_32
+    message(windows32)
 }
 
 CONFIG(debug, debug|release) {
@@ -24,6 +31,8 @@ CONFIG(debug, debug|release) {
     DESTINATION_BUILD_MOC = $$PWD/build/$$PLATFORM_BUILD/Debug/moc
     DESTINATION_BUILD_QMAKE = = $$PWD/build/$$PLATFORM_BUILD/Debug
     DESTINATION_BUILD = $$PWD/../app/corebuilds/$$PLATFORM_BUILD/debug
+
+    PLATFORM_BUILD2 = $$PLATFORM_BUILD2/DEBUG
     message(debug)
 } else {
     DESTINATION_BUILD_OBJ = $$PWD/build/$$PLATFORM_BUILD/Release/obj
@@ -36,18 +45,20 @@ CONFIG(debug, debug|release) {
 DESTDIR     = $$DESTINATION_BUILD
 OBJECTS_DIR = $$DESTINATION_BUILD_OBJ
 MOC_DIR     = $$DESTINATION_BUILD_MOC
-OUT_PWD     = $$DESTINATION_BUILD_QMAKE
 
-DEFINES += \
-    _QT \
-    FT2_BUILD_LIBRARY \
-    EXCLUDE_JPG_SUPPORT \
-    MNG_SUPPORT_DISPLAY \
-    MNG_SUPPORT_READ \
-    MNG_SUPPORT_WRITE \
-    MNG_ACCESS_CHUNKS \
-    MNG_STORE_CHUNKS\
-    MNG_ERROR_TELLTALE
+# common projects --------------------------------------
+#zlib
+#CONFIG += build_all_zlib build_zlib_as_sources
+#include($$PWD/../../../OfficeUtils/OfficeUtils.pri)
+#hunspell
+#include($$PWD/../../hunspell-1.3.3/src/qt/hunspell.pri)
+#graphics
+#include($$PWD/../../Qt_build/graphics/project/graphics.pri)
+
+DEFINES += HUNSPELL_STATIC
+
+LIBS += -L$$PWD/../../../SDK/lib/$$PLATFORM_BUILD2 -lOfficeUtils -lgraphics -lhunspell
+# ------------------------------------------------------
 
 DEFINES += \
     "V8_DEPRECATION_WARNINGS" \
@@ -614,30 +625,7 @@ SOURCES += \
     src/cef/windows/cefclient/renderer/performance_test.cc \
     src/cef/windows/cefclient/renderer/performance_test_tests.cc
 
-CONFIG(debug, debug|release) {
-    LIBS += -L../../../../SDK/lib/win_64/DEBUG -lgraphics
-    LIBS += -L../../../hunspell-1.3.3/src/qt/Debug/debug -lhunspell
-} else {
-    LIBS += -L../../../../SDK/lib/win_64/release -lgraphics
-    LIBS += -L../../../hunspell-1.3.3/src/qt/Release/release -lhunspell
-}
-
-win32:contains(QMAKE_TARGET.arch, x86_64):{
-
-CONFIG(debug, debug|release) {
-    LIBS += -L../../app/cefbuilds/win64 -llibcef
-    LIBS += -L../../../../ASCOfficeUtils/ASCOfficeUtilsLib/Win/x64/Debug -lASCOfficeUtilsLib
-    message(debug)
-} else {
-    LIBS += -L../../app/cefbuilds/win64 -llibcef
-    LIBS += -L../../../../ASCOfficeUtils/ASCOfficeUtilsLib/Win/x64/Release -lASCOfficeUtilsLib
-    message(release)
-}
-
-    message(windows64)
-}
-win32:!contains(QMAKE_TARGET.arch, x86_64):{
-}
+LIBS += -L$$PWD/../app/cefbuilds/$$PLATFORM_BUILD -llibcef
 
 INCLUDEPATH += \
     ../../agg-2.4/include \

DesktopEditor/Qt_build/graphics/project/graphics.pri

@@ -45,6 +45,8 @@ win32 {
     message(windows)
 }
 
+LIB_GRAPHICS_PRI_PATH = $$PWD/../../..
+
 INCLUDEPATH += \
     $$LIB_GRAPHICS_PRI_PATH/agg-2.4/include \
     $$LIB_GRAPHICS_PRI_PATH/freetype-2.5.2/include \

DesktopEditor/xml/build/test/qt/test.pro

@@ -14,6 +14,8 @@ CONFIG   -= app_bundle
 
 TEMPLATE = app
 
-LIBS += -L../../../qt/Debug/debug -llibxml
+#LIBS += -L../../../../../SDK/lib/win_64/DEBUG -llibxml
+LIB_XML_PRI_PATH = ../../../../../DesktopEditor/xml
+include(../../../../../DesktopEditor/xml/build/qt/libxml2.pri)
 
 SOURCES += main.cpp