From 8bcbff3fea4e9f1c13dbbb8f043a718c4b1676d3 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Mon, 25 Nov 2019 18:41:00 +0000 Subject: [PATCH] - use .mk git-svn-id: http://moon:8086/svn/software/trunk/projects/JaySynth@699 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- sdk/juce/Makefile | 18 +----------------- sdk/juce/Makefile.JUCE-4.3.1 | 7 ------- sdk/juce/Makefile.JUCE-5.4.5 | 8 -------- sdk/juce/juce-3.1.1.mk | 17 +++++++++++++++++ 4 files changed, 18 insertions(+), 32 deletions(-) create mode 100644 sdk/juce/juce-3.1.1.mk diff --git a/sdk/juce/Makefile b/sdk/juce/Makefile index e78aa53..a06f7bd 100644 --- a/sdk/juce/Makefile +++ b/sdk/juce/Makefile @@ -3,23 +3,7 @@ PKG_VER := JUCE-3.1.1 TARGET := LINUX BUILD_TARGET := libjuce.a -SRCS := modules/juce_core/juce_core.cpp -SRCS += modules/juce_data_structures/juce_data_structures.cpp -SRCS += modules/juce_events/juce_events.cpp -SRCS += modules/juce_graphics/juce_graphics.cpp -SRCS += modules/juce_gui_basics/juce_gui_basics.cpp -SRCS += modules/juce_gui_extra/juce_gui_extra.cpp -SRCS += modules/juce_audio_basics/juce_audio_basics.cpp -SRCS += modules/juce_audio_devices/juce_audio_devices.cpp -SRCS += modules/juce_audio_formats/juce_audio_formats.cpp -SRCS += modules/juce_audio_processors/juce_audio_processors.cpp -SRCS += modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp -SRCS += modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp -SRCS += modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp - -DEFINES := -DHAVE_LROUND -INCLUDES := -I ../vst/vstsdk2.4 - +include juce-${PKG_VER}.mk include pkg.mk diff --git a/sdk/juce/Makefile.JUCE-4.3.1 b/sdk/juce/Makefile.JUCE-4.3.1 index f5bf973..0e56521 100644 --- a/sdk/juce/Makefile.JUCE-4.3.1 +++ b/sdk/juce/Makefile.JUCE-4.3.1 @@ -1,8 +1,3 @@ -CONFIG ?= release -PKG_VER := JUCE-4.3.1 -TARGET := LINUX -BUILD_TARGET := libjuce.a - SRCS := modules/juce_core/juce_core.cpp SRCS += modules/juce_data_structures/juce_data_structures.cpp SRCS += modules/juce_events/juce_events.cpp @@ -23,6 +18,4 @@ INCLUDES := -I ../vst/vstsdk2.4 DEFINES += -DJUCE_APP_CONFIG_HEADER=\"JuceHeader.h.${PKG_VER}\" INCLUDES += -I${PKG_VER}/modules -include pkg.mk - diff --git a/sdk/juce/Makefile.JUCE-5.4.5 b/sdk/juce/Makefile.JUCE-5.4.5 index e811ee7..41e0ebd 100644 --- a/sdk/juce/Makefile.JUCE-5.4.5 +++ b/sdk/juce/Makefile.JUCE-5.4.5 @@ -1,8 +1,3 @@ -CONFIG ?= release -PKG_VER := JUCE-5.4.5 -TARGET := LINUX -BUILD_TARGET := libjuce.a - SRCS := modules/juce_core/juce_core.cpp SRCS += modules/juce_data_structures/juce_data_structures.cpp SRCS += modules/juce_events/juce_events.cpp @@ -23,6 +18,3 @@ INCLUDES := -I ../vst/vstsdk2.4 DEFINES += -DJUCE_APP_CONFIG_HEADER=\"JuceHeader.h.${PKG_VER}\" INCLUDES += -I${PKG_VER}/modules -include pkg.mk - - diff --git a/sdk/juce/juce-3.1.1.mk b/sdk/juce/juce-3.1.1.mk new file mode 100644 index 0000000..dd446c3 --- /dev/null +++ b/sdk/juce/juce-3.1.1.mk @@ -0,0 +1,17 @@ +SRCS := modules/juce_core/juce_core.cpp +SRCS += modules/juce_data_structures/juce_data_structures.cpp +SRCS += modules/juce_events/juce_events.cpp +SRCS += modules/juce_graphics/juce_graphics.cpp +SRCS += modules/juce_gui_basics/juce_gui_basics.cpp +SRCS += modules/juce_gui_extra/juce_gui_extra.cpp +SRCS += modules/juce_audio_basics/juce_audio_basics.cpp +SRCS += modules/juce_audio_devices/juce_audio_devices.cpp +SRCS += modules/juce_audio_formats/juce_audio_formats.cpp +SRCS += modules/juce_audio_processors/juce_audio_processors.cpp +SRCS += modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp +SRCS += modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp +SRCS += modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp + +DEFINES := -DHAVE_LROUND +INCLUDES := -I ../vst/vstsdk2.4 +