From c77948148630113a050c551f0ff7b50f373e2efc Mon Sep 17 00:00:00 2001
From: Stefano D'Angelo <zanga.mail@gmail.com>
Date: Thu, 12 Dec 2024 12:13:11 +0100
Subject: [PATCH] update to latest tibia again

---
 examples/common/src/vars-pre.mk | 16 +++++++++-------
 examples/tibia_clean.sh         |  2 +-
 examples/tibia_gen.sh           |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/examples/common/src/vars-pre.mk b/examples/common/src/vars-pre.mk
index 88fcbd8..7eb40e0 100644
--- a/examples/common/src/vars-pre.mk
+++ b/examples/common/src/vars-pre.mk
@@ -1,20 +1,22 @@
+API_DIR := ../api
+
 ifeq ($(EXAMPLE_TYPE), c)
 	PLUGIN_DIR := ../src
-	CFLAGS_EXTRA := -I../../../include -I../../common/src -I../common/src
+	CFLAGS_EXTRA := -I../../../include -I../../common/src
 endif
 
 ifeq ($(EXAMPLE_TYPE), cxx-fx)
 	PLUGIN_DIR := ../../common/src/cxx-fx
 	CXX_SRCS_EXTRA := ../src/impl.cpp
-	CFLAGS_EXTRA := -I../../../include -I../../common/src -I../../common/src/cxx-fx -I../common/src
-	CXXFLAGS_EXTRA := -I../../../include -I../../common/src -I../../common/src/cxx-fx -I../common/src -std=c++11
+	CFLAGS_EXTRA := -I../../../include -I../../common/src -I../../common/src/cxx-fx
+	CXXFLAGS_EXTRA := -I../../../include -I../../common/src -I../../common/src/cxx-fx -std=c++11
 endif
 
 ifeq ($(EXAMPLE_TYPE), cxx-synth)
 	PLUGIN_DIR := ../../common/src/cxx-synth
 	CXX_SRCS_EXTRA := ../src/impl.cpp
-	CFLAGS_EXTRA := -I../../../include -I../../common/src -I../../common/src/cxx-synth -I../common/src
-	CXXFLAGS_EXTRA := -I../../../include -I../../common/src -I../../common/src/cxx-synth -I../common/src -std=c++11
+	CFLAGS_EXTRA := -I../../../include -I../../common/src -I../../common/src/cxx-synth
+	CXXFLAGS_EXTRA := -I../../../include -I../../common/src -I../../common/src/cxx-synth -std=c++11
 endif
 
 ifeq ($(TEMPLATE), cmd)
@@ -35,7 +37,7 @@ endif
 ifeq ($(TEMPLATE), web)
 	COMMON_DIR := ../../common/web
 	CFLAGS_EXTRA := $(CFLAGS_EXTRA) -DWASM
-	CXXFLAGS_EXTRA := -DWASM -std=c++11
+	CXXFLAGS_EXTRA := $(CXXFLAGS_EXTRA) -DWASM -std=c++11
 endif
 
 ifeq ($(TEMPLATE), daisy-seed)
@@ -55,7 +57,7 @@ endif
 
 ifeq ($(TEMPLATE), android)
 	COMMON_DIR := ../../common/android
-	CXXFLAGS_EXTRA := -I../../../include -I../../common/src -I../common/src -I../../../../miniaudio
+	CXXFLAGS_EXTRA := -I../../../include -I../../common/src -I../../../../miniaudio
 	KEY_STORE := ../../common/src/keystore.jks
 	KEY_ALIAS := androidkey
 	STORE_PASS := android
diff --git a/examples/tibia_clean.sh b/examples/tibia_clean.sh
index 2054605..b3fb298 100755
--- a/examples/tibia_clean.sh
+++ b/examples/tibia_clean.sh
@@ -9,5 +9,5 @@ dirs="fx* synth*"
 for d in $dirs; do
 	echo Removing data files for $d
 
-	rm -fr $d/common $d/cmd $d/web $d/daisy-seed $d/lv2 $d/vst3 $d/android $d/ios
+	rm -fr $d/api $d/cmd $d/web $d/daisy-seed $d/lv2 $d/vst3 $d/android $d/ios
 done
diff --git a/examples/tibia_gen.sh b/examples/tibia_gen.sh
index e3e5f48..b21266c 100755
--- a/examples/tibia_gen.sh
+++ b/examples/tibia_gen.sh
@@ -53,7 +53,7 @@ for d in $dirs; do
 		;;
 	esac
 
-	cd $d && $TIBIA_DIR/tibia --data ../common/src/company.json,src/product.json $TIBIA_DIR/templates/common common && cd ..
+	cd $d && $TIBIA_DIR/tibia --data ../common/src/company.json,src/product.json $TIBIA_DIR/templates/api api && cd ..
 
 	cd $d && $TIBIA_DIR/tibia --data ../common/src/company.json,src/product.json $TIBIA_DIR/templates/cmd cmd && cd ..
 	cd $d && $TIBIA_DIR/tibia --data ../common/src/company.json,src/product.json,../common/src/$make_json $TIBIA_DIR/templates/cmd-make cmd && cd ..