Commit f1aa7947 authored by Gus Grubba's avatar Gus Grubba

iOS build

parent 033b9fc8
...@@ -94,7 +94,7 @@ linux { ...@@ -94,7 +94,7 @@ linux {
DEFINES += NO_SERIAL_LINK DEFINES += NO_SERIAL_LINK
DEFINES += QGC_DISABLE_UVC DEFINES += QGC_DISABLE_UVC
DEFINES += QGC_GST_TAISYNC_ENABLED DEFINES += QGC_GST_TAISYNC_ENABLED
QMAKE_IOS_DEPLOYMENT_TARGET = 8.0 QMAKE_IOS_DEPLOYMENT_TARGET = 11.0
QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1,2 # Universal QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1,2 # Universal
QMAKE_LFLAGS += -Wl,-no_pie QMAKE_LFLAGS += -Wl,-no_pie
} else { } else {
......
...@@ -5,7 +5,7 @@ if [ ! -d /Volumes/RAMDisk ] ; then ...@@ -5,7 +5,7 @@ if [ ! -d /Volumes/RAMDisk ] ; then
exit 1 exit 1
fi fi
#-- Set to my local installation #-- Set to my local installation
QMAKE=/Users/gus/Applications/Qt/5.11.2/ios/bin/qmake QMAKE=/Users/gus/Applications/Qt/5.12.2/ios/bin/qmake
#-- Using Travis variables as this will eventually live there #-- Using Travis variables as this will eventually live there
SHADOW_BUILD_DIR=/Volumes/RAMDisk/build-qgroundcontrol-iOS-Release SHADOW_BUILD_DIR=/Volumes/RAMDisk/build-qgroundcontrol-iOS-Release
TRAVIS_BUILD_DIR=/Users/gus/github/work/UpstreamQGC TRAVIS_BUILD_DIR=/Users/gus/github/work/UpstreamQGC
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
<string>Ground Station Location</string> <string>Ground Station Location</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key> <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Ground Station Location</string> <string>Ground Station Location</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Ground Station Location</string>
<key>NSBluetoothPeripheralUsageDescription</key> <key>NSBluetoothPeripheralUsageDescription</key>
<string>QGroundControl would like to use bluetooth.</string> <string>QGroundControl would like to use bluetooth.</string>
<key>UIRequiresFullScreen</key> <key>UIRequiresFullScreen</key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment