mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
Passed ORG_NAME to GCS
This commit is contained in:
parent
144b0a3d10
commit
b6d42f2da8
4
Makefile
4
Makefile
@ -480,7 +480,9 @@ openpilotgcs_qmake $(OPENPILOTGCS_MAKEFILE): | $(OPENPILOTGCS_DIR)
|
||||
$(V1) cd $(OPENPILOTGCS_DIR) && \
|
||||
$(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro \
|
||||
-spec $(QT_SPEC) -r CONFIG+=$(GCS_BUILD_CONF) CONFIG+=$(GCS_SILENT) \
|
||||
'GCS_BIG_NAME="$(GCS_BIG_NAME)"' GCS_SMALL_NAME=$(GCS_SMALL_NAME) $(GCS_QMAKE_OPTS)
|
||||
'GCS_BIG_NAME="$(GCS_BIG_NAME)"' GCS_SMALL_NAME=$(GCS_SMALL_NAME) \
|
||||
'ORG_BIG_NAME="$(ORG_BIG_NAME)"' ORG_SMALL_NAME=$(ORG_SMALL_NAME) \
|
||||
$(GCS_QMAKE_OPTS)
|
||||
|
||||
.PHONY: openpilotgcs
|
||||
openpilotgcs: uavobjgenerator $(OPENPILOTGCS_MAKEFILE)
|
||||
|
@ -136,6 +136,15 @@ isEmpty(GCS_BIG_NAME) {
|
||||
GCS_BIG_NAME = "$$GCS_BIG_NAME"
|
||||
}
|
||||
|
||||
isEmpty(ORG_SMALL_NAME):ORG_SMALL_NAME = unknown
|
||||
|
||||
isEmpty(ORG_BIG_NAME) {
|
||||
ORG_BIG_NAME = Unknown
|
||||
} else {
|
||||
# Requote for safety and because of QTBUG-46224
|
||||
ORG_BIG_NAME = "$$ORG_BIG_NAME"
|
||||
}
|
||||
|
||||
macx {
|
||||
GCS_APP_TARGET = $$GCS_BIG_NAME
|
||||
GCS_PATH = $$GCS_BUILD_TREE/$${GCS_APP_TARGET}.app/Contents
|
||||
|
@ -22,6 +22,7 @@ LIBS *= -l$$qtLibraryName(ExtensionSystem) -l$$qtLibraryName(Aggregation)
|
||||
|
||||
DEFINES += PLUGIN_REL_PATH=$$shell_quote(\"$$relative_path($$GCS_PLUGIN_PATH, $$GCS_APP_PATH)\")
|
||||
DEFINES += GCS_NAME=$$shell_quote(\"$$GCS_BIG_NAME\")
|
||||
DEFINES += ORG_BIG_NAME=$$shell_quote(\"$$ORG_BIG_NAME\")
|
||||
|
||||
win32 {
|
||||
RC_FILE = librepilotgcs.rc
|
||||
|
@ -112,7 +112,7 @@ const int OptionIndent = 4;
|
||||
const int DescriptionIndent = 24;
|
||||
|
||||
const QLatin1String APP_NAME(GCS_NAME);
|
||||
const QLatin1String ORG_NAME("OpenPilot");
|
||||
const QLatin1String ORG_NAME(ORG_BIG_NAME);
|
||||
|
||||
const QLatin1String CORE_PLUGIN_NAME("Core");
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user