From c55a1385f2afe584c5798c49ca39c143a6bb83a7 Mon Sep 17 00:00:00 2001 From: Stefano D'Angelo Date: Thu, 12 Dec 2024 07:39:25 +0100 Subject: [PATCH] updated makefiles, updated android versions (ios untested) --- templates/android-make/Makefile | 48 ++++++++++++++++++++---------- templates/android-make/vars.mk | 36 ++++++---------------- templates/daisy-seed-make/Makefile | 15 +++++++--- templates/daisy-seed-make/vars.mk | 18 +++++------ templates/ios-make/Makefile | 17 +++++++---- templates/ios-make/vars.mk | 13 +++++--- templates/web-demo/rules-extra.mk | 2 +- templates/web-make/Makefile | 31 +++++++++++-------- templates/web-make/vars.mk | 16 +++++----- test/android-make.json | 21 ------------- test/daisy-seed-make.json | 5 ---- test/lv2-make.json | 6 ---- test/run.sh | 8 ++--- test/vars-pre.mk | 24 +++++++++++++++ 14 files changed, 137 insertions(+), 123 deletions(-) delete mode 100644 test/android-make.json delete mode 100644 test/daisy-seed-make.json delete mode 100644 test/lv2-make.json diff --git a/templates/android-make/Makefile b/templates/android-make/Makefile index a0443ca..d1f8d2c 100644 --- a/templates/android-make/Makefile +++ b/templates/android-make/Makefile @@ -18,23 +18,43 @@ # File author: Stefano D'Angelo # +TEMPLATE := android + include vars.mk +COMMON_DIR ?= . +DATA_DIR ?= . +PLUGIN_DIR ?= src +MKINC_DIR ?= $(COMMON_DIR) + +include $(MKINC_DIR)/vars-pre.mk + ifeq ($(HAS_MIDI_IN), yes) -MIN_API := 29 + MIN_API := 29 else -MIN_API := 26 + MIN_API := 26 endif -CC := $(ANDROID_NDK_DIR)/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi$(MIN_API)-clang -CXX := $(ANDROID_NDK_DIR)/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi$(MIN_API)-clang++ +NDK_DIR := $(SDK_DIR)/ndk/$(NDK_VERSION) +BUILD_TOOLS_DIR := $(SDK_DIR)/build-tools/$(BUILD_TOOLS_VERSION) + +ANDROID_JAR_FILE := $(SDK_DIR)/platforms/android-$(ANDROID_VERSION)/android.jar +ANDROIDX_CORE_FILE := $(ANDROIDX_DIR)/core-$(ANDROIDX_CORE_VERSION).jar +ANDROIDX_LIFECYCLE_COMMON_FILE := $(ANDROIDX_DIR)/lifecycle-common-$(ANDROIDX_LIFECYCLE_COMMON_VERSION).jar +ANDROIDX_VERSIONEDPARCELABLE_FILE := $(ANDROIDX_DIR)/versionedparcelable-$(ANDROIDX_VERSIONEDPARCELABLE_VERSION).jar +KOTLIN_STDLIB_FILE := $(KOTLIN_DIR)/kotlin-stdlib-$(KOTLIN_STDLIB_VERSION).jar +KOTLINX_COROUTINES_CORE_FILE := $(KOTLIN_DIR)/kotlinx-coroutines-core-$(KOTLINX_COROUTINES_CORE_VERSION).jar +KOTLINX_COROUTINES_CORE_JVM_FILE := $(KOTLIN_DIR)/kotlinx-coroutines-core-jvm-$(KOTLINX_COROUTINES_CORE_JVM_VERSION).jar + +CC := $(NDK_DIR)/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi$(MIN_API)-clang +CXX := $(NDK_DIR)/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi$(MIN_API)-clang++ JC := javac APKSIGNER := $(BUILD_TOOLS_DIR)/apksigner ZIPALIGN := $(BUILD_TOOLS_DIR)/zipalign AAPT := $(BUILD_TOOLS_DIR)/aapt D8 := $(BUILD_TOOLS_DIR)/d8 -ADB := $(ANDROID_SDK_DIR)/platform-tools/adb +ADB := $(SDK_DIR)/platform-tools/adb JARS := \ $(ANDROID_JAR_FILE) \ @@ -54,25 +74,21 @@ ifeq ($(HAS_MIDI_IN), yes) CLASSES += MainActivity$$WebAppInterface$$MidiDeviceCallback MainActivity$$WebAppInterface$$1 endif -COMMON_DIR := $(or $(COMMON_DIR),.) -DATA_DIR := $(or $(DATA_DIR),.) -PLUGIN_DIR := $(or $(PLUGIN_DIR),src) - CFLAGS := -O3 -Wall -Wpedantic -Wextra -CFLAGS_ALL := -I$(DATA_DIR)/src -I$(PLUGIN_DIR) -fPIC $(CFLAGS) $(CFLAGS_EXTRA) +CFLAGS_ALL := -I$(DATA_DIR)/src -I$(PLUGIN_DIR) -fPIC $(CFLAGS_EXTRA) $(CFLAGS) CXXFLAGS := $(CFLAGS) -CXXFLAGS_ALL := -I$(DATA_DIR)/src -I$(PLUGIN_DIR) -fPIC -std=c++11 $(CXXFLAGS) $(CXXFLAGS_EXTRA) +CXXFLAGS_ALL := -I$(DATA_DIR)/src -I$(PLUGIN_DIR) -fPIC -std=c++11 $(CXXFLAGS_EXTRA) $(CXXFLAGS) LDFLAGS := LDFLAGS_ALL := -shared -static-libstdc++ -landroid ifeq ($(HAS_MIDI_IN), yes) LDFLAGS += -lamidi endif -LDFLAGS_ALL += $(LDFLAGS) $(LDFLAGS_EXTRA) +LDFLAGS_ALL += $(LDFLAGS_EXTRA) $(LDFLAGS) JFLAGS := -JFLAGS_ALL := $(JFLAGS) $(JFLAGS_EXTRA) +JFLAGS_ALL := $(JFLAGS_EXTRA) $(JFLAGS) C_SRCS := $(C_SRCS_EXTRA) C_OBJS := $(addprefix build/obj/, $(notdir $(C_SRCS:.c=.o))) @@ -82,7 +98,7 @@ CXX_OBJS := $(addprefix build/obj/, $(notdir $(CXX_SRCS:.cpp=.o))) ALL := build/$(BUNDLE_NAME).apk --include $(COMMON_DIR)/vars-extra.mk +-include $(MKINC_DIR)/vars-extra.mk all: $(ALL) @@ -121,7 +137,7 @@ install: build/$(BUNDLE_NAME).apk [ -n "`$(ADB) shell pm list packages | grep ^package:$(JAVA_PACKAGE_NAME)`" ] && $(ADB) uninstall $(JAVA_PACKAGE_NAME); exit 0 $(ADB) install $^ --include $(COMMON_DIR)/rules-extra.mk +-include $(MKINC_DIR)/rules-extra.mk .PHONY: all clean install @@ -135,4 +151,4 @@ $(C_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).c,$$ $(CXX_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).cpp,$$(CXX_SRCS)) | build/obj $(CXX) $^ -o $@ -c $(CXXFLAGS_ALL) --include $(COMMON_DIR)/rules-secondexp-extra.mk +-include $(MKINC_DIR)/rules-secondexp-extra.mk diff --git a/templates/android-make/vars.mk b/templates/android-make/vars.mk index 7a4a7e6..29f485a 100644 --- a/templates/android-make/vars.mk +++ b/templates/android-make/vars.mk @@ -21,35 +21,17 @@ BUNDLE_NAME := {{=it.product.bundleName}} JAVA_PACKAGE_NAME := {{=it.android.javaPackageName}} -CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.android_make?.cflags ?? ""}} -CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.android_make?.cxxflags ?? ""}} -JFLAGS_EXTRA := {{=it.make?.jflags ?? ""}} {{=it.android_make?.jflags ?? ""}} -LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.android_make?.ldflags ?? ""}} - -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.android_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.android_make?.cxxSrcs ?? ""}} - +{{?(it.android_make?.commonDir || it.make?.commonDir)}} COMMON_DIR := {{=it.android_make?.commonDir ?? (it.make?.commonDir ?? "")}} +{{?}} +{{?(it.android_make?.dataDir || it.make?.dataDir)}} DATA_DIR := {{=it.android_make?.dataDir ?? (it.make?.dataDir ?? "")}} +{{?}} +{{?(it.android_make?.pluginDir || it.make?.pluginDir)}} PLUGIN_DIR := {{=it.android_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} - -KEY_STORE := {{=it.android_make.keyStore}} -KEY_ALIAS := {{=it.android_make.keyAlias}} -STORE_PASS := {{=it.android_make.storePass}} -KEY_PASS := {{=it.android_make.keyPass}} - -ANDROID_SDK_DIR := {{=it.android_make.sdkDir}} -ANDROID_NDK_DIR := ${ANDROID_SDK_DIR}/ndk/{{=it.android_make.ndkVersion}} -BUILD_TOOLS_DIR := ${ANDROID_SDK_DIR}/build-tools/{{=it.android_make.buildToolsVersion}} -ANDROIDX_DIR := {{=it.android_make.androidxDir}} -KOTLIN_DIR := {{=it.android_make.kotlinDir}} - -ANDROID_JAR_FILE := ${ANDROID_SDK_DIR}/platforms/android-{{=it.android_make.androidVersion}}/android.jar -ANDROIDX_CORE_FILE := ${ANDROIDX_DIR}/core-{{=it.android_make.androidxCoreVersion}}.jar -ANDROIDX_LIFECYCLE_COMMON_FILE := ${ANDROIDX_DIR}/lifecycle-common-{{=it.android_make.androidxLifecycleCommonVersion}}.jar -ANDROIDX_VERSIONEDPARCELABLE_FILE := ${ANDROIDX_DIR}/versionedparcelable-{{=it.android_make.androidxVersionedparcelableVersion}}.jar -KOTLIN_STDLIB_FILE := ${KOTLIN_DIR}/kotlin-stdlib-{{=it.android_make.kotlinStdlibVersion}}.jar -KOTLINX_COROUTINES_CORE_FILE := ${KOTLIN_DIR}/kotlinx-coroutines-core-{{=it.android_make.kotlinxCoroutinesCoreVersion}}.jar -KOTLINX_COROUTINES_CORE_JVM_FILE := ${KOTLIN_DIR}/kotlinx-coroutines-core-jvm-{{=it.android_make.kotlinxCoroutinesCoreJVMVersion}}.jar +{{?}} +{{?(it.android_make?.mkincDir || it.make?.mkincDir)}} +MKINC_DIR := {{=it.android_make?.mkincDir ?? (it.make?.mkincDir ?? "")}} +{{?}} HAS_MIDI_IN := {{=it.product.buses.filter(x => x.type == "midi" && x.direction == "input").length > 0 ? "yes" : "no"}} diff --git a/templates/daisy-seed-make/Makefile b/templates/daisy-seed-make/Makefile index d901154..724575d 100644 --- a/templates/daisy-seed-make/Makefile +++ b/templates/daisy-seed-make/Makefile @@ -18,13 +18,20 @@ # File author: Stefano D'Angelo # +TEMPLATE := daisy-seed + include vars.mk -TARGET := $(BUNDLE_NAME) +COMMON_DIR ?= . +DATA_DIR ?= . +PLUGIN_DIR ?= src +MKINC_DIR ?= $(COMMON_DIR) -COMMON_DIR := $(or $(COMMON_DIR),.) -DATA_DIR := $(or $(DATA_DIR),.) -PLUGIN_DIR := $(or $(PLUGIN_DIR),src) +-include $(MKINC_DIR)/vars-pre.mk + +LIBDAISY_DIR ?= ../libDaisy + +TARGET := $(BUNDLE_NAME) CPP_SOURCES := $(COMMON_DIR)/src/main.cpp $(CXX_SRCS_EXTRA) diff --git a/templates/daisy-seed-make/vars.mk b/templates/daisy-seed-make/vars.mk index 337404e..4aba660 100644 --- a/templates/daisy-seed-make/vars.mk +++ b/templates/daisy-seed-make/vars.mk @@ -20,15 +20,15 @@ BUNDLE_NAME := {{=it.product.bundleName}} -CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.daisy_seed_make?.cflags ?? ""}} -CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.daisy_seed_make?.cxxflags ?? ""}} -LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.daisy_seed_make?.ldflags ?? ""}} - -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.daisy_seed_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.daisy_seed_make?.cxxSrcs ?? ""}} - +{{?(it.daisy_seed_make?.commonDir || it.make?.commonDir)}} COMMON_DIR := {{=it.daisy_seed_make?.commonDir ?? (it.make?.commonDir ?? "")}} +{{?}} +{{?(it.daisy_seed_make?.dataDir || it.make?.dataDir)}} DATA_DIR := {{=it.daisy_seed_make?.dataDir ?? (it.make?.dataDir ?? "")}} +{{?}} +{{?(it.daisy_seed_make?.pluginDir || it.make?.pluginDir)}} PLUGIN_DIR := {{=it.daisy_seed_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} - -LIBDAISY_DIR := {{=it.daisy_seed_make.libdaisyDir}} +{{?}} +{{?(it.daisy_seed_make?.mkincDir || it.make?.mkincDir)}} +MKINC_DIR := {{=it.daisy_seed_make?.mkincDir ?? (it.make?.mkincDir ?? "")}} +{{?}} diff --git a/templates/ios-make/Makefile b/templates/ios-make/Makefile index 4d84418..87356bb 100644 --- a/templates/ios-make/Makefile +++ b/templates/ios-make/Makefile @@ -18,11 +18,16 @@ # File author: Stefano D'Angelo # +TEMPLATE := ios + include vars.mk -COMMON_DIR := $(or $(COMMON_DIR),.) -DATA_DIR := $(or $(DATA_DIR),.) -PLUGIN_DIR := $(or $(PLUGIN_DIR),src) +COMMON_DIR ?= . +DATA_DIR ?= . +PLUGIN_DIR ?= src +MKINC_DIR ?= $(COMMON_DIR) + +-include $(MKINC_DIR)/vars-pre.mk SOURCES := \ $(DATA_DIR)/src/data.h \ @@ -38,7 +43,7 @@ SOURCES_OUT := $(addprefix build/gen/src/, $(notdir $(SOURCES))) ALL = build/gen/$(BUNDLE_NAME).xcodeproj --include $(COMMON_DIR)/vars-extra.mk +-include $(MKINC_DIR)/vars-extra.mk all: $(ALL) @@ -51,7 +56,7 @@ build/gen/src: clean: rm -fr build --include $(COMMON_DIR)/rules-extra.mk +-include $(MKINC_DIR)/rules-extra.mk .PHONY: all clean @@ -62,4 +67,4 @@ PERCENT := % $(SOURCES_OUT): build/gen/src/%: $$(filter $$(PERCENT)/%,$$(SOURCES)) | build/gen/src cp -R $^ $@ --include $(COMMON_DIR)/rules-secondexp-extra.mk +-include $(MKINC_DIR)/rules-secondexp-extra.mk diff --git a/templates/ios-make/vars.mk b/templates/ios-make/vars.mk index 78fd5d0..7a79490 100644 --- a/templates/ios-make/vars.mk +++ b/templates/ios-make/vars.mk @@ -20,10 +20,15 @@ BUNDLE_NAME := {{=it.product.bundleName}} -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.cmd_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.cmd_make?.cxxSrcs ?? ""}} -SRCS_EXTRA := {{=it.ios_make?.srcsExtra ?? ""}} - +{{?(it.ios_make?.commonDir || it.make?.commonDir)}} COMMON_DIR := {{=it.ios_make?.commonDir ?? (it.make?.commonDir ?? "")}} +{{?}} +{{?(it.ios_make?.dataDir || it.make?.dataDir)}} DATA_DIR := {{=it.ios_make?.dataDir ?? (it.make?.dataDir ?? "")}} +{{?}} +{{?(it.ios_make?.pluginDir || it.make?.pluginDir)}} PLUGIN_DIR := {{=it.ios_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} +{{?}} +{{?(it.ios_make?.mkincDir || it.make?.mkincDir)}} +MKINC_DIR := {{=it.ios_make?.mkincDir ?? (it.make?.mkincDir ?? "")}} +{{?}} diff --git a/templates/web-demo/rules-extra.mk b/templates/web-demo/rules-extra.mk index 0232124..531a10a 100644 --- a/templates/web-demo/rules-extra.mk +++ b/templates/web-demo/rules-extra.mk @@ -18,7 +18,7 @@ # File author: Stefano D'Angelo # -build/web/index.html: ${DATA_DIR}/src/index.html | build/web +build/web/index.html: $(DATA_DIR)/src/index.html | build/web cp $^ $@ build/web/key.pem: build/web/cert.pem diff --git a/templates/web-make/Makefile b/templates/web-make/Makefile index c93867f..91f894d 100644 --- a/templates/web-make/Makefile +++ b/templates/web-make/Makefile @@ -18,17 +18,22 @@ # File author: Stefano D'Angelo # +TEMPLATE := web + include vars.mk -COMMON_DIR := $(or $(COMMON_DIR),.) -DATA_DIR := $(or $(DATA_DIR),.) -PLUGIN_DIR := $(or $(PLUGIN_DIR),src) +COMMON_DIR ?= . +DATA_DIR ?= . +PLUGIN_DIR ?= src +MKINC_DIR ?= $(COMMON_DIR) + +-include $(MKINC_DIR)/vars-pre.mk CC := clang CXX := clang++ CFLAGS := -Ofast -Wall -Wpedantic -Wextra -CFLAGS_ALL := -I$(COMMON_DIR)/src -I$(DATA_DIR)/src -I$(PLUGIN_DIR) --target=wasm32 -flto -fvisibility=hidden $(CFLAGS) $(CFLAGS_EXTRA) +CFLAGS_ALL := -I$(COMMON_DIR)/src -I$(DATA_DIR)/src -I$(PLUGIN_DIR) --target=wasm32 -flto -fvisibility=hidden $(CFLAGS_EXTRA) $(CFLAGS) LDFLAGS_ALL := \ -Wl,--allow-undefined \ @@ -56,25 +61,25 @@ LDFLAGS_ALL := \ ifeq ($(HAS_MIDI_IN), yes) LDFLAGS_ALL := $(LDFLAGS_ALL) -Wl,--export=processor_midi_msg_in endif -LDFLAGS_ALL := $(LDFLAGS_ALL) $(LDFLAGS) $(LDFLAGS_EXTRA) +LDFLAGS_ALL := $(LDFLAGS_ALL) $(LDFLAGS_EXTRA) $(LDFLAGS) CXXFLAGS := $(CFLAGS) -CXXFLAGS_ALL := -I$(COMMON_DIR)/src -I$(DATA_DIR)/src -I$(PLUGIN_DIR) --target=wasm32 -flto -fvisibility=hidden $(CXXFLAGS) $(CXXFLAGS_EXTRA) +CXXFLAGS_ALL := -I$(COMMON_DIR)/src -I$(DATA_DIR)/src -I$(PLUGIN_DIR) --target=wasm32 -flto -fvisibility=hidden $(CXXFLAGS_EXTRA) $(CXXFLAGS) C_SRCS := $(COMMON_DIR)/src/processor.c $(COMMON_DIR)/src/walloc.c $(COMMON_DIR)/src/string.c C_OBJS := $(addprefix build/obj/, $(notdir $(C_SRCS:.c=.o))) ifeq ($(CXX_SRCS_EXTRA),) -CXX_SRCS := -CXX_OBJS := + CXX_SRCS := + CXX_OBJS := else -CXX_SRCS := $(COMMON_DIR)/src/new.cpp $(CXX_SRCS_EXTRA) -CXX_OBJS := $(addprefix build/obj/, $(notdir $(CXX_SRCS:.cpp=.o))) + CXX_SRCS := $(COMMON_DIR)/src/new.cpp $(CXX_SRCS_EXTRA) + CXX_OBJS := $(addprefix build/obj/, $(notdir $(CXX_SRCS:.cpp=.o))) endif ALL := build/web/$(BUNDLE_NAME)/module.wasm build/web/$(BUNDLE_NAME)/processor.js build/web/$(BUNDLE_NAME)/module.js --include $(COMMON_DIR)/vars-extra.mk +-include $(MKINC_DIR)/vars-extra.mk all: $(ALL) @@ -98,7 +103,7 @@ build/obj build/web build/web/$(BUNDLE_NAME): clean: rm -fr build --include $(COMMON_DIR)/rules-extra.mk +-include $(MKINC_DIR)/rules-extra.mk .PHONY: all clean @@ -112,4 +117,4 @@ $(C_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).c,$$ $(CXX_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).cpp,$$(CXX_SRCS)) | build/obj $(CXX) $^ -o $@ -c $(CXXFLAGS_ALL) --include $(COMMON_DIR)/rules-secondexp-extra.mk +-include $(MKINC_DIR)/rules-secondexp-extra.mk diff --git a/templates/web-make/vars.mk b/templates/web-make/vars.mk index a80d740..1ef8a73 100644 --- a/templates/web-make/vars.mk +++ b/templates/web-make/vars.mk @@ -20,15 +20,17 @@ BUNDLE_NAME := {{=it.product.bundleName}} -CFLAGS_EXTRA := {{=it.make?.cflags ?? ""}} {{=it.web_make?.cflags ?? ""}} -CXXFLAGS_EXTRA := {{=it.make?.cxxflags ?? ""}} {{=it.web_make?.cxxflags ?? ""}} -LDFLAGS_EXTRA := {{=it.make?.ldflags ?? ""}} {{=it.web_make?.ldflags ?? ""}} - -C_SRCS_EXTRA := {{=it.make?.cSrcs ?? ""}} {{=it.web_make?.cSrcs ?? ""}} -CXX_SRCS_EXTRA := {{=it.make?.cxxSrcs ?? ""}} {{=it.web_make?.cxxSrcs ?? ""}} - +{{?(it.web_make?.commonDir || it.make?.commonDir)}} COMMON_DIR := {{=it.web_make?.commonDir ?? (it.make?.commonDir ?? "")}} +{{?}} +{{?(it.web_make?.dataDir || it.make?.dataDir)}} DATA_DIR := {{=it.web_make?.dataDir ?? (it.make?.dataDir ?? "")}} +{{?}} +{{?(it.web_make?.pluginDir || it.make?.pluginDir)}} PLUGIN_DIR := {{=it.web_make?.pluginDir ?? (it.make?.pluginDir ?? "")}} +{{?}} +{{?(it.web_make?.mkincDir || it.make?.mkincDir)}} +MKINC_DIR := {{=it.web_make?.mkincDir ?? (it.make?.mkincDir ?? "")}} +{{?}} HAS_MIDI_IN := {{=it.product.buses.filter(x => x.type == "midi" && x.direction == "input").length > 0 ? "yes" : "no"}} diff --git a/test/android-make.json b/test/android-make.json deleted file mode 100644 index 49661ec..0000000 --- a/test/android-make.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "android_make": { - "cxxflags": "-I../../../miniaudio", - "keyStore": "keystore.jks", - "keyAlias": "androidkey", - "storePass": "android", - "keyPass": "android", - "sdkDir": "${HOME}/Android/Sdk", - "ndkVersion": "25.2.9519653", - "buildToolsVersion": "34.0.0", - "androidxDir": "${HOME}/Android/androidx", - "kotlinDir": "${HOME}/Android/kotlin", - "androidVersion": "34", - "androidxCoreVersion": "1.10.1", - "androidxLifecycleCommonVersion": "2.6.1", - "androidxVersionedparcelableVersion": "1.1.1", - "kotlinStdlibVersion": "1.9.0", - "kotlinxCoroutinesCoreVersion": "1.7.3", - "kotlinxCoroutinesCoreJVMVersion": "1.7.3" - } -} diff --git a/test/daisy-seed-make.json b/test/daisy-seed-make.json deleted file mode 100644 index 80708c6..0000000 --- a/test/daisy-seed-make.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "daisy_seed_make": { - "libdaisyDir": "../../../libDaisy" - } -} diff --git a/test/lv2-make.json b/test/lv2-make.json deleted file mode 100644 index 87aca4c..0000000 --- a/test/lv2-make.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "lv2_make": { - "cflags": "$(shell pkg-config --cflags pugl-cairo-0 pugl-0 cairo)", - "ldflags": "$(shell pkg-config --libs pugl-cairo-0 pugl-0 cairo) -Wl,-rpath,$(shell pkg-config --variable=libdir pugl-cairo-0),-rpath,$(shell pkg-config --variable=libdir pugl-0),-rpath,$(shell pkg-config --variable=libdir cairo)" - } -} diff --git a/test/run.sh b/test/run.sh index ec1bc9b..929e046 100755 --- a/test/run.sh +++ b/test/run.sh @@ -17,19 +17,19 @@ cp $dir/plugin.h $dir/plugin_ui.h $dir/../out/lv2/src $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/common $dir/../out/web $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/web $dir/../out/web -$dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/web-make $dir/../out/web +$dir/../tibia $dir/product.json,$dir/company.json,$dir/make.json $dir/../templates/web-make $dir/../out/web $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/web-demo $dir/../out/web cp $dir/plugin.h $dir/../out/web/src $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/common $dir/../out/android $dir/../tibia $dir/product.json,$dir/company.json,$dir/android.json $dir/../templates/android $dir/../out/android -$dir/../tibia $dir/product.json,$dir/company.json,$dir/android.json,$dir/android-make.json $dir/../templates/android-make $dir/../out/android +$dir/../tibia $dir/product.json,$dir/company.json,$dir/android.json,$dir/make.json $dir/../templates/android-make $dir/../out/android cp $dir/keystore.jks $dir/../out/android cp $dir/plugin.h $dir/../out/android/src $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/common $dir/../out/ios $dir/../tibia $dir/product.json,$dir/company.json,$dir/ios.json $dir/../templates/ios $dir/../out/ios -$dir/../tibia $dir/product.json,$dir/company.json,$dir/ios.json,$dir/ios-make.json $dir/../templates/ios-make $dir/../out/ios +$dir/../tibia $dir/product.json,$dir/company.json,$dir/ios.json,$dir/make.json,$dir/ios-make.json $dir/../templates/ios-make $dir/../out/ios cp $dir/plugin.h $dir/../out/ios/src $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/common $dir/../out/cmd @@ -39,5 +39,5 @@ cp $dir/plugin.h $dir/../out/cmd/src $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/common $dir/../out/daisy-seed $dir/../tibia $dir/product.json,$dir/company.json,$dir/daisy-seed.json $dir/../templates/daisy-seed $dir/../out/daisy-seed -$dir/../tibia $dir/product.json,$dir/company.json,$dir/daisy-seed.json,$dir/daisy-seed-make.json $dir/../templates/daisy-seed-make $dir/../out/daisy-seed +$dir/../tibia $dir/product.json,$dir/company.json,$dir/daisy-seed.json,$dir/make.json $dir/../templates/daisy-seed-make $dir/../out/daisy-seed cp $dir/plugin.h $dir/../out/daisy-seed/src diff --git a/test/vars-pre.mk b/test/vars-pre.mk index 6363cf1..6afd6c2 100644 --- a/test/vars-pre.mk +++ b/test/vars-pre.mk @@ -12,3 +12,27 @@ ifeq ($(TEMPLATE), vst3) CFLAGS_EXTRA := -I../../../vst3_c_api $(shell pkg-config --cflags pugl-cairo-0) LDFLAGS_EXTRA := $(shell pkg-config --libs pugl-cairo-0 pugl-0 cairo) -Wl,-rpath,$(shell pkg-config --variable=libdir pugl-cairo-0),-rpath,$(shell pkg-config --variable=libdir pugl-0),-rpath,$(shell pkg-config --variable=libdir cairo) endif + +ifeq ($(TEMPLATE), daisy-seed) + LIBDAISY_DIR := ../../../libDaisy +endif + +ifeq ($(TEMPLATE), android) + CXXFLAGS_EXTRA := -I../../../miniaudio + KEY_STORE := keystore.jks + KEY_ALIAS := androidkey + STORE_PASS := android + KEY_PASS := android + SDK_DIR := $(HOME)/Android/Sdk + ANDROIDX_DIR := $(HOME)/Android/androidx + KOTLIN_DIR := $(HOME)/Android/kotlin + NDK_VERSION := 27.2.12479018 + BUILD_TOOLS_VERSION := 35.0.0 + ANDROID_VERSION := 35 + ANDROIDX_CORE_VERSION := 1.15.0 + ANDROIDX_LIFECYCLE_COMMON_VERSION := 2.8.7 + ANDROIDX_VERSIONEDPARCELABLE_VERSION := 1.2.0 + KOTLIN_STDLIB_VERSION := 2.1.0 + KOTLINX_COROUTINES_CORE_VERSION := 1.9.0 + KOTLINX_COROUTINES_CORE_JVM_VERSION := 1.9.0 +endif