Commit 3580ac09 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov
parent a2c2c268
...@@ -24,15 +24,13 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{ ...@@ -24,15 +24,13 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
DESTINATION_BUILD_OBJ = $$PWD/build/$$PLATFORM_BUILD/Debug/obj DESTINATION_BUILD_OBJ = $$PWD/build/$$PLATFORM_BUILD/Debug/obj
DESTINATION_BUILD_MOC = $$PWD/build/$$PLATFORM_BUILD/Debug/moc DESTINATION_BUILD_MOC = $$PWD/build/$$PLATFORM_BUILD/Debug/moc
DESTINATION_BUILD_QMAKE = = $$PWD/build/$$PLATFORM_BUILD/Debug DESTINATION_BUILD_QMAKE = $$PWD/build/$$PLATFORM_BUILD/Debug
DESTINATION_BUILD = $$PWD/../app/corebuilds/$$PLATFORM_BUILD/debug DESTINATION_BUILD = $$PWD/../app/corebuilds/$$PLATFORM_BUILD/debug
PLATFORM_BUILD2 = $$PLATFORM_BUILD2/DEBUG
message(debug) message(debug)
} else { } else {
DESTINATION_BUILD_OBJ = $$PWD/build/$$PLATFORM_BUILD/Release/obj DESTINATION_BUILD_OBJ = $$PWD/build/$$PLATFORM_BUILD/Release/obj
DESTINATION_BUILD_MOC = $$PWD/build/$$PLATFORM_BUILD/Release/moc DESTINATION_BUILD_MOC = $$PWD/build/$$PLATFORM_BUILD/Release/moc
DESTINATION_BUILD_QMAKE = = $$PWD/build/$$PLATFORM_BUILD/Release DESTINATION_BUILD_QMAKE = $$PWD/build/$$PLATFORM_BUILD/Release
DESTINATION_BUILD = $$PWD/../app/corebuilds/$$PLATFORM_BUILD DESTINATION_BUILD = $$PWD/../app/corebuilds/$$PLATFORM_BUILD
message(release) message(release)
} }
...@@ -52,7 +50,7 @@ MOC_DIR = $$DESTINATION_BUILD_MOC ...@@ -52,7 +50,7 @@ MOC_DIR = $$DESTINATION_BUILD_MOC
DEFINES += HUNSPELL_STATIC DEFINES += HUNSPELL_STATIC
LIBS += -L"$$PWD/../../../SDK/lib/$$PLATFORM_BUILD2" -lOfficeUtils -lgraphics -lhunspell LIBS += -L$$PWD/../../../SDK/lib/$$PLATFORM_BUILD2 -lOfficeUtils -lgraphics -lhunspell
# ------------------------------------------------------ # ------------------------------------------------------
CONFIG += link_pkgconfig c++11 CONFIG += link_pkgconfig c++11
...@@ -595,7 +593,7 @@ SOURCES += \ ...@@ -595,7 +593,7 @@ SOURCES += \
src/cef/linux/cefclient/renderer/performance_test_tests.cc src/cef/linux/cefclient/renderer/performance_test_tests.cc
LIBS += -L$$PWD/../app/cefbuilds/$$PLATFORM_BUILD -llibcef LIBS += -L$$PWD/../app/cefbuilds/$$PLATFORM_BUILD -lcef
INCLUDEPATH += \ INCLUDEPATH += \
../../agg-2.4/include \ ../../agg-2.4/include \
......
...@@ -29,7 +29,7 @@ win32:!contains(QMAKE_TARGET.arch, x86_64):{ ...@@ -29,7 +29,7 @@ win32:!contains(QMAKE_TARGET.arch, x86_64):{
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
DESTINATION_BUILD_OBJ = $$PWD/build/$$PLATFORM_BUILD/Debug/obj DESTINATION_BUILD_OBJ = $$PWD/build/$$PLATFORM_BUILD/Debug/obj
DESTINATION_BUILD_MOC = $$PWD/build/$$PLATFORM_BUILD/Debug/moc DESTINATION_BUILD_MOC = $$PWD/build/$$PLATFORM_BUILD/Debug/moc
DESTINATION_BUILD_QMAKE = = $$PWD/build/$$PLATFORM_BUILD/Debug DESTINATION_BUILD_QMAKE = $$PWD/build/$$PLATFORM_BUILD/Debug
DESTINATION_BUILD = $$PWD/../app/corebuilds/$$PLATFORM_BUILD/debug DESTINATION_BUILD = $$PWD/../app/corebuilds/$$PLATFORM_BUILD/debug
PLATFORM_BUILD2 = $$PLATFORM_BUILD2/DEBUG PLATFORM_BUILD2 = $$PLATFORM_BUILD2/DEBUG
...@@ -37,7 +37,7 @@ CONFIG(debug, debug|release) { ...@@ -37,7 +37,7 @@ CONFIG(debug, debug|release) {
} else { } else {
DESTINATION_BUILD_OBJ = $$PWD/build/$$PLATFORM_BUILD/Release/obj DESTINATION_BUILD_OBJ = $$PWD/build/$$PLATFORM_BUILD/Release/obj
DESTINATION_BUILD_MOC = $$PWD/build/$$PLATFORM_BUILD/Release/moc DESTINATION_BUILD_MOC = $$PWD/build/$$PLATFORM_BUILD/Release/moc
DESTINATION_BUILD_QMAKE = = $$PWD/build/$$PLATFORM_BUILD/Release DESTINATION_BUILD_QMAKE = $$PWD/build/$$PLATFORM_BUILD/Release
DESTINATION_BUILD = $$PWD/../app/corebuilds/$$PLATFORM_BUILD DESTINATION_BUILD = $$PWD/../app/corebuilds/$$PLATFORM_BUILD
message(release) message(release)
} }
......
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