Support OSX build

This commit is contained in:
Bradley Austin Davis 2017-11-21 22:25:29 -08:00 committed by Brad Davis
parent d769acd345
commit 6bdaf638cf
3 changed files with 18 additions and 2 deletions

View file

@ -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
}
}

View file

@ -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)

View file

@ -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', '<file_path>'