pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

project settings depends of base.pri (#71)

Browse Source
This commit is contained in:
maxkadushkin
2020-01-17 16:46:21 +03:00
committed by Alexey Golubev
parent 62f83bba77
commit 04fdc2204e
2 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
win-linux/extras/projicons/common.pri
View File

@ -2,10 +2,6 @@
QT += core QT += core
QT -= gui QT -= gui
OBJECTS_DIR = ./obj
MOC_DIR = ./moc
RCC_DIR = ./rcc
TARGET = projicons TARGET = projicons
CONFIG -= console CONFIG -= console
CONFIG -= app_bundle CONFIG -= app_bundle
@ -13,27 +9,40 @@ CONFIG -= debug_and_release debug_and_release_target
TEMPLATE = app TEMPLATE = app
HEADERS += $$PWD/src/version.h INCLUDEPATH += $$PWD/src
SOURCES += $$PWD/src/main.cpp HEADERS += src/version.h
SOURCES += src/main.cpp
CONFIG += core_no_dst
include($$PWD/../../../../core/Common/base.pri)
ENV_PRODUCT_VERSION = $$(PRODUCT_VERSION)
!isEmpty(ENV_PRODUCT_VERSION) {
FULL_PRODUCT_VERSION = $${ENV_PRODUCT_VERSION}.$$(BUILD_NUMBER)
DEFINES += VER_PRODUCT_VERSION=$$FULL_PRODUCT_VERSION \
VER_PRODUCT_VERSION_COMMAS=$$replace(FULL_PRODUCT_VERSION, \., ",")
}
RC_FILE = $$PWD/version.rc RC_FILE = $$PWD/version.rc
contains(QMAKE_TARGET.arch, x86_64):{ contains(QMAKE_TARGET.arch, x86_64):{
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.02 QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.02
PLATFORM_BUILD = win_64
} else { } else {
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01
PLATFORM_BUILD = win_32
} }
TARGET = $$join(TARGET,,,_$$PLATFORM_BUILD) core_release:DESTDIR = $$PWD/build
OBJECTS_DIR = $$join(OBJECTS_DIR,,./$$PLATFORM_BUILD/,) core_debug:DESTDIR = $$PWD/build/debug
MOC_DIR = $$join(MOC_DIR,,./$$PLATFORM_BUILD/,)
RCC_DIR = $$join(RCC_DIR,,./$$PLATFORM_BUILD/,)
win32:build_xp { !isEmpty(OO_BUILD_BRANDING) {
TARGET = $$join(TARGET,,,_xp) DESTDIR = $$DESTDIR/$$OO_BUILD_BRANDING
OBJECTS_DIR = $$replace(OBJECTS_DIR, $$PLATFORM_BUILD/,$$PLATFORM_BUILD/xp/)
MOC_DIR = $$replace(MOC_DIR, $$PLATFORM_BUILD/,$$PLATFORM_BUILD/xp/)
RCC_DIR = $$replace(RCC_DIR, $$PLATFORM_BUILD/,$$PLATFORM_BUILD/xp/)
} }
DESTDIR = $$DESTDIR/$$CORE_BUILDS_PLATFORM_PREFIX
build_xp {
DESTDIR = $$DESTDIR/xp
}
OBJECTS_DIR = $$DESTDIR/obj
MOC_DIR = $$DESTDIR/moc
RCC_DIR = $$DESTDIR/rcc

28
win-linux/extras/projicons/src/version.h
View File

@ -34,16 +34,26 @@
#define VERSION_H #define VERSION_H
#define VER_STRINGIFY(d) #d #define VER_STRINGIFY(d) #d
#define VER_STR_LONG(mj,mn,b,r) VER_STRINGIFY(mj) "." VER_STRINGIFY(mn) "." VER_STRINGIFY(b) "." VER_STRINGIFY(r) "\0"
#define VER_STR_SHORT(mj,mn) VER_STRINGIFY(mj) "." VER_STRINGIFY(mn) "\0"
#define VER_NUM_MAJOR 5 #ifdef VER_PRODUCT_VERSION
#define VER_NUM_MINOR 2 # define TO_STR(v) VER_STRINGIFY(v)
#define VER_NUM_BUILD 46 # define VER_FILEVERSION VER_PRODUCT_VERSION_COMMAS
#define VER_NUM_REVISION 24 # define VER_FILEVERSION_STR TO_STR(VER_PRODUCT_VERSION)
#define VER_NUMBER VER_NUM_MAJOR,VER_NUM_MINOR,VER_NUM_BUILD,VER_NUM_REVISION
#define VER_STRING VER_STR_LONG(VER_NUM_MAJOR,VER_NUM_MINOR,VER_NUM_BUILD,VER_NUM_REVISION) # define VER_PRODUCTVERSION VER_FILEVERSION
#define VER_STRING_SHORT VER_STR_SHORT(VER_NUM_MAJOR,VER_NUM_MINOR) # define VER_PRODUCTVERSION_STR TO_STR(VER_PRODUCT_VERSION)
#else
# define VER_STR_LONG(mj,mn,b,r) VER_STRINGIFY(mj) "." VER_STRINGIFY(mn) "." VER_STRINGIFY(b) "." VER_STRINGIFY(r) "\0"
# define VER_STR_SHORT(mj,mn) VER_STRINGIFY(mj) "." VER_STRINGIFY(mn) "\0"
# define VER_NUM_MAJOR 5
# define VER_NUM_MINOR 2
# define VER_NUM_BUILD 46
# define VER_NUM_REVISION 24
# define VER_NUMBER VER_NUM_MAJOR,VER_NUM_MINOR,VER_NUM_BUILD,VER_NUM_REVISION
# define VER_STRING VER_STR_LONG(VER_NUM_MAJOR,VER_NUM_MINOR,VER_NUM_BUILD,VER_NUM_REVISION)
# define VER_STRING_SHORT VER_STR_SHORT(VER_NUM_MAJOR,VER_NUM_MINOR)
#endif
#define VER_LANG_AND_CHARSET_STR "040904E4" #define VER_LANG_AND_CHARSET_STR "040904E4"
#define VER_LANG_ID 0x0409 #define VER_LANG_ID 0x0409