Browse Source

Fix cabbage build, enable it

tags/2018-04-16
falkTX 8 years ago
parent
commit
696f158b44
11 changed files with 18 additions and 48 deletions
  1. +1
    -1
      README
  2. +6
    -6
      ports/Makefile
  3. +1
    -6
      ports/cabbage/LV2-fx/premake.lua
  4. +1
    -6
      ports/cabbage/LV2-ins/premake.lua
  5. +1
    -6
      ports/cabbage/LV2-midi/premake.lua
  6. +1
    -6
      ports/cabbage/VST-fx/premake.lua
  7. +1
    -6
      ports/cabbage/VST-ins/premake.lua
  8. +1
    -6
      ports/cabbage/VST-midi/premake.lua
  9. +2
    -2
      ports/cabbage/source/CabbageLookAndFeel.cpp
  10. +1
    -1
      ports/cabbage/source/XYPad.cpp
  11. +2
    -2
      ports/cabbage/source/XYPad.h

+ 1
- 1
README View File

@@ -9,7 +9,7 @@ The source repository is layered out this way:
bin/ - directory where all the compiled binaries will be placed
libs/ - libraries
plugins/ - plugins developed and/or designed by the DISTRHO Team
ports/ - all plugin ports (plugins not made by us)
ports/ - plugin ports (plugins not made by us)
scripts/ - build scripts
sdks/ - SDKs must be placed here (VST SDK)



+ 6
- 6
ports/Makefile View File

@@ -21,9 +21,9 @@ lv2: libs
install -d ../bin/lv2
$(MAKE) -C arctican-function/LV2
$(MAKE) -C arctican-pilgrim/LV2
# $(MAKE) -C cabbage/LV2-fx
# $(MAKE) -C cabbage/LV2-ins
# $(MAKE) -C cabbage/LV2-midi
$(MAKE) -C cabbage/LV2-fx
$(MAKE) -C cabbage/LV2-ins
$(MAKE) -C cabbage/LV2-midi
$(MAKE) -C drowaudio-distortion/LV2
$(MAKE) -C drowaudio-distortionshaper/LV2
$(MAKE) -C drowaudio-flanger/LV2
@@ -52,9 +52,9 @@ vst: libs
install -d ../bin/vst
$(MAKE) -C arctican-function/VST
$(MAKE) -C arctican-pilgrim/VST
# $(MAKE) -C cabbage/VST-fx
# $(MAKE) -C cabbage/VST-ins
# $(MAKE) -C cabbage/VST-midi
$(MAKE) -C cabbage/VST-fx
$(MAKE) -C cabbage/VST-ins
$(MAKE) -C cabbage/VST-midi
$(MAKE) -C drowaudio-distortion/VST
$(MAKE) -C drowaudio-distortionshaper/VST
$(MAKE) -C drowaudio-flanger/VST


+ 1
- 6
ports/cabbage/LV2-fx/premake.lua View File

