mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-17 02:52:12 +01:00
Branding, again. Some more of these yet.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@166 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
fdc3fbd8dd
commit
f45670c82e
@ -52,28 +52,28 @@ isEmpty(GCS_BUILD_TREE) {
|
||||
GCS_BUILD_TREE = $$cleanPath($$OUT_PWD)
|
||||
GCS_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
|
||||
}
|
||||
IDE_APP_PATH = $$GCS_BUILD_TREE/bin
|
||||
GCS_APP_PATH = $$GCS_BUILD_TREE/bin
|
||||
macx {
|
||||
IDE_APP_TARGET = "OpenPilot GCS"
|
||||
IDE_LIBRARY_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/PlugIns
|
||||
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
|
||||
IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
|
||||
IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
|
||||
IDE_DOC_PATH = $$IDE_DATA_PATH/doc
|
||||
GCS_APP_TARGET = "OpenPilot GCS"
|
||||
GCS_LIBRARY_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/PlugIns
|
||||
GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH
|
||||
GCS_LIBEXEC_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Resources
|
||||
GCS_DATA_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Resources
|
||||
IDE_DOC_PATH = $$GCS_DATA_PATH/doc
|
||||
contains(QT_CONFIG, ppc):CONFIG += ppc x86
|
||||
copydata = 1
|
||||
} else {
|
||||
win32 {
|
||||
contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
|
||||
IDE_APP_TARGET = openpilotgcs
|
||||
GCS_APP_TARGET = openpilotgcs
|
||||
} else {
|
||||
IDE_APP_WRAPPER = openpilotgcs
|
||||
IDE_APP_TARGET = openpilotgcs.bin
|
||||
GCS_APP_TARGET = openpilotgcs.bin
|
||||
}
|
||||
IDE_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
|
||||
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
|
||||
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
|
||||
IDE_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs
|
||||
GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
|
||||
GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins
|
||||
GCS_LIBEXEC_PATH = $$GCS_APP_PATH # FIXME
|
||||
GCS_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs
|
||||
IDE_DOC_PATH = $$GCS_BUILD_TREE/share/doc/openpilotgcs
|
||||
!isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
|
||||
}
|
||||
@ -84,7 +84,7 @@ INCLUDEPATH += \
|
||||
DEPENDPATH += \
|
||||
$$GCS_SOURCE_TREE/src/libs
|
||||
|
||||
LIBS += -L$$IDE_LIBRARY_PATH
|
||||
LIBS += -L$$GCS_LIBRARY_PATH
|
||||
|
||||
# DEFINES += QT_NO_CAST_FROM_ASCII
|
||||
DEFINES += QT_NO_CAST_TO_ASCII
|
||||
|
@ -14,7 +14,7 @@ LRELEASE = $$targetPath($$[QT_INSTALL_BINS]/lrelease)
|
||||
|
||||
TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/openpilotgcs_,.ts)
|
||||
|
||||
MIME_TR_H = $$IDE_DATA_PATH/translations/mime_tr.h
|
||||
MIME_TR_H = $$GCS_DATA_PATH/translations/mime_tr.h
|
||||
|
||||
contains(QT_VERSION, ^4\.[0-5]\..*) {
|
||||
ts.commands = @echo This Qt version is too old for the ts target. Need Qt 4.6+.
|
||||
@ -36,7 +36,7 @@ QT =
|
||||
LIBS =
|
||||
|
||||
updateqm.input = TRANSLATIONS
|
||||
updateqm.output = $$IDE_DATA_PATH/translations/${QMAKE_FILE_BASE}.qm
|
||||
updateqm.output = $$GCS_DATA_PATH/translations/${QMAKE_FILE_BASE}.qm
|
||||
isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS
|
||||
updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
|
||||
updateqm.name = LRELEASE ${QMAKE_FILE_IN}
|
||||
|
@ -2,8 +2,8 @@ include(../../openpilotgcs.pri)
|
||||
include(../shared/qtsingleapplication/qtsingleapplication.pri)
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = $$IDE_APP_TARGET
|
||||
DESTDIR = $$IDE_APP_PATH
|
||||
TARGET = $$GCS_APP_TARGET
|
||||
DESTDIR = $$GCS_APP_PATH
|
||||
|
||||
SOURCES += main.cpp
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
include(../openpilotgcs.pri)
|
||||
|
||||
win32 {
|
||||
DLLDESTDIR = $$IDE_APP_PATH
|
||||
DLLDESTDIR = $$GCS_APP_PATH
|
||||
}
|
||||
|
||||
DESTDIR = $$IDE_LIBRARY_PATH
|
||||
DESTDIR = $$GCS_LIBRARY_PATH
|
||||
|
||||
include(rpath.pri)
|
||||
|
||||
|
@ -4,7 +4,7 @@ isEmpty(PROVIDER) {
|
||||
PROVIDER = OpenPilot
|
||||
}
|
||||
|
||||
DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER
|
||||
DESTDIR = $$GCS_PLUGIN_PATH/$$PROVIDER
|
||||
LIBS += -L$$DESTDIR
|
||||
INCLUDEPATH += $$GCS_SOURCE_TREE/src/plugins
|
||||
DEPENDPATH += $$GCS_SOURCE_TREE/src/plugins
|
||||
|
Loading…
x
Reference in New Issue
Block a user