From a810b5020cea6d14074c32da796ee7659c156445 Mon Sep 17 00:00:00 2001 From: Tom Wojciechowski Date: Sun, 14 Jul 2024 18:19:44 +0100 Subject: [PATCH] libraries support, addresses #71 --- .../badlogic/gdx/jnigen/build/toolchains/AndroidToolchain.java | 1 + .../badlogic/gdx/jnigen/resources/scripts/Android.mk.template | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gdx-jnigen/src/main/java/com/badlogic/gdx/jnigen/build/toolchains/AndroidToolchain.java b/gdx-jnigen/src/main/java/com/badlogic/gdx/jnigen/build/toolchains/AndroidToolchain.java index 83f448d0..1e4195c9 100644 --- a/gdx-jnigen/src/main/java/com/badlogic/gdx/jnigen/build/toolchains/AndroidToolchain.java +++ b/gdx-jnigen/src/main/java/com/badlogic/gdx/jnigen/build/toolchains/AndroidToolchain.java @@ -94,6 +94,7 @@ public void compile () { template = template.replace("%cFlags%", target.cFlags); template = template.replace("%cppFlags%", target.cppFlags); template = template.replace("%linkerFlags%", target.linkerFlags); + template = template.replace("%libraries%", target.libraries); template = template.replace("%srcFiles%", srcFiles); for (String extra : target.androidAndroidMk) template += "\n" + extra; diff --git a/gdx-jnigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/Android.mk.template b/gdx-jnigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/Android.mk.template index 820067b4..80558b22 100644 --- a/gdx-jnigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/Android.mk.template +++ b/gdx-jnigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/Android.mk.template @@ -6,7 +6,8 @@ LOCAL_C_INCLUDES := %headerDirs% LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) %cFlags% LOCAL_CPPFLAGS := $(LOCAL_C_INCLUDES:%=-I%) %cppFlags% -LOCAL_LDLIBS := %linkerFlags% +LOCAL_LDFLAGS := %linkerFlags% +LOCAL_LDLIBS := %libraries% LOCAL_ARM_MODE := arm LOCAL_SRC_FILES := %srcFiles%