diff --git a/src/Makefile b/Makefile similarity index 69% rename from src/Makefile rename to Makefile index 5addb22..3faa596 100644 --- a/src/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -include ../make/defaults.mk +include make/defaults.mk NAME := Vitalisierer CONFIG ?= release TARGET ?= JayVitalisierer.so @@ -7,19 +7,21 @@ CFLAGS += -fPIC CXXFLAGS += -fPIC CXXFLAGS += -std=c++11 -VST2_SDK_PATH := $(realpath ../sdk/vst/vstsdk2.4) -INCLUDES += -I $(realpath .) +VST2_SDK_PATH := $(realpath sdk/vst/vstsdk2.4) +INCLUDES += -I $(realpath src) INCLUDES += -I $(VST2_SDK_PATH) DEFINES += -DVST_2_4_EXTENSIONS=0 -DVST_2_3_EXTENSIONS=1 -GCC_SRCS := iir.c paramutils.c -CXX_SRCS := VitalisiererMain.cpp Vitalisierer2.cpp +GCC_SRCS := src/iir.c src/paramutils.c +CXX_SRCS := src/VitalisiererMain.cpp src/Vitalisierer2.cpp CXX_SRCS += $(VST2_SDK_PATH)/public.sdk/source/vst2.x/audioeffect.cpp CXX_SRCS += $(VST2_SDK_PATH)/public.sdk/source/vst2.x/audioeffectx.cpp LIBS := -lstdc++ LDFLAGS += $(TARGET_ARCH) $(LIBDIR) -shared +all: link + include $(MAKE_HOME)/compile.mk include $(MAKE_HOME)/link.mk diff --git a/build/linux/release/Vitalisierer/JayVitalisierer.so b/build/linux/release/Vitalisierer/JayVitalisierer.so new file mode 100755 index 0000000..7c12663 Binary files /dev/null and b/build/linux/release/Vitalisierer/JayVitalisierer.so differ diff --git a/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.d b/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.d new file mode 100644 index 0000000..a029ab7 --- /dev/null +++ b/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.d @@ -0,0 +1,7 @@ +/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer//home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.o: \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/pluginterfaces/vst2.x/aeffect.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/aeffeditor.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/pluginterfaces/vst2.x/aeffectx.h diff --git a/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.o b/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.o new file mode 100644 index 0000000..48832cf Binary files /dev/null and b/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.o differ diff --git a/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.d b/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.d new file mode 100644 index 0000000..4e3d9f6 --- /dev/null +++ b/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.d @@ -0,0 +1,7 @@ +/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer//home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.o: \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.cpp \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/pluginterfaces/vst2.x/aeffect.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/pluginterfaces/vst2.x/aeffectx.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/aeffeditor.h diff --git a/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.o b/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.o new file mode 100644 index 0000000..85786d4 Binary files /dev/null and b/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.o differ diff --git a/build/linux/release/Vitalisierer/src/Vitalisierer2.d b/build/linux/release/Vitalisierer/src/Vitalisierer2.d new file mode 100644 index 0000000..28c4afb --- /dev/null +++ b/build/linux/release/Vitalisierer/src/Vitalisierer2.d @@ -0,0 +1,7 @@ +/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/Vitalisierer2.o: \ + src/Vitalisierer2.cpp src/iir.h src/Vitalisierer2.hpp \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/pluginterfaces/vst2.x/aeffect.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/pluginterfaces/vst2.x/aeffectx.h \ + src/paramutils.h diff --git a/build/linux/release/Vitalisierer/src/Vitalisierer2.o b/build/linux/release/Vitalisierer/src/Vitalisierer2.o new file mode 100644 index 0000000..117b53d Binary files /dev/null and b/build/linux/release/Vitalisierer/src/Vitalisierer2.o differ diff --git a/build/linux/release/Vitalisierer/src/VitalisiererMain.d b/build/linux/release/Vitalisierer/src/VitalisiererMain.d new file mode 100644 index 0000000..8957f97 --- /dev/null +++ b/build/linux/release/Vitalisierer/src/VitalisiererMain.d @@ -0,0 +1,6 @@ +/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/VitalisiererMain.o: \ + src/VitalisiererMain.cpp src/iir.h src/Vitalisierer2.hpp \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/pluginterfaces/vst2.x/aeffect.h \ + /home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/pluginterfaces/vst2.x/aeffectx.h diff --git a/build/linux/release/Vitalisierer/src/VitalisiererMain.o b/build/linux/release/Vitalisierer/src/VitalisiererMain.o new file mode 100644 index 0000000..1cc887f Binary files /dev/null and b/build/linux/release/Vitalisierer/src/VitalisiererMain.o differ diff --git a/build/linux/release/Vitalisierer/src/iir.d b/build/linux/release/Vitalisierer/src/iir.d new file mode 100644 index 0000000..86ae25c --- /dev/null +++ b/build/linux/release/Vitalisierer/src/iir.d @@ -0,0 +1,2 @@ +/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/iir.o: \ + src/iir.c src/iir.h diff --git a/build/linux/release/Vitalisierer/src/iir.o b/build/linux/release/Vitalisierer/src/iir.o new file mode 100644 index 0000000..4fc0124 Binary files /dev/null and b/build/linux/release/Vitalisierer/src/iir.o differ diff --git a/build/linux/release/Vitalisierer/src/paramutils.d b/build/linux/release/Vitalisierer/src/paramutils.d new file mode 100644 index 0000000..ed51c97 --- /dev/null +++ b/build/linux/release/Vitalisierer/src/paramutils.d @@ -0,0 +1,2 @@ +/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/paramutils.o: \ + src/paramutils.c diff --git a/build/linux/release/Vitalisierer/src/paramutils.o b/build/linux/release/Vitalisierer/src/paramutils.o new file mode 100644 index 0000000..511c844 Binary files /dev/null and b/build/linux/release/Vitalisierer/src/paramutils.o differ diff --git a/c_cpp_properties.json b/c_cpp_properties.json index b626341..cf7145d 100644 --- a/c_cpp_properties.json +++ b/c_cpp_properties.json @@ -6,6 +6,6 @@ "-log=verbose", "-pretty", "--background-index", - "--compile-commands-dir=${workspaceFolder}/compile_commands.json" + "--compile-commands-dir=${workspaceFolder}/build/compile_commands.json" ] } diff --git a/compile_commands.json b/compile_commands.json new file mode 100644 index 0000000..bf3790b --- /dev/null +++ b/compile_commands.json @@ -0,0 +1,132 @@ +[ + { + "arguments": [ + "/usr/bin/clang++", + "-fPIC", + "-std=c++11", + "-g", + "-O3", + "-DVST_2_4_EXTENSIONS=0", + "-DVST_2_3_EXTENSIONS=1", + "-I", + "/home/jens/work/repos/JayVitalisierer/src", + "-I", + "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4", + "-c", + "-o", + "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/VitalisiererMain.o", + "src/VitalisiererMain.cpp" + ], + "directory": "/home/jens/work/repos/JayVitalisierer", + "file": "/home/jens/work/repos/JayVitalisierer/src/VitalisiererMain.cpp", + "output": "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/VitalisiererMain.o" + }, + { + "arguments": [ + "/usr/bin/clang++", + "-fPIC", + "-std=c++11", + "-g", + "-O3", + "-DVST_2_4_EXTENSIONS=0", + "-DVST_2_3_EXTENSIONS=1", + "-I", + "/home/jens/work/repos/JayVitalisierer/src", + "-I", + "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4", + "-c", + "-o", + "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/Vitalisierer2.o", + "src/Vitalisierer2.cpp" + ], + "directory": "/home/jens/work/repos/JayVitalisierer", + "file": "/home/jens/work/repos/JayVitalisierer/src/Vitalisierer2.cpp", + "output": "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/Vitalisierer2.o" + }, + { + "arguments": [ + "/usr/bin/clang++", + "-fPIC", + "-std=c++11", + "-g", + "-O3", + "-DVST_2_4_EXTENSIONS=0", + "-DVST_2_3_EXTENSIONS=1", + "-I", + "/home/jens/work/repos/JayVitalisierer/src", + "-I", + "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4", + "-c", + "-o", + "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer//home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.o", + "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp" + ], + "directory": "/home/jens/work/repos/JayVitalisierer", + "file": "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp", + "output": "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.o" + }, + { + "arguments": [ + "/usr/bin/clang++", + "-fPIC", + "-std=c++11", + "-g", + "-O3", + "-DVST_2_4_EXTENSIONS=0", + "-DVST_2_3_EXTENSIONS=1", + "-I", + "/home/jens/work/repos/JayVitalisierer/src", + "-I", + "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4", + "-c", + "-o", + "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer//home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.o", + "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.cpp" + ], + "directory": "/home/jens/work/repos/JayVitalisierer", + "file": "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.cpp", + "output": "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4/public.sdk/source/vst2.x/audioeffectx.o" + }, + { + "arguments": [ + "/usr/bin/clang", + "-fPIC", + "-g", + "-O3", + "-DVST_2_4_EXTENSIONS=0", + "-DVST_2_3_EXTENSIONS=1", + "-I", + "/home/jens/work/repos/JayVitalisierer/src", + "-I", + "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4", + "-c", + "-o", + "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/iir.o", + "src/iir.c" + ], + "directory": "/home/jens/work/repos/JayVitalisierer", + "file": "/home/jens/work/repos/JayVitalisierer/src/iir.c", + "output": "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/iir.o" + }, + { + "arguments": [ + "/usr/bin/clang", + "-fPIC", + "-g", + "-O3", + "-DVST_2_4_EXTENSIONS=0", + "-DVST_2_3_EXTENSIONS=1", + "-I", + "/home/jens/work/repos/JayVitalisierer/src", + "-I", + "/home/jens/work/repos/JayVitalisierer/sdk/vst/vstsdk2.4", + "-c", + "-o", + "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/paramutils.o", + "src/paramutils.c" + ], + "directory": "/home/jens/work/repos/JayVitalisierer", + "file": "/home/jens/work/repos/JayVitalisierer/src/paramutils.c", + "output": "/home/jens/work/repos/JayVitalisierer/build/linux/release/Vitalisierer/src/paramutils.o" + } +] diff --git a/rebuild_compile_commands.sh b/rebuild_compile_commands.sh new file mode 100755 index 0000000..98d0cc4 --- /dev/null +++ b/rebuild_compile_commands.sh @@ -0,0 +1,4 @@ +#/usr/bin/env bash +export MAKE_HOME=$HOME/work/repos/JayFilter/submodules/make +make clean +bear --config /home/jens/work/repos/JayVitalisierer/c_cpp_properties.json -- make diff --git a/submodules/make b/submodules/make index e07fbf1..98eddf6 160000 --- a/submodules/make +++ b/submodules/make @@ -1 +1 @@ -Subproject commit e07fbf1860f0ffc92fdb69cf646961ca8da10193 +Subproject commit 98eddf6cff76d8d6de7c52e17fd8dd780336fad9