Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added HOAUgens #146

Merged
merged 33 commits into from
Jun 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0fd70e1
added HOAUgens
florian-grond Jun 2, 2017
2aea881
added Readme
florian-grond Jun 2, 2017
c49ebfc
compiled HOAUgens with most recent Faust
florian-grond Jun 5, 2017
dd7b4e9
removed redundant classes
florian-grond Jun 5, 2017
a36f88f
compiled up to order 4 with most recent Faust version
florian-grond Jun 26, 2017
17ac693
updated HOA Ugens and CMakelist in oder to supress debugmessages and …
florian-grond Jan 6, 2018
83ff22b
added NOT WIN32 macro for -fbracket-depth flag
florian-grond Jan 7, 2018
e3b0e5f
update readme
florian-grond Jan 12, 2018
d9ca104
update readme
florian-grond Jan 12, 2018
27d67c0
change to if(APPLE) for bracketdepth
florian-grond Jan 28, 2018
265af6f
removed binaries from sources
florian-grond Jan 28, 2018
9738aec
changing to if(APPLE AND CMAKE_COMPILER_IS_CLANG)
florian-grond Jan 29, 2018
8871723
changed fbracket test to CMAKE_COMPILER_IS_CLANG
florian-grond Jan 29, 2018
fad983d
adressing Patrick's change requests
florian-grond Jan 31, 2018
de082bc
small worrding change
florian-grond Jan 31, 2018
749ddaf
adopting Brian's change requests
florian-grond Jan 31, 2018
363cd19
edit CMakeList adopting Brian's change request
florian-grond Jan 31, 2018
dd2a61d
add target specific clang compile flag
patrickdupuis Feb 1, 2018
b6a43b4
use set_property target append property
patrickdupuis Feb 1, 2018
646cee6
Merge pull request #1 from patrickdupuis/HOAUGens
florian-grond Feb 2, 2018
1390db6
readme fix
florian-grond Feb 3, 2018
c8586bb
typo fix CPP -> C++
florian-grond Feb 3, 2018
73e04f6
minor typo
florian-grond Feb 3, 2018
18f996f
Merge branch 'master' into master
mossheim Feb 3, 2018
ea84645
move set property to after target creation (#2)
patrickdupuis Feb 4, 2018
53408c5
set property per source file (#3)
patrickdupuis Feb 4, 2018
965cf3b
integrate most recent addition fro Pierre Lecomte
florian-grond Feb 17, 2018
589c89e
Merge branch 'master' of https://github.com/florian-grond/sc3-pluginsHOA
florian-grond Feb 17, 2018
939dfe3
fix CMakeList typo
florian-grond Feb 17, 2018
2e9ba54
added beam pattern option (#4)
Apr 26, 2018
e993ad1
add option to build HOAUGens (#5)
patrickdupuis Jun 12, 2018
6a039c4
improve the option's description (#6)
patrickdupuis Jun 12, 2018
55cd622
Add a basic README (#7)
patrickdupuis Jun 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 19 additions & 10 deletions source/CMakeLists.txt
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ macro(BUILD_PLUGIN PLUGIN_NAME PLUGIN_SOURCES PLUGIN_LIBS PLUGIN_DIR)

endmacro()


#-----------------------
# plugins without extras
#-----------------------
Expand Down Expand Up @@ -165,6 +164,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})
Expand Down Expand Up @@ -217,17 +226,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"
Expand All @@ -243,7 +252,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)

Expand Down
Loading