lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tup: autodetect host tag;

This commit is contained in:
bjorn 2021-02-28 16:05:28 -07:00
parent f3a12f2af9
commit 9a55769348
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tuprules.tup
View File

@ -96,7 +96,17 @@ ifeq ($(PLATFORM),android)
PREFIX = apk/lib/arm64-v8a/lib
LIB = bin/apk/lib/arm64-v8a
CC = @(ANDROID_NDK)/toolchains/llvm/prebuilt/@(ANDROID_HOST_TAG)/bin/clang
ifeq (@(TUP_PLATFORM),win32)
HOST = windows-x86_64
endif
ifeq (@(TUP_PLATFORM),macosx)
HOST = darwin-x86_64
endif
ifeq (@(TUP_PLATFORM),linux)
HOST = linux-x86_64
endif
CC = @(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)/bin/clang
CFLAGS += -DLOVR_GLES
CFLAGS += -I@(ANDROID_NDK)/sources/android/native_app_glue
FLAGS += --target=aarch64-linux-android@(ANDROID_VERSION)

2
tup.config.default
View File

@ -63,7 +63,6 @@ CONFIG_LUAJIT=y
# ANDROID_NDK: The path to the Android NDK
# ANDROID_VERSION: The Android version to build against (usually 21 or 26)
# ANDROID_BUILD_TOOLS_VERSION: The version of the Android build tools to use (in build-tools folder)
# ANDROID_HOST_TAG: The host machine tag (e.g. windows-x86_64, darwin-x86_64)
# ANDROID_KEYSTORE: The path to the keystore (use keytool to generate)
# ANDROID_KEYSTORE_PASS: The keystore password (use either pass:<string>, env:<var>, or file:<path>)
# ANDROID_MANIFEST: Optional path to a custom Android manifest file (xml)
@ -73,7 +72,6 @@ CONFIG_ANDROID_SDK=
CONFIG_ANDROID_NDK=
CONFIG_ANDROID_VERSION=
CONFIG_ANDROID_BUILD_TOOLS_VERSION=
CONFIG_ANDROID_HOST_TAG=
CONFIG_ANDROID_KEYSTORE=
CONFIG_ANDROID_KEYSTORE_PASS=
CONFIG_ANDROID_MANIFEST=