moved BUILD_BIN/DATA_DIR and made extra non-exclusive

This commit is contained in:
Stefano D'Angelo 2024-12-13 11:38:34 +01:00
parent 792372e5f1
commit 3277c4ce08
12 changed files with 67 additions and 37 deletions

View File

@ -28,6 +28,9 @@ PLUGIN_DIR ?= src
API_DIR ?= $(PLUGIN_DIR)
MKINC_DIR ?= $(COMMON_DIR)
BUILD_BIN_DIR := build/apk/lib/armeabi-v7a
BUILD_DATA_DIR := build/assets/index.html
include $(MKINC_DIR)/vars-pre.mk
ifeq ($(HAS_MIDI_IN), yes)
@ -99,9 +102,6 @@ CXX_OBJS := $(addprefix build/obj/, $(notdir $(CXX_SRCS:.cpp=.o)))
ALL := build/$(BUNDLE_NAME).apk
BUILD_BIN_DIR := build/apk/lib/armeabi-v7a
BUILD_DATA_DIR := build/assets/index.html
-include $(MKINC_DIR)/vars-extra.mk
all: $(ALL)

View File

@ -39,6 +39,9 @@ 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"}}
{{?(it.android_make?.extra || it.make?.extra)}}
{{=it.android_make?.extra ?? (it.make?.extra ?? "")}}
{{?it.make?.extra}}
{{=it.make.extra}}
{{?}}
{{?it.android_make?.extra}}
{{=it.android_make.extra}}
{{?}}

View File

@ -28,6 +28,9 @@ PLUGIN_DIR ?= src
API_DIR ?= $(PLUGIN_DIR)
MKINC_DIR ?= $(COMMON_DIR)
BUILD_BIN_DIR := build
BUILD_DATA_DIR := build
-include $(MKINC_DIR)/vars-pre.mk
ifeq ($(OS), Windows_NT)
@ -73,9 +76,6 @@ CXX_OBJS := $(addprefix build/obj/, $(notdir $(CXX_SRCS:.cpp=.o)))
ALL := build/$(PROGRAM)
BUILD_BIN_DIR := build
BUILD_DATA_DIR := build
-include $(MKINC_DIR)/vars-extra.mk
all: $(ALL)

View File

@ -38,6 +38,9 @@ MKINC_DIR := {{=it.cmd_make?.mkincDir ?? (it.make?.mkincDir ?? "")}}
HAS_MIDI_IN := {{=it.product.buses.filter(x => x.type == "midi" && x.direction == "input").length > 0 ? "yes" : "no"}}
{{?(it.cmd_make?.extra || it.make?.extra)}}
{{=it.cmd_make?.extra ?? (it.make?.extra ?? "")}}
{{?it.make?.extra}}
{{=it.make.extra}}
{{?}}
{{?it.cmd_make?.extra}}
{{=it.cmd_make.extra}}
{{?}}

View File

@ -36,6 +36,9 @@ API_DIR := {{=it.daisy_seed_make?.apiDir ?? (it.make?.apiDir ?? "")}}
MKINC_DIR := {{=it.daisy_seed_make?.mkincDir ?? (it.make?.mkincDir ?? "")}}
{{?}}
{{?(it.daisy_seed_make?.extra || it.make?.extra)}}
{{=it.daisy_seed_make?.extra ?? (it.make?.extra ?? "")}}
{{?it.make?.extra}}
{{=it.make.extra}}
{{?}}
{{?it.daisy_seed_make?.extra}}
{{=it.daisy_seed_make.extra}}
{{?}}

View File

@ -36,6 +36,9 @@ API_DIR := {{=it.ios_make?.apiDir ?? (it.make?.apiDir ?? "")}}
MKINC_DIR := {{=it.ios_make?.mkincDir ?? (it.make?.mkincDir ?? "")}}
{{?}}
{{?(it.ios_make?.extra || it.make?.extra)}}
{{=it.ios_make?.extra ?? (it.make?.extra ?? "")}}
{{?it.make?.extra}}
{{=it.make.extra}}
{{?}}
{{?it.ios_make?.extra}}
{{=it.ios_make.extra}}
{{?}}

View File

@ -28,6 +28,11 @@ PLUGIN_DIR ?= src
API_DIR ?= $(PLUGIN_DIR)
MKINC_DIR ?= $(COMMON_DIR)
BUNDLE_DIR := $(BUNDLE_NAME).lv2
BUILD_BIN_DIR := build/$(BUNDLE_DIR)
BUILD_DATA_DIR := build/$(BUNDLE_DIR)
-include $(MKINC_DIR)/vars-pre.mk
ifeq ($(OS), Windows_NT)
@ -72,8 +77,6 @@ ifeq ($(UNAME_S), Darwin)
CXXFLAGS_ALL := $(CXXFLAGS_ALL) -arch arm64 -arch x86_64
endif
BUNDLE_DIR := $(BUNDLE_NAME).lv2
DLL_FILE := $(BUNDLE_NAME)$(DLL_SUFFIX)
C_SRCS := $(COMMON_DIR)/src/lv2.c $(C_SRCS_EXTRA)
@ -84,9 +87,6 @@ CXX_OBJS := $(addprefix build/obj/, $(notdir $(CXX_SRCS:.cpp=.o)))
ALL := build/$(BUNDLE_DIR)/manifest.ttl build/$(BUNDLE_DIR)/$(DLL_FILE)
BUILD_BIN_DIR := build/$(BUNDLE_DIR)
BUILD_DATA_DIR := build/$(BUNDLE_DIR)
-include $(MKINC_DIR)/vars-extra.mk
all: $(ALL)

