diff --git a/Common/base.pri b/Common/base.pri index 59504aba6c..2442e08438 100644 --- a/Common/base.pri +++ b/Common/base.pri @@ -245,10 +245,17 @@ UI_DIR = $$PWD_ROOT_DIR/core_build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUI } CORE_BUILDS_LIBRARIES_PATH = $$CORE_ROOT_DIR/build/lib/$$CORE_BUILDS_PLATFORM_PREFIX -core_windows { -core_debug { - CORE_BUILDS_LIBRARIES_PATH = $$CORE_BUILDS_LIBRARIES_PATH/DEBUG +CORE_BUILDS_BINARY_PATH = $$CORE_ROOT_DIR/build/bin/$$CORE_BUILDS_PLATFORM_PREFIX + +OO_BUILD_BRANDING = $$(OO_BUILD_BRANDING) +!isEmpty(OO_BUILD_BRANDING) { + CORE_BUILDS_LIBRARIES_PATH = $$CORE_ROOT_DIR/build/$$OO_BUILD_BRANDING/lib/$$CORE_BUILDS_PLATFORM_PREFIX + CORE_BUILDS_BINARY_PATH = $$CORE_ROOT_DIR/build/$$OO_BUILD_BRANDING/bin/$$CORE_BUILDS_PLATFORM_PREFIX } + +core_debug { + CORE_BUILDS_LIBRARIES_PATH = $$CORE_BUILDS_LIBRARIES_PATH/debug + CORE_BUILDS_BINARY_PATH = $$CORE_BUILDS_BINARY_PATH/debug } plugin { diff --git a/DesktopEditor/AllFontsGen/AllFontsGen.pro b/DesktopEditor/AllFontsGen/AllFontsGen.pro index d9bc27789a..9dbccbd5a5 100644 --- a/DesktopEditor/AllFontsGen/AllFontsGen.pro +++ b/DesktopEditor/AllFontsGen/AllFontsGen.pro @@ -9,7 +9,7 @@ PWD_ROOT_DIR = $$PWD include($$CORE_ROOT_DIR/Common/base.pri) include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri) -DESTDIR = $$PWD/../../build/bin/$$CORE_BUILDS_PLATFORM_PREFIX +DESTDIR = $$CORE_BUILDS_BINARY_PATH TARGET = allfontsgen diff --git a/DesktopEditor/allthemesgen/allthemesgen.pro b/DesktopEditor/allthemesgen/allthemesgen.pro index 37ddb9238f..65a47897d7 100644 --- a/DesktopEditor/allthemesgen/allthemesgen.pro +++ b/DesktopEditor/allthemesgen/allthemesgen.pro @@ -9,7 +9,7 @@ PWD_ROOT_DIR = $$PWD include($$CORE_ROOT_DIR/Common/base.pri) include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri) -DESTDIR = $$PWD/../../build/bin/$$CORE_BUILDS_PLATFORM_PREFIX +DESTDIR = $$CORE_BUILDS_BINARY_PATH TARGET = allthemesgen diff --git a/DesktopEditor/doctrenderer/app_builder/docbuilder.pro b/DesktopEditor/doctrenderer/app_builder/docbuilder.pro index bd80422710..d6f7df0a50 100644 --- a/DesktopEditor/doctrenderer/app_builder/docbuilder.pro +++ b/DesktopEditor/doctrenderer/app_builder/docbuilder.pro @@ -42,7 +42,7 @@ core_windows { } ############### destination path ############### -DESTDIR = $$CORE_ROOT_DIR/build/bin/$$CORE_BUILDS_PLATFORM_PREFIX +DESTDIR = $$CORE_BUILDS_BINARY_PATH ################################################ LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics -lUnicodeConverter diff --git a/X2tConverter/build/Qt/X2tConverter.pro b/X2tConverter/build/Qt/X2tConverter.pro index b839a2a4ef..22b2f5bbfc 100644 --- a/X2tConverter/build/Qt/X2tConverter.pro +++ b/X2tConverter/build/Qt/X2tConverter.pro @@ -29,7 +29,7 @@ include(X2tConverter.pri) !build_x2t_as_library { SOURCES += ../../src/main.cpp - DESTDIR = "$$PWD/../../../build/bin/$$CORE_BUILDS_PLATFORM_PREFIX" + DESTDIR = $$CORE_BUILDS_BINARY_PATH } else { HEADERS += ../../src/dylib/x2t.h SOURCES += ../../src/dylib/x2t.cpp