Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8dce0e4
Move calf to submodule
tresf Nov 5, 2017
8d428bc
Add CMakeLists.txt, use old Calf version
tresf Nov 5, 2017
aa542c5
Revert submodule to 0.0.60.0
tresf Nov 5, 2017
2631d22
Revert Calf to 0.0.18.2
tresf Nov 5, 2017
c540efc
Point calf submodule at fork
tresf Nov 6, 2017
ebd1fbd
Make it work
tresf Nov 6, 2017
c817ad3
Bump to Calf 0.90
tresf Nov 6, 2017
cd80f8e
Cleanup comments
tresf Nov 17, 2017
67adaf3
Namespace calf_plugins to veal_plugins
tresf Nov 19, 2017
a02730a
Nudge to latest commits
tresf Nov 19, 2017
0a0fd0a
Fix windows, bump to latest commits
tresf Nov 21, 2017
2e9f98d
Bump to latest changes at tresf/veal
tresf Dec 2, 2017
14d00cd
Tmp
JohannesLorenz Jan 2, 2018
ac14fa8
Fixes from the PR todo list
JohannesLorenz Jan 4, 2018
00b188e
DataFile upgrades
tresf Feb 5, 2018
ab72fe2
Add S&Q upgrades
tresf Feb 8, 2018
fb01511
Fix looping logic
tresf Feb 10, 2018
ca4690b
Switch back to lmms fork
tresf Feb 11, 2018
c29d2a8
Try again to bump submodule
tresf Feb 11, 2018
a1606ac
Move exprtk to non-volatile branch
tresf Jan 5, 2018
85860ec
Enable C++11 to fix Windows builds
tresf Feb 11, 2018
021e604
First attempt. Remove lists work, but adding has no effect.
JohannesLorenz Mar 16, 2018
62e1d8f
Fix all CALF effects' port numbers, ranges and defaults
JohannesLorenz Apr 2, 2018
2574408
Fix all CALF effects' port numbers, ranges and defaults
JohannesLorenz Apr 2, 2018
e313d62
Update CALF module. Code reading rework.
JohannesLorenz Apr 2, 2018
b156a82
Don't revert exprtk
tresf Apr 13, 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
Prev Previous commit
Next Next commit
Point calf submodule at fork
  • Loading branch information
tresf committed Dec 2, 2017
commit c540efc6e2062e96e769fce6af0cd81b8aeea93c
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
url = https://github.com/adplug/adplug.git
[submodule "plugins/LadspaEffect/calf/veal"]
path = plugins/LadspaEffect/calf/veal
url = https://github.com/lmms/veal
url = https://github.com/tresf/veal
[submodule "plugins/Xpressive/exprtk"]
path = plugins/Xpressive/exprtk
url = https://github.com/ArashPartow/exprtk
Expand Down
18 changes: 9 additions & 9 deletions plugins/LadspaEffect/calf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
# The last version of Calf that was LADSPA-capable is version 0.0.18.2

# Parse version info from autoconf
FILE(READ calf/configure.ac VERSION_FILE)
FILE(READ veal/configure.ac VERSION_FILE)
STRING(REPLACE "[" ";" VERSION_FILE ${VERSION_FILE} )
STRING(REPLACE "]" ";" VERSION_FILE ${VERSION_FILE} )
LIST(GET VERSION_FILE 2 VERSION)
CONFIGURE_FILE(config.h.in config.h)

FILE(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/calf/src/*.cpp")
FILE(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/veal/src/*.cpp")
LIST(SORT SOURCES)

# Skip files matching pattern
Expand All @@ -24,25 +24,25 @@ FOREACH(_item ${SOURCES})
ENDFOREACH()
ENDFOREACH()

ADD_LIBRARY(calf MODULE ${SOURCES})
ADD_LIBRARY(veal MODULE ${SOURCES})
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include"
"${CMAKE_BINARY_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/calf/src")
"${CMAKE_CURRENT_SOURCE_DIR}/veal/src")

INSTALL(TARGETS calf LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
SET_TARGET_PROPERTIES(calf PROPERTIES PREFIX "")
INSTALL(TARGETS veal LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
SET_TARGET_PROPERTIES(veal PROPERTIES PREFIX "")
SET(INLINE_FLAGS "")
IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
SET(INLINE_FLAGS "-finline-functions-called-once -finline-limit=80")
ENDIF()
SET_TARGET_PROPERTIES(calf PROPERTIES COMPILE_FLAGS "-fexceptions -O2 -finline-functions ${INLINE_FLAGS}")
SET_TARGET_PROPERTIES(veal PROPERTIES COMPILE_FLAGS "-fexceptions -O2 -finline-functions ${INLINE_FLAGS}")

# Don't strip if "Debug" or "RelWithDebInfo"
IF(LMMS_BUILD_WIN32 AND NOT CMAKE_BUILD_TYPE MATCHES "Deb")
ADD_CUSTOM_COMMAND(TARGET calf POST_BUILD COMMAND "${STRIP}" "$<TARGET_FILE:calf>")
ADD_CUSTOM_COMMAND(TARGET veal POST_BUILD COMMAND "${STRIP}" "$<TARGET_FILE:veal>")
ENDIF()
IF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD)
SET_TARGET_PROPERTIES(calf PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined")
SET_TARGET_PROPERTIES(veal PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined")
ENDIF()

1 change: 0 additions & 1 deletion plugins/LadspaEffect/calf/calf
Submodule calf deleted from d2f381
2 changes: 1 addition & 1 deletion plugins/LadspaEffect/calf/veal
Submodule veal updated from 816b4d to faa75e
2 changes: 1 addition & 1 deletion src/3rdparty/rpmalloc/rpmalloc