Rework project setup to use cmake, carla as static submodule dir

Signed-off-by: falkTX <falktx@falktx.com>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/carla"]
+	path = src/carla
+	url = https://github.com/falkTX/Carla.git

CMakeLists.txt

@@ -0,0 +1,84 @@
+cmake_minimum_required(VERSION 3.15)
+project(kuriborosu)
+
+set(CMAKE_POLICY_DEFAULT_CMP0025 NEW)
+set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
+set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
+
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11)
+
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
+
+set_property(GLOBAL PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+
+#######################################################################################################################
+# dependencies
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(SNDFILE IMPORTED_TARGET REQUIRED sndfile)
+
+#######################################################################################################################
+# Import carla stuff
+
+add_subdirectory(src/carla/cmake)
+
+#######################################################################################################################
+# Setup kuriborosu target
+
+add_executable(kuriborosu)
+set_property(TARGET kuriborosu PROPERTY RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin/$<0:>")
+
+target_compile_definitions(kuriborosu
+  PRIVATE
+    BUILDING_CARLA
+)
+
+target_include_directories(kuriborosu
+  PRIVATE
+    .
+)
+
+target_link_libraries(kuriborosu
+  PUBLIC
+    carla::host-plugin
+    PkgConfig::SNDFILE
+)
+
+target_sources(kuriborosu
+  PRIVATE
+    src/host.c
+    src/kuriborosu.c
+)
+
+#######################################################################################################################
+# Setup kuribu target
+
+add_executable(kuribu)
+set_property(TARGET kuribu PROPERTY RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin/$<0:>")
+
+target_compile_definitions(kuribu
+  PRIVATE
+    BUILDING_CARLA
+)
+
+target_include_directories(kuribu
+  PRIVATE
+    .
+)
+
+target_link_libraries(kuribu
+  PUBLIC
+    carla::host-plugin
+    PkgConfig::SNDFILE
+)
+
+target_sources(kuribu
+  PRIVATE
+    src/host.c
+    src/kuribu.c
+)
+
+#######################################################################################################################

Makefile

@@ -1,33 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DIE-Plugins #
-# ------------------------ #
-# Created by falkTX
-#
-
-include Makefile.base.mk
-
-PREFIX ?= /usr/local
-
-# --------------------------------------------------------------
-
-all: build
-
-# --------------------------------------------------------------
-
-build:
-	$(MAKE) -C src
-
-# --------------------------------------------------------------
-
-clean:
-	$(MAKE) clean -C src
-
-# --------------------------------------------------------------
-
-install:
-	install -d $(DESTDIR)$(PREFIX)/bin
-	install -m 755 bin/koriborusu $(DESTDIR)$(PREFIX)/bin/
-
-# --------------------------------------------------------------
-
-.PHONY: build

Makefile.base.mk

@@ -1,345 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DIE-Plugins #
-# ------------------------ #
-# Created by falkTX
-#
-
-AR  ?= ar
-CC  ?= gcc
-CXX ?= g++
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Auto-detect OS if not defined
-
-TARGET_MACHINE := $(shell $(CC) -dumpmachine)
-
-ifneq ($(BSD),true)
-ifneq ($(HAIKU),true)
-ifneq ($(HURD),true)
-ifneq ($(LINUX),true)
-ifneq ($(MACOS),true)
-ifneq ($(WINDOWS),true)
-
-ifneq (,$(findstring bsd,$(TARGET_MACHINE)))
-BSD=true
-endif
-ifneq (,$(findstring haiku,$(TARGET_MACHINE)))
-HAIKU=true
-endif
-ifneq (,$(findstring gnu,$(TARGET_MACHINE)))
-HURD=true
-endif
-ifneq (,$(findstring linux,$(TARGET_MACHINE)))
-LINUX=true
-endif
-ifneq (,$(findstring apple,$(TARGET_MACHINE)))
-MACOS=true
-endif
-ifneq (,$(findstring mingw,$(TARGET_MACHINE)))
-WINDOWS=true
-endif
-
-endif
-endif
-endif
-endif
-endif
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Auto-detect the processor
-
-TARGET_PROCESSOR := $(firstword $(subst -, ,$(TARGET_MACHINE)))
-
-ifneq (,$(filter i%86,$(TARGET_PROCESSOR)))
-CPU_I386=true
-CPU_I386_OR_X86_64=true
-endif
-ifneq (,$(filter x86_64,$(TARGET_PROCESSOR)))
-CPU_X86_64=true
-CPU_I386_OR_X86_64=true
-endif
-ifneq (,$(filter arm%,$(TARGET_PROCESSOR)))
-CPU_ARM=true
-CPU_ARM_OR_AARCH64=true
-endif
-ifneq (,$(filter arm64%,$(TARGET_PROCESSOR)))
-CPU_ARM64=true
-CPU_ARM_OR_AARCH64=true
-endif
-ifneq (,$(filter aarch64%,$(TARGET_PROCESSOR)))
-CPU_AARCH64=true
-CPU_ARM_OR_AARCH64=true
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set PKG_CONFIG (can be overridden by environment variable)
-
-ifeq ($(WINDOWS),true)
-# Build statically on Windows by default
-PKG_CONFIG ?= pkg-config --static
-else
-PKG_CONFIG ?= pkg-config
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set LINUX_OR_MACOS
-
-ifeq ($(LINUX),true)
-LINUX_OR_MACOS=true
-endif
-
-ifeq ($(MACOS),true)
-LINUX_OR_MACOS=true
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set MACOS_OR_WINDOWS and HAIKU_OR_MACOS_OR_WINDOWS
-
-ifeq ($(HAIKU),true)
-HAIKU_OR_MACOS_OR_WINDOWS=true
-endif
-
-ifeq ($(MACOS),true)
-MACOS_OR_WINDOWS=true
-HAIKU_OR_MACOS_OR_WINDOWS=true
-endif
-
-ifeq ($(WINDOWS),true)
-MACOS_OR_WINDOWS=true
-HAIKU_OR_MACOS_OR_WINDOWS=true
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set UNIX
-
-ifeq ($(BSD),true)
-UNIX=true
-endif
-
-ifeq ($(HURD),true)
-UNIX=true
-endif
-
-ifeq ($(LINUX),true)
-UNIX=true
-endif
-
-ifeq ($(MACOS),true)
-UNIX=true
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set build and link flags
-
-BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
-BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunction-sections
-
-ifeq ($(CPU_I386_OR_X86_64),true)
-BASE_OPTS += -mtune=generic -msse -msse2 -mfpmath=sse
-endif
-
-ifeq ($(CPU_ARM),true)
-ifneq ($(CPU_ARM64),true)
-BASE_OPTS += -mfpu=neon-vfpv4 -mfloat-abi=hard
-endif
-endif
-
-ifeq ($(MACOS),true)
-# MacOS linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs
-else
-# Common linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed
-ifneq ($(SKIP_STRIPPING),true)
-LINK_OPTS += -Wl,--strip-all
-endif
-endif
-
-ifeq ($(NOOPT),true)
-# No CPU-specific optimization flags
-BASE_OPTS  = -O2 -ffast-math -fdata-sections -ffunction-sections
-endif
-
-ifeq ($(WINDOWS),true)
-# mingw has issues with this specific optimization
-# See https://github.com/falkTX/Carla/issues/696
-BASE_OPTS  += -fno-rerun-cse-after-loop
-# See https://github.com/falkTX/Carla/issues/855
-BASE_OPTS  += -mstackrealign
-else
-# Not needed for Windows
-BASE_FLAGS += -fPIC -DPIC
-endif
-
-ifeq ($(DEBUG),true)
-BASE_FLAGS += -DDEBUG -O0 -g
-LINK_OPTS   =
-else
-BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden
-CXXFLAGS   += -fvisibility-inlines-hidden
-endif
-
-BUILD_C_FLAGS   = $(BASE_FLAGS) -std=gnu99 $(CFLAGS)
-BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=gnu++0x $(CXXFLAGS)
-LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
-
-ifneq ($(MACOS),true)
-# Not available on MacOS
-LINK_FLAGS     += -Wl,--no-undefined
-endif
-
-ifeq ($(MACOS_OLD),true)
-BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS) -DHAVE_CPP11_SUPPORT=0
-endif
-
-ifeq ($(WINDOWS),true)
-# Always build statically on windows
-LINK_FLAGS     += -static
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Strict test build
-
-ifeq ($(TESTBUILD),true)
-BASE_FLAGS += -Werror -Wcast-qual -Wconversion -Wformat -Wformat-security -Wredundant-decls -Wshadow -Wstrict-overflow -fstrict-overflow -Wundef -Wwrite-strings
-BASE_FLAGS += -Wpointer-arith -Wabi -Winit-self -Wuninitialized -Wstrict-overflow=5
-# BASE_FLAGS += -Wfloat-equal
-ifeq ($(CC),clang)
-BASE_FLAGS += -Wdocumentation -Wdocumentation-unknown-command
-BASE_FLAGS += -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-exit-time-destructors -Wno-float-equal
-else
-BASE_FLAGS += -Wcast-align -Wunsafe-loop-optimizations
-endif
-ifneq ($(MACOS),true)
-BASE_FLAGS += -Wmissing-declarations -Wsign-conversion
-ifneq ($(CC),clang)
-BASE_FLAGS += -Wlogical-op
-endif
-endif
-CFLAGS     += -Wold-style-definition -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes
-CXXFLAGS   += -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Check for required libraries
-
-HAVE_CAIRO  = $(shell $(PKG_CONFIG) --exists cairo && echo true)
-
-ifeq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
-HAVE_OPENGL = true
-else
-HAVE_OPENGL = $(shell $(PKG_CONFIG) --exists gl && echo true)
-HAVE_X11    = $(shell $(PKG_CONFIG) --exists x11 && echo true)
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Check for optional libraries
-
-HAVE_JACK  = $(shell $(PKG_CONFIG) --exists jack && echo true)
-HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo true)
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set Generic DGL stuff
-
-ifeq ($(HAIKU),true)
-DGL_SYSTEM_LIBS += -lbe
-endif
-
-ifeq ($(MACOS),true)
-DGL_SYSTEM_LIBS += -framework Cocoa
-endif
-
-ifeq ($(WINDOWS),true)
-DGL_SYSTEM_LIBS += -lgdi32 -lcomdlg32
-endif
-
-ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
-ifeq ($(HAVE_X11),true)
-DGL_FLAGS       += $(shell $(PKG_CONFIG) --cflags x11)
-DGL_SYSTEM_LIBS += $(shell $(PKG_CONFIG) --libs x11)
-endif
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set Cairo specific stuff
-
-ifeq ($(HAVE_CAIRO),true)
-
-DGL_FLAGS   += -DHAVE_CAIRO
-
-CAIRO_FLAGS  = $(shell $(PKG_CONFIG) --cflags cairo)
-CAIRO_LIBS   = $(shell $(PKG_CONFIG) --libs cairo)
-
-HAVE_CAIRO_OR_OPENGL = true
-
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set OpenGL specific stuff
-
-ifeq ($(HAVE_OPENGL),true)
-
-DGL_FLAGS   += -DHAVE_OPENGL
-
-ifeq ($(HAIKU),true)
-OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl)
-OPENGL_LIBS  = $(shell $(PKG_CONFIG) --libs gl)
-endif
-
-ifeq ($(MACOS),true)
-OPENGL_LIBS  = -framework OpenGL
-endif
-
-ifeq ($(WINDOWS),true)
-OPENGL_LIBS  = -lopengl32
-endif
-
-ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
-OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl x11)
-OPENGL_LIBS  = $(shell $(PKG_CONFIG) --libs gl x11)
-endif
-
-HAVE_CAIRO_OR_OPENGL = true
-
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set app extension
-
-ifeq ($(WINDOWS),true)
-APP_EXT = .exe
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set shared lib extension
-
-LIB_EXT = .so
-
-ifeq ($(MACOS),true)
-LIB_EXT = .dylib
-endif
-
-ifeq ($(WINDOWS),true)
-LIB_EXT = .dll
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set shared library CLI arg
-
-ifeq ($(MACOS),true)
-SHARED = -dynamiclib
-else
-SHARED = -shared
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Handle the verbosity switch
-
-ifeq ($(VERBOSE),true)
-SILENT =
-else
-SILENT = @
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------

