rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

LP-1: moved openpilotgcs.pri to gcs.pri

Browse Source 
Change-Id: I8d3f0a6b7420cef2988cb04b526ca81fc66c5d7c
This commit is contained in:
LibrePilot Packager 2015-07-16 21:32:56 +01:00 committed by James Duley
parent c14cacb043
commit 8500c38c3d
12 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/gcs/copydata.pro
View File

@ -1,4 +1,4 @@
include(openpilotgcs.pri) include(gcs.pri)
TEMPLATE = aux TEMPLATE = aux

0
ground/gcs/openpilotgcs.pri → ground/gcs/gcs.pri
View File

2
ground/gcs/gcs.pro
View File

@ -24,7 +24,7 @@ macx {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
} }
include(openpilotgcs.pri) include(gcs.pri)
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered

2
ground/gcs/src/app/app.pro
View File

@ -1,4 +1,4 @@
include(../../openpilotgcs.pri) include(../../gcs.pri)
include(../shared/qtsingleapplication/qtsingleapplication.pri) include(../shared/qtsingleapplication/qtsingleapplication.pri)
TEMPLATE = app TEMPLATE = app

2
ground/gcs/src/app/main.cpp
View File

@ -29,7 +29,7 @@
/* /*
The GCS application name is defined in the top level makefile - GCS_BIG_NAME / GCS_SMALL_NAME, and The GCS application name is defined in the top level makefile - GCS_BIG_NAME / GCS_SMALL_NAME, and
set for the build in ../../openpilotgcs.pri and ./app.pro set for the build in ../../gcs.pri and ./app.pro
The GCS locale is set to the system locale by default unless the "hidden" setting General/Locale has a value. The GCS locale is set to the system locale by default unless the "hidden" setting General/Locale has a value.
The user can not change General/Locale from the Options dialog. The user can not change General/Locale from the Options dialog.

2
ground/gcs/src/openpilotgcslibrary.pri
View File

@ -1,4 +1,4 @@
include(../openpilotgcs.pri) include(../gcs.pri)
win32 { win32 {
DLLDESTDIR = $$GCS_APP_PATH DLLDESTDIR = $$GCS_APP_PATH

2
ground/gcs/src/openpilotgcsplugin.pri
View File

@ -1,4 +1,4 @@
include(../openpilotgcs.pri) include(../gcs.pri)
isEmpty(PROVIDER) { isEmpty(PROVIDER) {
PROVIDER = OpenPilot PROVIDER = OpenPilot

2
ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
View File

@ -2,7 +2,7 @@
error("AeroSimRC plugin is only available for win32 platform") error("AeroSimRC plugin is only available for win32 platform")
} }
include(../../../../../openpilotgcs.pri) include(../../../../../gcs.pri)
QT += network QT += network
QT -= gui QT -= gui

2
ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro
View File

@ -1,4 +1,4 @@
include(../../../../../openpilotgcs.pri) include(../../../../../gcs.pri)
QT += core gui network widgets QT += core gui network widgets

2
ground/gcs/src/share/copydata.pro
View File

@ -1,4 +1,4 @@
include(../../openpilotgcs.pri) include(../../gcs.pri)
TEMPLATE = aux TEMPLATE = aux

2
ground/gcs/src/share/translations/translations.pro
View File

@ -1,4 +1,4 @@
include(../../../openpilotgcs.pri) include(../../../gcs.pri)
# Commented languages with outdated translations # Commented languages with outdated translations
# Allow removing the 'C' language in default config files at first start. # Allow removing the 'C' language in default config files at first start.

2
make/tools.mk
View File

@ -119,7 +119,7 @@ else ifeq ($(UNAME), Windows)
# When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri # When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri
PYTHON_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)/opt/bin PYTHON_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)/opt/bin
NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode
# When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/gcs/openpilotgcs.pri # When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/gcs/gcs.pri
SDL_DIR := $(TOOLS_DIR)/SDL-1.2.15 SDL_DIR := $(TOOLS_DIR)/SDL-1.2.15
OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32 OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32
MESAWIN_DIR := $(TOOLS_DIR)/mesawin MESAWIN_DIR := $(TOOLS_DIR)/mesawin