Merge no_embedded and dev qmake CONFIG flags

This commit is contained in:
miruka 2019-09-10 17:15:24 -04:00
parent d6b8fae30a
commit 6da3e0ab87
2 changed files with 11 additions and 17 deletions

View File

@ -11,19 +11,19 @@ RCC_DIR = $$BUILD_DIR/rcc
QRC_FILE = $$BUILD_DIR/resources.qrc QRC_FILE = $$BUILD_DIR/resources.qrc
RESOURCES += $$QRC_FILE
SOURCES += src/main.cpp SOURCES += src/main.cpp
TARGET = harmonyqml TARGET = harmonyqml
# Custom CONFIG options # Custom CONFIG options
!no_embedded {
RESOURCES += $$QRC_FILE
}
dev { dev {
CONFIG -= warn_off release CONFIG -= warn_off release
CONFIG += debug qml_debug declarative_debug CONFIG += debug qml_debug declarative_debug
RESOURCES -= $$QRC_FILE
warning(make install cannot be used with the dev CONFIG option.)
} }
@ -33,11 +33,7 @@ win32:executables.path = "C:/Program Files"
!win32:executables.path = /usr/local/bin !win32:executables.path = /usr/local/bin
executables.files = $$TARGET executables.files = $$TARGET
no_embedded { !dev:INSTALLS += executables
warning(make install cannot be used with the no_embedded CONFIG option.)
}
!no_embedded:INSTALLS += executables
# Libraries includes # Libraries includes

View File

@ -10,14 +10,12 @@
export QT_QPA_PLATFORM=xcb export QT_QPA_PLATFORM=xcb
CFG='dev no_embedded'
make clean make clean
qmake harmonyqml.pro CONFIG+="$CFG" && make qmake harmonyqml.pro CONFIG+=dev && make
while true; do while true; do
find src harmonyqml.pro -type f | find src harmonyqml.pro -type f |
entr -cdnr sh -c \ entr -cdnr sh -c \
"qmake harmonyqml.pro CONFIG+='$CFG' && make && ./harmonyqml $*" "qmake harmonyqml.pro CONFIG+=dev && make && ./harmonyqml $*"
sleep 0.2 sleep 0.2
done done