Signed-off-by: falkTX <falktx@falktx.com>pull/117/head
@@ -75,7 +75,7 @@ jobs: | |||||
files: | | files: | | ||||
*.tar.gz | *.tar.gz | ||||
linux-embed: | |||||
linux-headless: | |||||
runs-on: ubuntu-latest | runs-on: ubuntu-latest | ||||
container: | container: | ||||
image: ubuntu:20.04 | image: ubuntu:20.04 | ||||
@@ -92,11 +92,11 @@ jobs: | |||||
submodules: recursive | submodules: recursive | ||||
- name: Set up dependencies | - name: Set up dependencies | ||||
run: | | run: | | ||||
./.github/workflows/bootstrap-deps.sh linux-embed | |||||
./.github/workflows/bootstrap-deps.sh linux-headless | |||||
apt-get install -yqq libasound2-dev libfftw3-dev libfreetype6-dev pkg-config | apt-get install -yqq libasound2-dev libfftw3-dev libfreetype6-dev pkg-config | ||||
- name: Build | - name: Build | ||||
run: | | run: | | ||||
meson setup build --buildtype=release --prefix=/usr -Dlinux-embed=true | |||||
meson setup build --buildtype=release --prefix=/usr -Dlinux-headless=true | |||||
ninja -C build | ninja -C build | ||||
macos: | macos: | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
juce5_srcs = [ | juce5_srcs = [ | ||||
'source/modules/juce_audio_basics/juce_audio_basics.cpp', | 'source/modules/juce_audio_basics/juce_audio_basics.cpp', | ||||
'source/modules/juce_audio_formats/juce_audio_formats.cpp', | 'source/modules/juce_audio_formats/juce_audio_formats.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
juce60_srcs = [ | juce60_srcs = [ | ||||
'source/modules/juce_audio_basics/juce_audio_basics.cpp', | 'source/modules/juce_audio_basics/juce_audio_basics.cpp', | ||||
'source/modules/juce_audio_formats/juce_audio_formats.cpp', | 'source/modules/juce_audio_formats/juce_audio_formats.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
juce61_srcs = [ | juce61_srcs = [ | ||||
'source/modules/juce_audio_basics/juce_audio_basics.cpp', | 'source/modules/juce_audio_basics/juce_audio_basics.cpp', | ||||
'source/modules/juce_audio_formats/juce_audio_formats.cpp', | 'source/modules/juce_audio_formats/juce_audio_formats.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
juce7_srcs = [ | juce7_srcs = [ | ||||
'source/modules/juce_audio_basics/juce_audio_basics.cpp', | 'source/modules/juce_audio_basics/juce_audio_basics.cpp', | ||||
'source/modules/juce_audio_formats/juce_audio_formats.cpp', | 'source/modules/juce_audio_formats/juce_audio_formats.cpp', | ||||
@@ -36,10 +36,10 @@ if libdir.contains('/') | |||||
libdir = 'lib' | libdir = 'lib' | ||||
endif | endif | ||||
linux_embed = get_option('linux-embed') | |||||
linux_headless = get_option('linux-headless') | |||||
build_lv2 = get_option('build-lv2') | build_lv2 = get_option('build-lv2') | ||||
build_vst2 = get_option('build-vst2') and not linux_embed | |||||
build_vst3 = get_option('build-vst3') and not linux_embed | |||||
build_vst2 = get_option('build-vst2') and not linux_headless | |||||
build_vst3 = get_option('build-vst3') and not linux_headless | |||||
build_juce5_only = get_option('build-juce5-only') | build_juce5_only = get_option('build-juce5-only') | ||||
build_juce60_only = get_option('build-juce60-only') | build_juce60_only = get_option('build-juce60-only') | ||||
build_juce61_only = get_option('build-juce61-only') | build_juce61_only = get_option('build-juce61-only') | ||||
@@ -96,7 +96,7 @@ if os_linux | |||||
dependencies_devices = [ | dependencies_devices = [ | ||||
dependency('alsa'), | dependency('alsa'), | ||||
] | ] | ||||
if not linux_embed | |||||
if not linux_headless | |||||
dependencies += [ | dependencies += [ | ||||
dependency('freetype2'), | dependency('freetype2'), | ||||
dependency('x11').partial_dependency(link_args: false, links: false), | dependency('x11').partial_dependency(link_args: false, links: false), | ||||
@@ -251,7 +251,7 @@ elif os_windows | |||||
build_flags_cpp += [ | build_flags_cpp += [ | ||||
'-fpermissive', | '-fpermissive', | ||||
] | ] | ||||
elif linux_embed | |||||
elif linux_headless | |||||
build_flags += [ | build_flags += [ | ||||
'-DLINUX=1', | '-DLINUX=1', | ||||
] | ] | ||||
@@ -22,7 +22,7 @@ option('sse-optimizations', | |||||
description: 'Enable SSE optimizations', | description: 'Enable SSE optimizations', | ||||
) | ) | ||||
option('linux-embed', | |||||
option('linux-headless', | |||||
type: 'boolean', | type: 'boolean', | ||||
value: false, | value: false, | ||||
description: 'DSP-only plugin builds, without editor/GUI', | description: 'DSP-only plugin builds, without editor/GUI', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/PluginProcessor.cpp', | 'source/PluginProcessor.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/PluginParameter.cpp', | 'source/PluginParameter.cpp', | ||||
'source/PluginProcessor.cpp', | 'source/PluginProcessor.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/DRowAudioFilter.cpp', | 'source/DRowAudioFilter.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/DRowAudioFilter.cpp', | 'source/DRowAudioFilter.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/DRowAudioFilter.cpp', | 'source/DRowAudioFilter.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/DRowAudioFilter.cpp', | 'source/DRowAudioFilter.cpp', | ||||
'../drowaudio-common/dRowAudio_AllpassFilter.cpp', | '../drowaudio-common/dRowAudio_AllpassFilter.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/PluginProcessor.cpp', | 'source/PluginProcessor.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/PluginProcessor.cpp', | 'source/PluginProcessor.cpp', | ||||
'source/dsp/eqdsp.cpp', | 'source/dsp/eqdsp.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugins = [ | plugins = [ | ||||
'arctican-function', | 'arctican-function', | ||||
'arctican-pilgrim', | 'arctican-pilgrim', | ||||
@@ -72,7 +72,7 @@ plugin_include_dirs = [ | |||||
############################################################################### | ############################################################################### | ||||
# dependencies | # dependencies | ||||
if os_linux and not linux_embed | |||||
if os_linux and not linux_headless | |||||
dependencies_plugin = [ | dependencies_plugin = [ | ||||
dependency('x11'), | dependency('x11'), | ||||
dependency('xext'), | dependency('xext'), | ||||
@@ -211,7 +211,7 @@ if build_lv2 or build_vst2 | |||||
plugin_extra_dependencies += [ | plugin_extra_dependencies += [ | ||||
cc.find_library('opengl32'), | cc.find_library('opengl32'), | ||||
] | ] | ||||
elif not linux_embed | |||||
elif not linux_headless | |||||
plugin_extra_dependencies += [ | plugin_extra_dependencies += [ | ||||
dependency('gl') | dependency('gl') | ||||
] | ] | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/PluginProcessor.cpp', | 'source/PluginProcessor.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/TalCore.cpp', | 'source/TalCore.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/TalCore.cpp', | 'source/TalCore.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/TalCore.cpp', | 'source/TalCore.cpp', | ||||
'source/Engine/Lfo.cpp', | 'source/Engine/Lfo.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/TalCore.cpp', | 'source/TalCore.cpp', | ||||
'source/Engine/Lfo.cpp', | 'source/Engine/Lfo.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/TalCore.cpp', | 'source/TalCore.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/TalCore.cpp', | 'source/TalCore.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/TalCore.cpp', | 'source/TalCore.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/TalCore.cpp', | 'source/TalCore.cpp', | ||||
'source/engine/vocoder/Fft.cpp', | 'source/engine/vocoder/Fft.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/FaustUIBridge.cpp', | 'source/FaustUIBridge.cpp', | ||||
'source/BinaryData.cpp', | 'source/BinaryData.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/Vex-src.cpp', | 'source/Vex-src.cpp', | ||||
]) | ]) | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/ADSRenv.cpp', | 'source/ADSRenv.cpp', | ||||
'source/synth.cpp', | 'source/synth.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugins = [ | plugins = [ | ||||
'vitalium', | 'vitalium', | ||||
] | ] | ||||
@@ -150,7 +150,7 @@ foreach plugin : plugins | |||||
plugin_extra_dependencies += [ | plugin_extra_dependencies += [ | ||||
cc.find_library('opengl32'), | cc.find_library('opengl32'), | ||||
] | ] | ||||
elif not linux_embed | |||||
elif not linux_headless | |||||
plugin_extra_dependencies += [ | plugin_extra_dependencies += [ | ||||
dependency('gl') | dependency('gl') | ||||
] | ] | ||||
@@ -46,7 +46,7 @@ plugin_extra_include_dirs = include_directories([ | |||||
'third_party', | 'third_party', | ||||
]) | ]) | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'BinaryData.cpp', | 'BinaryData.cpp', | ||||
'source/unity_build/common.cpp', | 'source/unity_build/common.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugins = [ | plugins = [ | ||||
'swankyamp', | 'swankyamp', | ||||
] | ] | ||||
@@ -157,7 +157,7 @@ foreach plugin : plugins | |||||
plugin_extra_dependencies += [ | plugin_extra_dependencies += [ | ||||
cc.find_library('opengl32'), | cc.find_library('opengl32'), | ||||
] | ] | ||||
elif not linux_embed | |||||
elif not linux_headless | |||||
plugin_extra_dependencies += [ | plugin_extra_dependencies += [ | ||||
dependency('gl') | dependency('gl') | ||||
] | ] | ||||
@@ -5,7 +5,7 @@ plugin_extra_include_dirs = include_directories([ | |||||
'thirdparty/optional-lite/include', | 'thirdparty/optional-lite/include', | ||||
]) | ]) | ||||
if linux_embed | |||||
if linux_headless | |||||
plugin_srcs = files([ | plugin_srcs = files([ | ||||
'source/PluginProcessor.cpp', | 'source/PluginProcessor.cpp', | ||||
'source/Utils.cpp', | 'source/Utils.cpp', | ||||
@@ -1,6 +1,6 @@ | |||||
############################################################################### | ############################################################################### | ||||
if linux_embed | |||||
if linux_headless | |||||
plugins = [ | plugins = [ | ||||
] | ] | ||||
else | else | ||||
@@ -141,7 +141,7 @@ foreach plugin : plugins | |||||
plugin_extra_dependencies += [ | plugin_extra_dependencies += [ | ||||
cc.find_library('opengl32'), | cc.find_library('opengl32'), | ||||
] | ] | ||||
elif not linux_embed | |||||
elif not linux_headless | |||||
plugin_extra_dependencies += [ | plugin_extra_dependencies += [ | ||||
dependency('gl') | dependency('gl') | ||||
] | ] | ||||