Skip to content

[pull] master from audacity:master #561

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.

Sign up for GitHub

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

Merged
pull merged 2 commits into from
Feb 27, 2020
Merged

[pull] master from audacity:master #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
664dc59
Bug2289: alternative fix...
Paul-Licameli Feb 26, 2020
9657276
Fix linkage to sc4 plug-in
lllucius Feb 27, 2020
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
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,9 @@ add_subdirectory( "cmake-proxies/mod-nyq-bench" )
add_subdirectory( "cmake-proxies/mod-script-pipe" )

# Only need the sc4_1882 Ladspa plug-in on Windows and Mac
#if( CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
# add_subdirectory( "cmake-proxies/ladspa-plugins" )
#endif()
if( CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
add_subdirectory( "cmake-proxies/ladspa-plugins" )
endif()

# Uncomment what follows for symbol values.
#[[
Expand Down
2 changes: 1 addition & 1 deletion cmake-proxies/ladspa-plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ list( APPEND SOURCES
list( APPEND INCLUDES
PRIVATE
${_SRCDIR}
${topdir}/src/effects/ladspa
)

list( APPEND OPTIONS
PRIVATE
$<$<C_COMPILER_ID:AppleClang,Clang,GNU>:-D_init=__attribute__\(\(constructor\)\)_${TARGET}_init>
$<$<BOOL:HAVE_LRINTF>:-DHAVE_LRINTF=1>
)

set_target_property_all( ${TARGET}
Expand Down
2 changes: 2 additions & 0 deletions cmake-proxies/ladspa-plugins/ladspa-util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ typedef union {
} ls_pcast32;

// Sometimes it doesn't get defined, even though it eists and C99 is declared
#if !defined(HAVE_LRINTF)
long int lrintf (float x);
#endif

// 1.0 / ln(2)
#define LN2R 1.442695041f
Expand Down
Loading