From b4f4b1fa6653e1973f7ef77278741314c1c291af Mon Sep 17 00:00:00 2001 From: jens Date: Wed, 26 Apr 2023 10:50:12 +0200 Subject: [PATCH] - Refactored MAke system. Put sources into config.mk - export variables of main Makefile --- JuceLibraryCode/Makefile | 20 +++----------------- JuceLibraryCode/config.mk | 20 +++++++++++++++----- Makefile | 12 ++++++++++-- Source/Makefile | 21 +++++---------------- Source/config.mk | 20 ++++++++++++++------ Source/synth/Makefile | 19 +++---------------- Source/synth/config.mk | 21 ++++++++++++++++----- 7 files changed, 66 insertions(+), 67 deletions(-) diff --git a/JuceLibraryCode/Makefile b/JuceLibraryCode/Makefile index 140e2d9..ac0785e 100644 --- a/JuceLibraryCode/Makefile +++ b/JuceLibraryCode/Makefile @@ -1,23 +1,9 @@ -include ./config.mk include $(MAKE_HOME)/defaults.mk -NAME := JuceLibraryCode +JUCE_PATH ?= $(realpath ../sdk/juce/JUCE-3.1.1) +VST2_SDK_PATH ?= $(realpath ../sdk/vst/vstsdk2.4) -JUCE_MODULES := ${JUCE_PATH}/modules - -SOURCES := juce_audio_basics/juce_audio_basics.cpp -SOURCES += juce_audio_devices/juce_audio_devices.cpp -SOURCES += juce_audio_formats/juce_audio_formats.cpp -SOURCES += juce_audio_processors/juce_audio_processors.cpp -SOURCES += juce_core/juce_core.cpp -SOURCES += juce_data_structures/juce_data_structures.cpp -SOURCES += juce_events/juce_events.cpp -SOURCES += juce_graphics/juce_graphics.cpp -SOURCES += juce_gui_basics/juce_gui_basics.cpp -SOURCES += juce_gui_extra/juce_gui_extra.cpp -SOURCES += juce_audio_plugin_client/utility/juce_PluginUtilities.cpp -SOURCES += juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp -SOURCES += juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp +include config.mk CXX_SRCS := $(addprefix $(JUCE_MODULES)/, $(SOURCES)) INCLUDES += -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(VST2_SDK_PATH) -I /usr/include/freetype2 diff --git a/JuceLibraryCode/config.mk b/JuceLibraryCode/config.mk index 5aa10a4..ff307ed 100644 --- a/JuceLibraryCode/config.mk +++ b/JuceLibraryCode/config.mk @@ -1,7 +1,17 @@ -MAKE_HOME ?= /home/jens/work/software/make -CONFIG ?= debug -BUILD_DIR ?= ./build/${CONFIG} +NAME := JuceLibraryCode -JUCE_PATH ?= $(realpath ../sdk/juce/JUCE-3.1.1) -VST2_SDK_PATH ?= $(realpath ../sdk/vst/vstsdk2.4) +JUCE_MODULES := ${JUCE_PATH}/modules +SOURCES := juce_audio_basics/juce_audio_basics.cpp +SOURCES += juce_audio_devices/juce_audio_devices.cpp +SOURCES += juce_audio_formats/juce_audio_formats.cpp +SOURCES += juce_audio_processors/juce_audio_processors.cpp +SOURCES += juce_core/juce_core.cpp +SOURCES += juce_data_structures/juce_data_structures.cpp +SOURCES += juce_events/juce_events.cpp +SOURCES += juce_graphics/juce_graphics.cpp +SOURCES += juce_gui_basics/juce_gui_basics.cpp +SOURCES += juce_gui_extra/juce_gui_extra.cpp +SOURCES += juce_audio_plugin_client/utility/juce_PluginUtilities.cpp +SOURCES += juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +SOURCES += juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp diff --git a/Makefile b/Makefile index 4a64dd8..9cd599c 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,19 @@ -include ./config.mk include $(MAKE_HOME)/defaults.mk +CONFIG ?= release +TARGET ?= JaySynth.so + +LIBSRC_PATH ?= $(realpath ../../libsrc) +JUCE_PATH := $(realpath ./sdk/juce/JUCE-3.1.1) +VST2_SDK_PATH ?= $(realpath ./sdk/vst/vstsdk2.4) + NAME =: JaySynth DEFINES := -Dradio_float_t=float -Dfir_float_t=float -Dsynth_float_t=float DEFINES += -DHAVE_LROUND CFLAGS += -fPIC CXXFLAGS += -fPIC -CXXFLAGS += -std=c++20 +CXXFLAGS += -std=c++11 CXXFLAGS += -Wno-volatile CXXFLAGS += -Wno-deprecated-declarations CXXFLAGS += -Wno-deprecated-enum-float-conversion @@ -21,6 +27,8 @@ INCLUDES += -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(VST2_SDK_PATH) -I $(LIB PACKAGES := JuceLibraryCode Source Synth Fir +export + all: app app: objects link diff --git a/Source/Makefile b/Source/Makefile index 410d8c1..c240773 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -1,25 +1,14 @@ -include ./config.mk include $(MAKE_HOME)/defaults.mk -NAME := JaySynthModules +LIBSRC_PATH ?= $(realpath ../../../libsrc) +JUCE_PATH ?= $(realpath ../sdk/juce/JUCE-3.1.1) +VST2_SDK_PATH ?= $(realpath ../sdk/vst/vstsdk2.4) -CXX_SRCS := ButtonLED.cpp -CXX_SRCS += graph_window.cpp -CXX_SRCS += JaySynth.cpp -CXX_SRCS += JaySynthAudioProcessorEditor.cpp -CXX_SRCS += JaySynthMidiCC.cpp -CXX_SRCS += JaySynthMonophonicMGR.cpp -CXX_SRCS += JaySynthSound.cpp -CXX_SRCS += JaySynthVoice.cpp -CXX_SRCS += MidiCC_PopUp.cpp -CXX_SRCS += PluginProcessor.cpp -CXX_SRCS += VelKey_PopUp.cpp -CXX_SRCS += JaySynth.cpp -CXX_SRCS += JK_MidiClock.cpp +include config.mk INCLUDES += -I $(LIBSRC_PATH) -I $(JUCE_PATH) -I $(VST2_SDK_PATH) DEFINES += -Dradio_float_t=float -Dfir_float_t=float -Dsynth_float_t=float -CXXFLAGS += -std=c++20 +CXXFLAGS += -std=c++11 # Reduce Blaze warnings CXXFLAGS += -Wno-volatile -Wno-deprecated-declarations DEFINES += -DJUCE_GCC=1 -DLINUX=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 diff --git a/Source/config.mk b/Source/config.mk index a0acf58..fb30370 100644 --- a/Source/config.mk +++ b/Source/config.mk @@ -1,7 +1,15 @@ -MAKE_HOME ?= /home/jens/work/software/make -CONFIG ?= debug -BUILD_DIR ?= ./build/${CONFIG} +NAME := JaySynthModules -JUCE_PATH ?= $(realpath ../juce/JUCE-3.1.1) -LIBSRC_PATH ?= $(realpath ../../../libsrc) -VST2_SDK_PATH ?= $(realpath ../sdk/vst/vstsdk2.4) +CXX_SRCS := ButtonLED.cpp +CXX_SRCS += graph_window.cpp +CXX_SRCS += JaySynth.cpp +CXX_SRCS += JaySynthAudioProcessorEditor.cpp +CXX_SRCS += JaySynthMidiCC.cpp +CXX_SRCS += JaySynthMonophonicMGR.cpp +CXX_SRCS += JaySynthSound.cpp +CXX_SRCS += JaySynthVoice.cpp +CXX_SRCS += MidiCC_PopUp.cpp +CXX_SRCS += PluginProcessor.cpp +CXX_SRCS += VelKey_PopUp.cpp +CXX_SRCS += JaySynth.cpp +CXX_SRCS += JK_MidiClock.cpp diff --git a/Source/synth/Makefile b/Source/synth/Makefile index cb86923..18bc221 100644 --- a/Source/synth/Makefile +++ b/Source/synth/Makefile @@ -1,22 +1,9 @@ -include ./config.mk include $(MAKE_HOME)/defaults.mk -NAME := Synth +LIBSRC_PATH ?= $(realpath ../../../../libsrc) +VST2_SDK_PATH ?= $(realpath ../../sdk/vst/vstsdk2.4) -GCC_SRCS := blit.c -GCC_SRCS += env.c -GCC_SRCS += lfo.c -GCC_SRCS += mw_wave_data.c -GCC_SRCS += noise.c -GCC_SRCS += param_scale.c -GCC_SRCS += sine.c -GCC_SRCS += smooth.c -GCC_SRCS += synth_debug.c -GCC_SRCS += vcf.c -GCC_SRCS += vco.c -GCC_SRCS += vector_utils.c -GCC_SRCS += voice.c -GCC_SRCS += wavetable.c +include config.mk INCLUDES ?= -I $(LIBSRC_PATH) -I $(VST2_SDK_PATH) DEFINES += -Dradio_float_t=float -Dfir_float_t=float -Dsynth_float_t=float diff --git a/Source/synth/config.mk b/Source/synth/config.mk index 10862f5..fc2e32f 100644 --- a/Source/synth/config.mk +++ b/Source/synth/config.mk @@ -1,6 +1,17 @@ -MAKE_HOME ?= /home/jens/work/software/make -CONFIG ?= debug -BUILD_DIR ?= ./build/${CONFIG} +NAME := Synth + +GCC_SRCS := blit.c +GCC_SRCS += env.c +GCC_SRCS += lfo.c +GCC_SRCS += mw_wave_data.c +GCC_SRCS += noise.c +GCC_SRCS += param_scale.c +GCC_SRCS += sine.c +GCC_SRCS += smooth.c +GCC_SRCS += synth_debug.c +GCC_SRCS += vcf.c +GCC_SRCS += vco.c +GCC_SRCS += vector_utils.c +GCC_SRCS += voice.c +GCC_SRCS += wavetable.c -LIBSRC_PATH ?= $(realpath ../../../../libsrc) -VST2_SDK_PATH ?= $(realpath ../../sdk/vst/vstsdk2.4) \ No newline at end of file