From 6e67a18c26c0bb02a2cd4936c65660b081802087 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Sun, 4 Apr 2021 09:55:59 +0300 Subject: [PATCH] [Build] Make freetype optional --- .../{build-natives-local.sh => build-ft-local.sh} | 0 buildSrc/scripts/{build-natives.sh => build-ft.sh} | 0 ...d-natives-local-no-freetype.sh => build-local.sh} | 0 .../{build-natives-no-freetype.sh => build.sh} | 0 buildSrc/scripts/copy-ft.sh | 12 ++++++++++++ buildSrc/scripts/{copy-natives.sh => copy.sh} | 0 imgui-binding-natives/build.gradle | 6 ++++++ 7 files changed, 18 insertions(+) rename buildSrc/scripts/{build-natives-local.sh => build-ft-local.sh} (100%) rename buildSrc/scripts/{build-natives.sh => build-ft.sh} (100%) rename buildSrc/scripts/{build-natives-local-no-freetype.sh => build-local.sh} (100%) rename buildSrc/scripts/{build-natives-no-freetype.sh => build.sh} (100%) create mode 100644 buildSrc/scripts/copy-ft.sh rename buildSrc/scripts/{copy-natives.sh => copy.sh} (100%) diff --git a/buildSrc/scripts/build-natives-local.sh b/buildSrc/scripts/build-ft-local.sh similarity index 100% rename from buildSrc/scripts/build-natives-local.sh rename to buildSrc/scripts/build-ft-local.sh diff --git a/buildSrc/scripts/build-natives.sh b/buildSrc/scripts/build-ft.sh similarity index 100% rename from buildSrc/scripts/build-natives.sh rename to buildSrc/scripts/build-ft.sh diff --git a/buildSrc/scripts/build-natives-local-no-freetype.sh b/buildSrc/scripts/build-local.sh similarity index 100% rename from buildSrc/scripts/build-natives-local-no-freetype.sh rename to buildSrc/scripts/build-local.sh diff --git a/buildSrc/scripts/build-natives-no-freetype.sh b/buildSrc/scripts/build.sh similarity index 100% rename from buildSrc/scripts/build-natives-no-freetype.sh rename to buildSrc/scripts/build.sh diff --git a/buildSrc/scripts/copy-ft.sh b/buildSrc/scripts/copy-ft.sh new file mode 100644 index 0000000..2aac9bb --- /dev/null +++ b/buildSrc/scripts/copy-ft.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +cd $BASEDIR/../.. || exit + +mkdir ./bin/freetype + +[ -e "/tmp/imgui/libsNative/windows32/imgui-java.dll" ] && cp /tmp/imgui/libsNative/windows32/imgui-java.dll ./bin/freetype +[ -e "/tmp/imgui/libsNative/windows64/imgui-java64.dll" ] && cp /tmp/imgui/libsNative/windows64/imgui-java64.dll ./bin/freetype +[ -e "/tmp/imgui/libsNative/linux32/libimgui-java.so" ] && cp /tmp/imgui/libsNative/linux32/libimgui-java.so ./bin/freetype +[ -e "/tmp/imgui/libsNative/linux64/libimgui-java64.so" ] && cp /tmp/imgui/libsNative/linux64/libimgui-java64.so ./bin/freetype +[ -e "/tmp/imgui/libsNative/macosx64/libimgui-java64.dylib" ] && cp /tmp/imgui/libsNative/macosx64/libimgui-java64.dylib ./bin/freetype diff --git a/buildSrc/scripts/copy-natives.sh b/buildSrc/scripts/copy.sh similarity index 100% rename from buildSrc/scripts/copy-natives.sh rename to buildSrc/scripts/copy.sh diff --git a/imgui-binding-natives/build.gradle b/imgui-binding-natives/build.gradle index f1cee65..304b1e0 100644 --- a/imgui-binding-natives/build.gradle +++ b/imgui-binding-natives/build.gradle @@ -40,6 +40,12 @@ if (System.getProperty('deployWin32')) { libName = 'libimgui-java64.dylib' } +if (System.getProperty('freetype')) { + packageName += 'ft' + packageDesc += 'with Freetype support' + libName = 'freetype/' + libName +} + jar { from('../bin') { include "$libName" // it's ok