Skip to content

Commit

Permalink
Simplify makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
falkTX committed Sep 25, 2018
1 parent de73a58 commit 3a2809d
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 323 deletions.
12 changes: 4 additions & 8 deletions .gitignore
@@ -1,19 +1,15 @@
*.a
*.d
*.o

*.exe
*.dll
*.dylib
*.so
*.zip

.kdev_include_paths
.kdev4/

bin/*-dssi/
bin/*.lv2/
bin/PowerJuice
bin/PowerJuiceX2
bin/StutterJuice
bin/TriggerJuice
bin/VectorJuice
bin/WobbleJuice
bin/
build/
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "dpf"]
path = dpf
url = git://github.com/DISTRHO/DPF
url = https://github.com/DISTRHO/DPF
18 changes: 15 additions & 3 deletions Makefile
Expand Up @@ -4,26 +4,37 @@
# Created by falkTX
#

all: libs plugins gen
include dpf/Makefile.base.mk

all: dgl plugins gen

# --------------------------------------------------------------

libs:
dgl:
ifeq ($(HAVE_DGL),true)
$(MAKE) -C dpf/dgl
endif

plugins: libs
plugins: dgl
$(MAKE) all -C plugins/PowerJuice
$(MAKE) all -C plugins/PowerJuiceX2
$(MAKE) all -C plugins/StutterJuice
$(MAKE) all -C plugins/TriggerJuice
$(MAKE) all -C plugins/VectorJuice
$(MAKE) all -C plugins/WobbleJuice

ifneq ($(CROSS_COMPILING),true)
gen: plugins dpf/utils/lv2_ttl_generator
@$(CURDIR)/dpf/utils/generate-ttl.sh
ifeq ($(MACOS),true)
@$(CURDIR)/dpf/utils/generate-vst-bundles.sh
endif

dpf/utils/lv2_ttl_generator:
$(MAKE) -C dpf/utils/lv2-ttl-generator
else
gen:
endif

# --------------------------------------------------------------

Expand All @@ -36,6 +47,7 @@ clean:
$(MAKE) clean -C plugins/TriggerJuice
$(MAKE) clean -C plugins/VectorJuice
$(MAKE) clean -C plugins/WobbleJuice
rm -rf bin build

# --------------------------------------------------------------

Expand Down
137 changes: 0 additions & 137 deletions Makefile.mk

This file was deleted.

3 changes: 0 additions & 3 deletions bin/README

This file was deleted.

2 changes: 1 addition & 1 deletion dpf
Submodule dpf updated 73 files
+2 −0 .gitignore
+18 −0 .travis.yml
+10 −0 .travis/before_install.sh
+16 −0 .travis/install.sh
+14 −0 .travis/script-linux.sh
+17 −0 .travis/script-macos.sh
+20 −0 .travis/script-win32.sh
+20 −0 .travis/script-win64.sh
+54 −0 Makefile
+236 −0 Makefile.base.mk
+206 −0 Makefile.plugins.mk
+3 −2 README.md
+1 −1 dgl/Application.hpp
+46 −46 dgl/Makefile
+0 −127 dgl/Makefile.mk
+2 −2 dgl/src/Application.cpp
+4 −4 dgl/src/NanoVG.cpp
+4 −4 dgl/src/WidgetPrivateData.hpp
+86 −39 dgl/src/Window.cpp
+2 −2 dgl/src/nanovg/fontstash.h
+0 −3 dgl/src/pugl/pugl_osx.m
+2 −2 dgl/src/pugl/pugl_win.cpp
+1 −1 dgl/src/sofd/libsofd.c
+102 −4 distrho/DistrhoPlugin.hpp
+2 −0 distrho/DistrhoPluginMain.cpp
+2 −1 distrho/DistrhoUI.hpp
+2 −0 distrho/DistrhoUIMain.cpp
+1 −1 distrho/extra/Base64.hpp
+3 −3 distrho/src/DistrhoDefines.h
+7 −7 distrho/src/DistrhoPlugin.cpp
+68 −12 distrho/src/DistrhoPluginCarla.cpp
+56 −7 distrho/src/DistrhoPluginInternal.hpp
+90 −23 distrho/src/DistrhoPluginJack.cpp
+35 −15 distrho/src/DistrhoPluginLADSPA+DSSI.cpp
+107 −37 distrho/src/DistrhoPluginLV2.cpp
+47 −24 distrho/src/DistrhoPluginLV2export.cpp
+324 −76 distrho/src/DistrhoPluginVST.cpp
+1 −1 distrho/src/DistrhoUI.cpp
+14 −3 distrho/src/DistrhoUIDSSI.cpp
+20 −15 distrho/src/DistrhoUIInternal.hpp
+34 −1 distrho/src/DistrhoUILV2.cpp
+92 −31 distrho/src/vestige/vestige.h
+47 −0 examples/Info/DistrhoPluginInfo.h
+288 −0 examples/Info/InfoExamplePlugin.cpp
+222 −0 examples/Info/InfoExampleUI.cpp
+45 −0 examples/Info/Makefile
+10 −0 examples/Info/README.md
+30 −0 examples/Latency/DistrhoPluginInfo.h
+251 −0 examples/Latency/LatencyExamplePlugin.cpp
+36 −0 examples/Latency/Makefile
+8 −0 examples/Latency/README.md
+34 −0 examples/Meters/DistrhoPluginInfo.h
+284 −0 examples/Meters/ExamplePluginMeters.cpp
+254 −0 examples/Meters/ExampleUIMeters.cpp
+53 −0 examples/Meters/Makefile
+8 −0 examples/Meters/README.md
+31 −0 examples/MidiThrough/DistrhoPluginInfo.h
+35 −0 examples/MidiThrough/Makefile
+137 −0 examples/MidiThrough/MidiThroughExamplePlugin.cpp
+6 −0 examples/MidiThrough/README.md
+30 −0 examples/Parameters/DistrhoPluginInfo.h
+292 −0 examples/Parameters/ExamplePluginParameters.cpp
+244 −0 examples/Parameters/ExampleUIParameters.cpp
+54 −0 examples/Parameters/Makefile
+9 −0 examples/Parameters/README.md
+31 −0 examples/States/DistrhoPluginInfo.h
+316 −0 examples/States/ExamplePluginStates.cpp
+287 −0 examples/States/ExampleUIStates.cpp
+53 −0 examples/States/Makefile
+9 −0 examples/States/README.md
+6 −6 utils/generate-ttl.sh
+0 −6 utils/generate-vst-bundles.sh
+1 −1 utils/png2rgba.py
130 changes: 0 additions & 130 deletions plugins/Makefile.mk

This file was deleted.

16 changes: 8 additions & 8 deletions plugins/PowerJuice/Makefile
Expand Up @@ -12,25 +12,25 @@ NAME = PowerJuice
# --------------------------------------------------------------
# Files to build

OBJS_DSP = \
PowerJuicePlugin.cpp.o
FILES_DSP = \
PowerJuicePlugin.cpp

OBJS_UI = \
PowerJuiceArtwork.cpp.o \
PowerJuiceUI.cpp.o
FILES_UI = \
PowerJuiceArtwork.cpp \
PowerJuiceUI.cpp

# --------------------------------------------------------------
# Do some magic

include ../Makefile.mk
include ../../dpf/Makefile.plugins.mk

# --------------------------------------------------------------
# Enable all possible plugin types

ifeq ($(LINUX),true)
all: jack lv2_one vst
all: jack lv2 vst
else
all: lv2_one vst
all: lv2 vst
endif

# --------------------------------------------------------------

0 comments on commit 3a2809d

Please sign in to comment.