View File

@ -36,6 +36,9 @@ API_DIR := {{=it.lv2_make?.apiDir ?? (it.make?.apiDir ?? "")}}
MKINC_DIR := {{=it.lv2_make?.mkincDir ?? (it.make?.mkincDir ?? "")}}
{{?}}
{{?(it.lv2_make?.extra || it.make?.extra)}}
{{=it.lv2_make?.extra ?? (it.make?.extra ?? "")}}
{{?it.make?.extra}}
{{=it.make.extra}}
{{?}}
{{?it.lv2_make?.extra}}
{{=it.lv2_make.extra}}
{{?}}

View File

@ -28,11 +28,27 @@ PLUGIN_DIR ?= src
API_DIR ?= $(PLUGIN_DIR)
MKINC_DIR ?= $(COMMON_DIR)
BUNDLE_DIR := $(BUNDLE_NAME).vst3
ifeq ($(OS), Windows_NT)
PLATFORM := x86_64-win
else
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S), Darwin)
PLATFORM := MacOS
else
PLATFORM := $(shell uname -m)-linux
endif
endif
DLL_DIR := Contents/$(PLATFORM)
BUILD_BIN_DIR := build/$(BUNDLE_DIR)/$(DLL_DIR)
BUILD_DATA_DIR := build/$(BUNDLE_DIR)/Contents/Resources
-include $(MKINC_DIR)/vars-pre.mk
ifeq ($(OS), Windows_NT)
DLL_SUFFIX := .vst3
PLATFORM := x86_64-win
VST3DIR := $(shell echo '$(COMMONPROGRAMFILES)' | sed 's:\\:/:g')/VST3
VST3DIR_USER := $(shell echo '$(LOCALAPPDATA)' | sed 's:\\:/:g')/Programs/Common/VST3
CC := gcc
@ -41,14 +57,12 @@ else
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S), Darwin)
DLL_SUFFIX :=
PLATFORM := MacOS
VST3DIR := /Library/Audio/Plug-Ins/VST3
VST3DIR_USER := $(HOME)/Library/Audio/Plug-Ins/VST3
CC := clang
CXX := clang++
else
DLL_SUFFIX := .so
PLATFORM := $(shell uname -m)-linux
VST3DIR := /usr/local/lib/vst3
VST3DIR_USER := $(HOME)/.vst3
CC := gcc
@ -84,9 +98,7 @@ ifeq ($(UNAME_S), Linux)
endif
endif
BUNDLE_DIR := $(BUNDLE_NAME).vst3
DLL_DIR := Contents/$(PLATFORM)
DLL_FILE := $(DLL_DIR)/$(BUNDLE_NAME)$(DLL_SUFFIX)
C_SRCS := $(COMMON_DIR)/src/vst3.c $(C_SRCS_EXTRA)
@ -101,9 +113,6 @@ ifeq ($(UNAME_S), Darwin)
ALL := $(ALL) build/$(BUNDLE_DIR)/Contents/Info.plist build/$(BUNDLE_DIR)/Contents/PkgInfo
endif
BUILD_BIN_DIR := build/$(BUNDLE_DIR)/$(DLL_DIR)
BUILD_DATA_DIR := build/$(BUNDLE_DIR)/Contents/Resources
-include $(MKINC_DIR)/vars-extra.mk
all: $(ALL)
@ -124,7 +133,7 @@ build/$(BUNDLE_DIR)/Contents/%: $(COMMON_DIR)/data/% | build/$(BUNDLE_DIR)/Conte
cp $^ $@
endif
build/$(BUNDLE_DIR)/Contents build/$(BUNDLE_DIR)/$(DLL_DIR) build/obj:
build/$(BUNDLE_DIR)/Contents build/$(BUNDLE_DIR)/$(DLL_DIR) $(BUILD_DATA_DIR) build/obj:
mkdir -p $@
clean:

View File

@ -38,6 +38,9 @@ MKINC_DIR := {{=it.vst3_make?.mkincDir ?? (it.make?.mkincDir ?? "")}}
HAS_UI := {{=it.product.ui ? "yes" : "no"}}
{{?(it.vst3_make?.extra || it.make?.extra)}}
{{=it.vst3_make?.extra ?? (it.make?.extra ?? "")}}
{{?it.make?.extra}}
{{=it.make.extra}}
{{?}}
{{?it.vst3_make?.extra}}
{{=it.vst3_make.extra}}
{{?}}

View File

@ -28,6 +28,9 @@ PLUGIN_DIR ?= src
API_DIR ?= $(PLUGIN_DIR)
MKINC_DIR ?= $(COMMON_DIR)
BUILD_BIN_DIR := build/web
BUILD_DATA_DIR := build/web
-include $(MKINC_DIR)/vars-pre.mk
CC := clang
@ -80,9 +83,6 @@ endif
ALL := build/web/$(BUNDLE_NAME)/module.wasm build/web/$(BUNDLE_NAME)/processor.js build/web/$(BUNDLE_NAME)/module.js
BUILD_BIN_DIR := build/web
BUILD_DATA_DIR := build/web
-include $(MKINC_DIR)/vars-extra.mk
all: $(ALL)

View File

@ -38,6 +38,9 @@ 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"}}
{{?(it.web_make?.extra || it.make?.extra)}}
{{=it.web_make?.extra ?? (it.make?.extra ?? "")}}
{{?it.make?.extra}}
{{=it.make.extra}}
{{?}}
{{?it.web_make?.extra}}
{{=it.web_make.extra}}
{{?}}