This commit is contained in:
Simon 2022-03-18 22:30:03 +00:00
commit dd3d95fb0d
2 changed files with 12 additions and 1 deletions

View file

@ -8,12 +8,19 @@ ifeq ($(UNAME), Linux)
ANDROID_CC=$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-$(ANDROID_SDK_VERSION)-clang ANDROID_CC=$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-$(ANDROID_SDK_VERSION)-clang
ANDROID_CFLAGS=--target=aarch64-linux-$(ANDROID_SDK_VERSION) ANDROID_CFLAGS=--target=aarch64-linux-$(ANDROID_SDK_VERSION)
ANDROID_RANLIB=$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ranlib ANDROID_RANLIB=$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ranlib
else
ifeq ($(UNAME), Darwin)
ANDROID_NDK=~/Library/Android/sdk/ndk/$(ANDROID_NDK_VERSION)
ANDROID_CC=$(ANDROID_NDK)/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-$(ANDROID_SDK_VERSION)-clang
ANDROID_CFLAGS=--target=aarch64-linux-$(ANDROID_SDK_VERSION)
ANDROID_RANLIB=$(ANDROID_NDK)/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-ranlib
else else
ANDROID_NDK=C:/Users/simon/AppData/Local/Android/Sdk/ndk/$(ANDROID_NDK_VERSION) ANDROID_NDK=C:/Users/simon/AppData/Local/Android/Sdk/ndk/$(ANDROID_NDK_VERSION)
ANDROID_CC=$(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe ANDROID_CC=$(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe
ANDROID_CFLAGS=--target=aarch64-linux-$(ANDROID_SDK_VERSION) ANDROID_CFLAGS=--target=aarch64-linux-$(ANDROID_SDK_VERSION)
ANDROID_RANLIB=$(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64/bin/aarch64-linux-android-ranlib.exe ANDROID_RANLIB=$(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64/bin/aarch64-linux-android-ranlib.exe
endif endif
endif
BUILD_CLIENT=1 BUILD_CLIENT=1
BUILD_CLIENT_SMP=0 BUILD_CLIENT_SMP=0
BUILD_GAME_QVM=0 BUILD_GAME_QVM=0

View file

@ -10,7 +10,7 @@ NOTE: Hand tracking is enabled, but this has been done because I got too annoyed
### Prerequisites ### Prerequisites
1. Install your copy of Quake III Arena from Steam. 1. Install your copy of Quake III Arena from Steam.
2. Android Studio with NDK version 21.1.6352462. 2. Android Studio with NDK version 21.1.6352462.
3. Copy the Oculus VR SDK from https://developer.oculus.com/downloads/package/oculus-mobile-sdk/ and extract the VrApi folder to ./code/VrApi/ 3. Copy the Oculus VR SDK from https://developer.oculus.com/downloads/package/oculus-mobile-sdk/ and extract the VrApi folder to ./android/app/src/main/cpp/code/VrApi/
### Building and running the build ### Building and running the build
The scripts assume that you installed everything in the default locations. In case you want to deviate from that, the paths are in ./android/run.(sh|bat) and in Makefile.local. The scripts assume that you installed everything in the default locations. In case you want to deviate from that, the paths are in ./android/run.(sh|bat) and in Makefile.local.
@ -19,6 +19,10 @@ The scripts assume that you installed everything in the default locations. In ca
1. Update ANDROID_NDK path in Makefile.local 1. Update ANDROID_NDK path in Makefile.local
2. Run ./android/run.sh 2. Run ./android/run.sh
#### MacOS
1. If you are not using the default Android Studio installation paths (~/Library/Android/sdk/ndk), update ANDROID_NDK path in Makefile.local
2. Run ./android/run.sh
#### Windows #### Windows
1. Replace \<username\> with your windows username folder as it appears in C:\Users. 1. Replace \<username\> with your windows username folder as it appears in C:\Users.
2. Open git bash and run ./android/run.bat. 2. Open git bash and run ./android/run.bat.