Merge pull request #146 from florian-grond/master

added HOAUgens

Author: telephon

CMakeLists.txt

@@ -54,7 +54,7 @@ option(NOVA_SIMD "Build VBAP with nova-simd support." ON)
 option(CPP11 "Build with c++11." ON)
 option(NATIVE "Optimize for this specific machine." OFF)
 option(SYSTEM_STK "Use STK libraries from system" OFF)
-
+option(HOA_UGENS "Build with HOAUGens. Cannot be built on Windows or on embedded linux systems." OFF)
 option(NOVA_DISK_IO "Build with Nova's DiskIO UGens. Requires boost source tree, break warranty & eats your children." OFF)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")

README.md

@@ -72,6 +72,8 @@ Copy the `SC3plugins` folder to your Extensions folder (evaluate `Platform.userE
 
 NOTE: on macOS, if you want to install into `CMAKE_INSTALL_PREFIX`, you have to specify it by disabling the `IN_PLACE_BUILD` cmake option which defaults to ON (see below).
 
+**Note for SuperCollider < 3.9.1** The Supernova server on macOS and Windows incorrectly searches for plugins in the `/Extensions/plugins` directory. The scsynth server correctly searches for plugins in `/Extensions`. If Supernova is unable to find the sc3-plugins, make sure that they are located in `/Extensions/plugins`.
+
 ### Cmake Options
 
 + Set install target

source/CMakeLists.txt

@@ -77,7 +77,6 @@ macro(BUILD_PLUGIN PLUGIN_NAME PLUGIN_SOURCES PLUGIN_LIBS PLUGIN_DIR)
 
 endmacro()
 
-
 #-----------------------
 # plugins without extras
 #-----------------------
@@ -166,6 +165,16 @@ else()
     set(INSTALL_DESTINATION_DISTRO "SC3plugins")
 endif()
 
+# HOAUGens
+if (HOA_UGENS)
+    list(APPEND PLUGIN_DIRS HOAUGens)
+    if (CMAKE_COMPILER_IS_CLANG)
+        file(GLOB HOAUGensSources HOAUGens/*cpp)
+        foreach(HOAUGensSourceFile ${HOAUGensSources})
+            set_source_files_properties("${HOAUGensSourceFile}" PROPERTIES COMPILE_FLAGS "-fbracket-depth=4096")
+        endforeach(HOAUGensSourceFile)
+    endif()
+endif()
 
 foreach(DIR ${PLUGIN_DIRS})
     FIND_AND_BUILD_PLUGINS(${DIR})
@@ -218,17 +227,17 @@ BUILD_PLUGIN(complexRes
              "" "DEINDUGens")
 include_directories(DEINDUGens/include)
 BUILD_PLUGIN(JPverb
-"DEINDUGens/JPverbRaw.cpp" 
+"DEINDUGens/JPverbRaw.cpp"
              "" "DEINDUGens")
-             set_property(TARGET JPverb APPEND PROPERTY COMPILE_DEFINITIONS SC_FAUST_PREFIX="\"\"") 
-             set_property(TARGET JPverb APPEND PROPERTY COMPILE_DEFINITIONS mydsp=JPVERB) 
-             set_property(TARGET JPverb APPEND PROPERTY COMPILE_DEFINITIONS NDEBUG) 
+             set_property(TARGET JPverb APPEND PROPERTY COMPILE_DEFINITIONS SC_FAUST_PREFIX="\"\"")
+             set_property(TARGET JPverb APPEND PROPERTY COMPILE_DEFINITIONS mydsp=JPVERB)
+             set_property(TARGET JPverb APPEND PROPERTY COMPILE_DEFINITIONS NDEBUG)
 BUILD_PLUGIN(Greyhole
-"DEINDUGens/GreyholeRaw.cpp" 
+"DEINDUGens/GreyholeRaw.cpp"
              "" "DEINDUGens")
-             set_property(TARGET Greyhole APPEND PROPERTY COMPILE_DEFINITIONS SC_FAUST_PREFIX="\"\"") 
-             set_property(TARGET Greyhole APPEND PROPERTY COMPILE_DEFINITIONS mydsp=GREYHOLE) 
-             set_property(TARGET Greyhole APPEND PROPERTY COMPILE_DEFINITIONS NDEBUG) 
+             set_property(TARGET Greyhole APPEND PROPERTY COMPILE_DEFINITIONS SC_FAUST_PREFIX="\"\"")
+             set_property(TARGET Greyhole APPEND PROPERTY COMPILE_DEFINITIONS mydsp=GREYHOLE)
+             set_property(TARGET Greyhole APPEND PROPERTY COMPILE_DEFINITIONS NDEBUG)
 
 # MembraneUGens
 BUILD_PLUGIN(MembraneUGens "MembraneUGens/Membrane_shape.c;MembraneUGens/Membrane.cpp"
@@ -244,7 +253,7 @@ endif()
 # OteyPianoUGens
 BUILD_PLUGIN(OteyPianoUGens "OteyPianoUGens/OteyPiano.cpp;OteyPianoUGens/dwgs.cpp;OteyPianoUGens/filter.cpp;OteyPianoUGens/hammer.cpp;OteyPianoUGens/reverb.cpp"
              "" "OteyPianoUGens")
-             
+
 # PitchDetectionUGens
 file(GLOB PitchDetectionSources PitchDetection/*cpp)