Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 17:02:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/platform' of https://github.com/amerhifi/hifi into feature/platform

Browse source
This commit is contained in:
amerhifi 2019-05-15 12:01:59 -07:00
commit fa16b66d69
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/settings.gradle
View file

@ -2,8 +2,8 @@
// Libraries // Libraries
// //
//include ':oculus' include ':oculus'
//project(':oculus').projectDir = new File(settingsDir, 'libraries/oculus') project(':oculus').projectDir = new File(settingsDir, 'libraries/oculus')
include ':qt' include ':qt'
project(':qt').projectDir = new File(settingsDir, 'libraries/qt') project(':qt').projectDir = new File(settingsDir, 'libraries/qt')
@ -18,8 +18,8 @@ if (!getSettings().hasProperty("SUPPRESS_INTERFACE")) {
} }
if (!getSettings().hasProperty("SUPPRESS_QUEST_INTERFACE")) { if (!getSettings().hasProperty("SUPPRESS_QUEST_INTERFACE")) {
// include ':questInterface' include ':questInterface'
// project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterface') project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterface')
} }
// //
@ -27,11 +27,11 @@ if (!getSettings().hasProperty("SUPPRESS_QUEST_INTERFACE")) {
// //
if (!getSettings().hasProperty("SUPPRESS_FRAME_PLAYER")) { if (!getSettings().hasProperty("SUPPRESS_FRAME_PLAYER")) {
// include ':framePlayer' include ':framePlayer'
// project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer') project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
} }
if (!getSettings().hasProperty("SUPPRESS_QUEST_FRAME_PLAYER")) { if (!getSettings().hasProperty("SUPPRESS_QUEST_FRAME_PLAYER")) {
//include ':questFramePlayer' include ':questFramePlayer'
// project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer') project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
} }