From 08125cd1e846d36f21a2f00738fe65508bf8a8a9 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 15 Mar 2023 22:14:21 +0000 Subject: [PATCH] Fix the android code build again. Meh. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4224 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9aa30daf..08026b8d 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ ANDROID_SDK ?= ~/Android/Sdk ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/33.0.1 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-33 ANDROID_NDK ?= $(ANDROID_SDK)/ndk/23.1.7779620 -ANDROID_NDK_API_VERSION := 33 +ANDROID_NDK_API_VERSION := 31 ANDROID_MIN_SDK_VERSION := 26 ANDROID_ARM64_TARGETS := \ @@ -40,6 +40,7 @@ ANDROID_TARGETS := \ debug windebug $(ANDROID_TARGETS): CFLAGS += -Og debug release out/androidrelease/tildefriends out/androidrelease-x86_64/tildefriends: LDFLAGS += -rdynamic $(ANDROID_TARGETS): CFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC +$(ANDROID_TARGETS): LDFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC release winrelease: CFLAGS += -DNDEBUG -O3 windebug winrelease: CC = x86_64-w64-mingw32-gcc-win32 windebug winrelease: AS = $(CC) @@ -348,7 +349,6 @@ windebug winrelease: LDFLAGS += \ -lcrypt32 $(ANDROID_TARGETS): LDFLAGS += \ -target $(ANDROID_NDK_TARGET_TRIPLE)$(ANDROID_NDK_API_VERSION) \ - -fPIC \ -ldl \ -llog \ -lssl \