teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-16 17:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #26 from MaiqLovesHorses/linux-build-improvements

Browse source 
Android SDK path detection improvements
This commit is contained in:
Simon 2022-03-20 09:51:14 +00:00 committed by GitHub
commit e00ae24aff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,5 +1,5 @@
build
android/app/src/main/cpp/code/VrApi/
android/app/src/main/cpp/code/VrApi
*.swp
*tags
*~

9
Makefile.local
View file

@ -4,18 +4,21 @@ ANDROID_NDK_VERSION=21.1.6352462
UNAME := $(shell uname)
ifeq ($(UNAME), Linux)
ANDROID_NDK=/opt/AndroidSDK/ndk/$(ANDROID_NDK_VERSION)
ANDROID_SDK_ROOT?=/opt/AndroidSDK
ANDROID_NDK=$(ANDROID_SDK_ROOT)/ndk/$(ANDROID_NDK_VERSION)
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_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_SDK_ROOT?=$(HOME)/Library/Android/sdk
ANDROID_NDK=$(ANDROID_SDK_ROOT)/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
ANDROID_NDK=C:/Users/simon/AppData/Local/Android/Sdk/ndk/$(ANDROID_NDK_VERSION)
ANDROID_SDK_ROOT?=$(USERPROFILE)/AppData/Local/Android/Sdk
ANDROID_NDK=$(ANDROID_SDK_ROOT)/ndk/$(ANDROID_NDK_VERSION)
ANDROID_CC=$(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe
ANDROID_CFLAGS=--target=aarch64-linux-$(ANDROID_SDK_VERSION)
ANDROID_RANLIB=$(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64/bin/aarch64-linux-android-ranlib.exe