src/Makefile

@@ -1,65 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for ACE #
-# ---------------- #
-# Created by falkTX
-#
-
-include ../Makefile.base.mk
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../bin
-BUILD_DIR = ../build
-
-BASE_FLAGS += $(shell pkg-config --cflags carla-host-plugin sndfile)
-LINK_FLAGS += $(shell pkg-config --libs carla-host-plugin sndfile)
-
-BASE_FLAGS += -Wno-unused-parameter
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Set files to build
-
-FILES = host.c kuriborosu.c kuribu.c
-OBJS  = $(FILES:%=$(BUILD_DIR)/%.o)
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Default build targets
-
-TARGETS = $(TARGET_DIR)/kuriborosu $(TARGET_DIR)/kuribu
-
-all: build
-
-build: $(TARGETS)
-
-# ---------------------------------------------------------------------------------------------------------------------
-# Build commands
-
-$(TARGET_DIR)/kuriborosu: $(BUILD_DIR)/kuriborosu.c.o $(BUILD_DIR)/host.c.o
-	-@mkdir -p $(shell dirname $@)
-	@echo "Linking kuriborosu"
-	$(SILENT)$(CXX) $^ $(LINK_FLAGS) -o $@
-
-$(TARGET_DIR)/kuribu: $(BUILD_DIR)/kuribu.c.o $(BUILD_DIR)/host.c.o
-	-@mkdir -p $(shell dirname $@)
-	@echo "Linking kuribu"
-	$(SILENT)$(CXX) $^ $(LINK_FLAGS) -o $@
-
-$(BUILD_DIR)/%.c.o: %.c
-	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
-	@echo "Compiling $<"
-	$(SILENT)$(CC) $< $(BUILD_C_FLAGS) -c -o $@
-
-$(BUILD_DIR)/%.cpp.o: %.cpp
-	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
-	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
-clean:
-	rm -rf $(BUILD_DIR) $(TARGET)
-
-# ---------------------------------------------------------------------------------------------------------------------
-
--include $(OBJS:%.o=%.d)
-
-# ---------------------------------------------------------------------------------------------------------------------

src/carla

@@ -0,0 +1 @@
+Subproject commit a703a53232ac72b970232f02178c0592690792f9