@@ -4,7 +4,7 @@ dofile("../../../scripts/make-project.lua")
package = make_juce_lv2_project("CabbagePluginEffectLv2")
project.bindir = "../../../bin/cabbage"
package.links = { package.links, "csound64" }
package.links = { package.links, "csound64", "sndfile", "FLAC", "vorbisenc", "vorbis", "ogg", "m" }
package.defines = { package.defines, "Cabbage_Plugin_LV2=1", "USE_DOUBLE=1", "CSOUND6=1" }
package.includepaths = {
@@ -18,11 +18,6 @@ package.libpaths = {
"/opt/kxstudio/lib"
}
package.links = {
package.links,
"sndfile"
}
package.files = {
matchfiles (
"../source/*.cpp",


+ 1
- 6
ports/cabbage/LV2-ins/premake.lua View File

@@ -4,7 +4,7 @@ dofile("../../../scripts/make-project.lua")
package = make_juce_lv2_project("CabbagePluginSynthLv2")
project.bindir = "../../../bin/cabbage"
package.links = { package.links, "csound64" }
package.links = { package.links, "csound64", "sndfile", "FLAC", "vorbisenc", "vorbis", "ogg", "m" }
package.defines = { package.defines, "Cabbage_Plugin_Synth=1", "Cabbage_Plugin_LV2=1", "USE_DOUBLE=1", "CSOUND6=1" }
package.includepaths = {
@@ -18,11 +18,6 @@ package.libpaths = {
"/opt/kxstudio/lib"
}
package.links = {
package.links,
"sndfile"
}
package.files = {
matchfiles (
"../source/*.cpp",


+ 1
- 6
ports/cabbage/LV2-midi/premake.lua View File

@@ -4,7 +4,7 @@ dofile("../../../scripts/make-project.lua")
package = make_juce_lv2_project("CabbagePluginMidiLv2")
project.bindir = "../../../bin/cabbage"
package.links = { package.links, "csound64" }
package.links = { package.links, "csound64", "sndfile", "FLAC", "vorbisenc", "vorbis", "ogg", "m" }
package.defines = { package.defines, "Cabbage_Plugin_Midi=1", "Cabbage_Plugin_LV2=1", "USE_DOUBLE=1", "CSOUND6=1" }
package.includepaths = {
@@ -18,11 +18,6 @@ package.libpaths = {
"/opt/kxstudio/lib"
}
package.links = {
package.links,
"sndfile"
}
package.files = {
matchfiles (
"../source/*.cpp",


+ 1
- 6
ports/cabbage/VST-fx/premake.lua View File

@@ -4,7 +4,7 @@ dofile("../../../scripts/make-project.lua")
package = make_juce_vst_project("CabbagePluginEffect")
project.bindir = "../../../bin/cabbage"
package.links = { package.links, "csound64" }
package.links = { package.links, "csound64", "sndfile", "FLAC", "vorbisenc", "vorbis", "ogg", "m" }
package.defines = { package.defines, "USE_DOUBLE=1", "CSOUND6=1" }
package.includepaths = {
@@ -18,11 +18,6 @@ package.libpaths = {
"/opt/kxstudio/lib"
}
package.links = {
package.links,
"sndfile"
}
package.files = {
matchfiles (
"../source/*.cpp",


+ 1
- 6
ports/cabbage/VST-ins/premake.lua View File

@@ -4,7 +4,7 @@ dofile("../../../scripts/make-project.lua")
package = make_juce_vst_project("CabbagePluginSynth")
project.bindir = "../../../bin/cabbage"
package.links = { package.links, "csound64" }
package.links = { package.links, "csound64", "sndfile", "FLAC", "vorbisenc", "vorbis", "ogg", "m" }
package.defines = { package.defines, "Cabbage_Plugin_Synth=1", "USE_DOUBLE=1", "CSOUND6=1" }
package.includepaths = {
@@ -18,11 +18,6 @@ package.libpaths = {
"/opt/kxstudio/lib"
}
package.links = {
package.links,
"sndfile"
}
package.files = {
matchfiles (
"../source/*.cpp",


+ 1
- 6
ports/cabbage/VST-midi/premake.lua View File

@@ -4,7 +4,7 @@ dofile("../../../scripts/make-project.lua")
package = make_juce_vst_project("CabbagePluginMidi")
project.bindir = "../../../bin/cabbage"
package.links = { package.links, "csound64" }
package.links = { package.links, "csound64", "sndfile", "FLAC", "vorbisenc", "vorbis", "ogg", "m" }
package.defines = { package.defines, "Cabbage_Plugin_Midi=1", "USE_DOUBLE=1", "CSOUND6=1" }
package.includepaths = {
@@ -18,11 +18,6 @@ package.libpaths = {
"/opt/kxstudio/lib"
}
package.links = {
package.links,
"sndfile"
}
package.files = {
matchfiles (
"../source/*.cpp",


+ 2
- 2
ports/cabbage/source/CabbageLookAndFeel.cpp View File

@@ -1300,7 +1300,7 @@ Image CabbageLookAndFeel::drawCheckMark()
path.lineTo(5, 10);
path.lineTo(10, 0);
g.setColour (Colours::cornflowerblue);
g.strokePath(path, 2.0f);
g.strokePath(path, PathStrokeType(2.0f));
return img;
}
@@ -2240,7 +2240,7 @@ Image CabbageLookAndFeelBasic::drawCheckMark()
path.lineTo(5, 10);
path.lineTo(10, 0);
g.setColour (Colours::cornflowerblue);
g.strokePath(path, 2.0f);
g.strokePath(path, PathStrokeType(2.0f));
return img;
}


+ 1
- 1
ports/cabbage/source/XYPad.cpp View File

@@ -264,7 +264,7 @@ void XYCanvas::paint(Graphics& g)
g.setColour(ballColour.withMultipliedSaturation(5));
g.setOpacity (pathOpacity);
g.strokePath (path, pathThickness);
g.strokePath (path, PathStrokeType(pathThickness));
}
// Ball h and v lines


+ 2
- 2
ports/cabbage/source/XYPad.h View File

@@ -81,13 +81,13 @@ public:
if (imageType == 0) {
pathLine.startNewSubPath(width*0.2, height*0.8);
pathLine.lineTo(width*0.7, height*0.2);
g.strokePath(pathLine, width*0.04);
g.strokePath(pathLine, PathStrokeType(width*0.04));
pathBall.addEllipse(width*0.6, height*0.45, width*0.2, width*0.2);
}
else if (imageType == 1) {
pathLine.startNewSubPath(width*0.2, height*0.8);
pathLine.lineTo(width*0.8, height*0.2);
g.strokePath(pathLine, width*0.05);
g.strokePath(pathLine, PathStrokeType(width*0.05));
Point<float> pt = pathLine.getPointAlongPath(pathLine.getLength()*0.6);
pathBall.addEllipse(pt.getX()-(width*0.1), pt.getY()-(width*0.1), width*0.2, width*0.2);
}


Loading…
Cancel
Save