flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-19 03:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added constexpr specifier where possible in CBuildConfig.

Browse Source 
This necessitated moving some function definitions into a .inc file
that is included by buildconfig.h, as constexpr functions must be defined
in the header. This new file is added to the list of QMAKE_SUBSTITUTES.
This commit is contained in:
Mat Sutcliffe
2018-11-03 22:48:07 +00:00
parent 87552c2327
commit 188d3d914e
7 changed files with 241 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackconfig/blackconfig.pro
View File

@@ -4,10 +4,15 @@ TARGET = blackconfig
TEMPLATE = lib
CONFIG += staticlib
buildconfig_gen.input = buildconfig_gen.cpp.in
buildconfig_gen.output = $$BuildRoot/buildconfig_gen.cpp
GENERATED_SOURCES += $$BuildRoot/buildconfig_gen.cpp
QMAKE_SUBSTITUTES += buildconfig_gen
buildconfig_gen.cpp.input = buildconfig_gen.cpp.in
buildconfig_gen.cpp.output = $$BuildRoot/generated/buildconfig_gen.cpp
buildconfig_gen.inc.input = buildconfig_gen.inc.in
buildconfig_gen.inc.output = $$BuildRoot/generated/buildconfig_gen.inc
GENERATED_SOURCES += $$BuildRoot/generated/buildconfig_gen.cpp
GENERATED_FILES += $$BuildRoot/generated/buildconfig_gen.inc
QMAKE_SUBSTITUTES += buildconfig_gen.cpp buildconfig_gen.inc
INCLUDEPATH += ..
@@ -15,7 +20,7 @@ DEFINES += LOG_IN_FILE
HEADERS += *.h
SOURCES += *.cpp
DESTDIR = $$DestRoot/lib
OTHER_FILES += buildconfig_gen.cpp.in
OTHER_FILES += buildconfig_gen.cpp.in buildconfig_gen.inc.in
win32: GIT_BIN = $$system($$(SYSTEMROOT)\system32\where git 2> nul)
else: GIT_BIN = $$system(which git 2> /dev/null)