Browse Source

Merge remote-tracking branch 'lanodan/bugfix/cmake-wayland-vst'

The VST plugin done via GTK for non-apple & non-windows pulls
<gdk/gdkx.h>, which is specific to X11 and thus isn't available in a
pure-wayland system.

Reference-to: https://github.com/tenacityteam/tenacity/pull/620
pull/634/head
Sol Fisher Romanoff 2 months ago
parent
commit
0ccf25c27d
No known key found for this signature in database GPG Key ID: E0ACA5D1C244E1F
  1. 4
      BUILDING.md
  2. 15
      CMakeLists.txt
  3. 4
      src/CMakeLists.txt

4
BUILDING.md

@ -340,5 +340,5 @@ has outdated libraries that do not build with Tenacity.
* **VAMP** (ON|OFF): VAMP plugin hosting support. Requires VAMP host SDK.
* **LV2** (ON|OFF): LV2 plugin hosting support. Requires LV2, lilv, and
suil libraries.
* **VST2** (ON|OFF): VST2 plugin hosting support. No libraries are required.
ON by default.
* **VST2** (ON|OFF): VST2 plugin hosting support. Requires GTK with X11
support on non-Apple/Windows.

15
CMakeLists.txt

@ -788,17 +788,18 @@ else()
message( STATUS "LV2 plugin hosting disabled. Requires LV2, lilv, and suil libraries." )
endif()
option( VST2 "VST2 plugin host support" ON )
if( VST2 )
message( STATUS "VST2 plugin host support enabled." )
else()
message( STATUS "VST2 plugin host support disabled." )
endif()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows" )
find_package( GLIB REQUIRED )
find_package( GTK 3.0 REQUIRED )
pkg_check_modules(GDK3_X11 gdk-x11-3.0)
endif()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows" )
cmake_dependent_option( VST2 "Use VST2 plug-in support [ON, OFF]" ON "GDK3_X11_FOUND" OFF)
else()
option( VST2 "Use VST2 plug-in support" ON)
endif()
set(USE_VST ${VST2} CACHE INTERNAL "")
if( NOT WIN32 )
# wxWidgets 3.1 can be explicitly selected if both 3.0 and 3.1 are installed by setting

4
src/CMakeLists.txt

@ -57,10 +57,6 @@ endif()
cmd_option( use_ladspa "Use LADSPA plug-in support [ON, OFF]" ON )
set( USE_LADSPA ${use_ladspa} CACHE INTERNAL "" )
# Handle VST option
cmd_option( use_vst "Use VST2 plug-in support [ON, OFF]" ON )
set( USE_VST ${use_vst} CACHE INTERNAL "" )
# ~~~
# General source files
# ~~~

Loading…
Cancel
Save