hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

* build LADSPA-effect plugin after subdirs have been processed, otherwise LADSPA plugins are linked against Qt4 and so on

Browse Source 
* compile with -fno-strict-aliasing, fixes win32 builds of plugins



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1661 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-09-21 10:00:39 +00:00
parent 6ad44678aa
commit 77c40b9b90
6 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@@ -1,4 +1,27 @@
2008-09-21 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/ladspa_effect/cmt/src/delay.cpp:
initialize CMT_PluginDescriptor with correct number of ports
* plugins/ladspa_effect/cmt/src/freeverb/Components/allpass.h:
* plugins/ladspa_effect/cmt/src/freeverb/Components/comb.h:
* plugins/ladspa_effect/cmt/src/freeverb/Components/denormals.h:
fixed strict aliasing violation
* plugins/ladspa_effect/cmt/src/analogue.cpp:
initialize members
* plugins/ladspa_effect/swh/CMakeLists.txt:
* plugins/ladspa_effect/cmt/CMakeLists.txt:
* plugins/ladspa_effect/tap/CMakeLists.txt:
* plugins/ladspa_effect/caps/basics.h:
* plugins/ladspa_effect/CMakeLists.txt:
- build LADSPA-effect plugin after subdirs have been processed,
otherwise LADSPA plugins are linked against Qt4 and so on
- compile with -fno-strict-aliasing, fixes win32 builds of plugins
2008-09-21 Paul Giblock <drfaygo/at/gmail/dot/com>
* include/config_mgr.h:
* include/setup_dialog.h:
* src/gui/main_window.cpp:

9
plugins/ladspa_effect/CMakeLists.txt
View File

@@ -1,7 +1,3 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(ladspaeffect ladspa_effect.cpp ladspa_controls.cpp ladspa_control_dialog.cpp ladspa_subplugin_features.cpp ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h ladspa_subplugin_features.h MOCFILES ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
IF(WANT_CAPS)
ADD_SUBDIRECTORY(caps)
ENDIF(WANT_CAPS)
@@ -19,3 +15,8 @@ ADD_SUBDIRECTORY(cmt)
ENDIF(WANT_CMT)
INCLUDE(BuildPlugin)
BUILD_PLUGIN(ladspaeffect ladspa_effect.cpp ladspa_controls.cpp ladspa_control_dialog.cpp ladspa_subplugin_features.cpp ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h ladspa_subplugin_features.h MOCFILES ladspa_effect.h ladspa_controls.h ladspa_control_dialog.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)

2
plugins/ladspa_effect/caps/basics.h
View File

@@ -47,8 +47,6 @@
#include <stdio.h>
#include <stdint.h>
#include "lmmsconfig.h"
#include <ladspa.h>
#define BOUNDED (LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE)

4
plugins/ladspa_effect/cmt/CMakeLists.txt
View File

@@ -4,10 +4,12 @@ ADD_LIBRARY(cmt MODULE ${SOURCES})
INSTALL(TARGETS cmt LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa)
SET_TARGET_PROPERTIES(cmt PROPERTIES PREFIX "")
SET_TARGET_PROPERTIES(cmt PROPERTIES COMPILE_FLAGS "-Wall -O3 -fPIC")
SET_TARGET_PROPERTIES(cmt PROPERTIES COMPILE_FLAGS "-Wall -O3 -fno-strict-aliasing")
IF(LMMS_BUILD_WIN32)
ADD_CUSTOM_COMMAND(TARGET cmt POST_BUILD COMMAND /opt/mingw/bin/i586-mingw32-strip ${CMAKE_CURRENT_BINARY_DIR}/cmt.dll)
ELSE(LMMS_BUILD_WIN32)
SET_TARGET_PROPERTIES(cmt PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC")
ENDIF(LMMS_BUILD_WIN32)
IF(LMMS_BUILD_APPLE)

5
plugins/ladspa_effect/swh/CMakeLists.txt
View File

@@ -4,6 +4,7 @@ ADD_DEFINITIONS(-DFFTW3)
IF(LMMS_HAVE_FFTW3F)
LINK_LIBRARIES(-lfftw3f)
ENDIF(LMMS_HAVE_FFTW3F)
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
FILE(GLOB PLUGIN_SOURCES *.c)
FOREACH(_item ${PLUGIN_SOURCES})
@@ -12,9 +13,11 @@ FOREACH(_item ${PLUGIN_SOURCES})
ADD_LIBRARY(${_plugin} MODULE ${_item})
INSTALL(TARGETS ${_plugin} LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa)
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES PREFIX "")
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "-O3 -Wall -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC")
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "-O3 -Wall -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -c -fno-strict-aliasing")
IF(LMMS_BUILD_WIN32)
ADD_CUSTOM_COMMAND(TARGET ${_plugin} POST_BUILD COMMAND /opt/mingw/bin/i586-mingw32-strip ${CMAKE_CURRENT_BINARY_DIR}/${_plugin}.dll)
ELSE(LMMS_BUILD_WIN32)
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC -DPIC")
ENDIF(LMMS_BUILD_WIN32)
IF(LMMS_BUILD_APPLE)
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined -Bsymbolic -lm")

4
plugins/ladspa_effect/tap/CMakeLists.txt
View File

@@ -5,9 +5,11 @@ FOREACH(_item ${PLUGIN_SOURCES})
ADD_LIBRARY(${_plugin} MODULE ${_item})
INSTALL(TARGETS ${_plugin} LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa)
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES PREFIX "")
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "-O3 -Wno-write-strings -Wall -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math -c -fPIC -DPIC")
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "-O3 -Wno-write-strings -Wall -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math -c")
IF(LMMS_BUILD_WIN32)
ADD_CUSTOM_COMMAND(TARGET ${_plugin} POST_BUILD COMMAND /opt/mingw/bin/i586-mingw32-strip ${CMAKE_CURRENT_BINARY_DIR}/${_plugin}.dll)
ELSE(LMMS_BUILD_WIN32)
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC -DPIC")
ENDIF(LMMS_BUILD_WIN32)
IF(LMMS_BUILD_APPLE)
SET_TARGET_PROPERTIES(${_plugin} PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -no-undefined -Bsymbolic -lm")