From 6bdaf638cfd24fb1990d273061140c27bb905dcf Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Tue, 21 Nov 2017 22:25:29 -0800 Subject: [PATCH] Support OSX build --- android/app/build.gradle | 2 +- android/setupQt.gradle | 6 ++++++ android/setupScribe.gradle | 12 +++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 30b0bf78b4..18eb91bceb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -17,7 +17,7 @@ android { '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared', '-DQT_CMAKE_PREFIX_PATH=' + HIFI_ANDROID_PRECOMPILED + '/qt/lib/cmake', - '-DNATIVE_SCRIBE=' + HIFI_ANDROID_PRECOMPILED + '/scribe_linux_x86_64', + '-DNATIVE_SCRIBE=' + HIFI_ANDROID_PRECOMPILED + '/scribe', '-DHIFI_ANDROID_PRECOMPILED=' + HIFI_ANDROID_PRECOMPILED } } diff --git a/android/setupQt.gradle b/android/setupQt.gradle index 84e4715ce8..6c4ce8ab6c 100644 --- a/android/setupQt.gradle +++ b/android/setupQt.gradle @@ -9,7 +9,13 @@ buildscript { } } + +import org.apache.tools.ant.taskdefs.condition.Os + def file='qt-5.9.2_armv8-libcpp.tgz' +if (Os.isFamily(Os.FAMILY_MAC)) { + file = 'qt-5.9.2_osx_armv8-libcpp.tgz' +} def url='https://s3.amazonaws.com/Oculus/Android/' + file def destFile = new File(HIFI_ANDROID_PRECOMPILED, file) diff --git a/android/setupScribe.gradle b/android/setupScribe.gradle index 40ffff5ceb..7456e5eca1 100644 --- a/android/setupScribe.gradle +++ b/android/setupScribe.gradle @@ -9,9 +9,19 @@ buildscript { } } +import org.apache.tools.ant.taskdefs.condition.Os + def file='scribe_linux_x86_64' +if (Os.isFamily(Os.FAMILY_MAC)) { + file = 'scribe_osx_x86_64' +} +def localFile='scribe' +if (Os.isFamily(Os.FAMILY_WINDOWS)) { + file = 'scribe.exe' +} + def url='https://s3.amazonaws.com/Oculus/Android/' + file -def destFile = new File(HIFI_ANDROID_PRECOMPILED, file) +def destFile = new File(HIFI_ANDROID_PRECOMPILED, localFile) task filepermission(type: Exec) { commandLine 'chmod', '700', ''