LADSPA: Fix undefined reference due to vectorization (LMMS#4434)

sdasda7777 · Jun 19, 2018 · a9e2f11 · a9e2f11
1 parent 863ba57
commit a9e2f11
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt
@@ -7,6 +7,11 @@ LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
 FILE(GLOB PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.c")
 LIST(SORT PLUGIN_SOURCES)
 
+SET(COMPILE_FLAGS "${COMPILE_FLAGS} -O3 -Wall -fomit-frame-pointer -funroll-loops -ffast-math -fno-strict-aliasing")
+IF(NOT LMMS_BUILD_WIN32)
+ SET(COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC -DPIC")
+ENDIF()
+
 FOREACH(_item ${PLUGIN_SOURCES})
  GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
 
@@ -15,22 +20,15 @@ FOREACH(_item ${PLUGIN_SOURCES})
  IF(NOT ("${_plugin}" STREQUAL "vocoder_1337"))
  TARGET_LINK_LIBRARIES("${_plugin}" -lfftw3f)
  ENDIF()
+ IF(NOT MSVC)
+ TARGET_LINK_LIBRARIES("${_plugin}" m)
+ ENDIF()
  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 -fno-strict-aliasing")
  IF(LMMS_BUILD_WIN32)
  ADD_CUSTOM_COMMAND(TARGET "${_plugin}" POST_BUILD COMMAND "${STRIP}" \"$<TARGET_FILE:${_plugin}>\")
- 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} -Bsymbolic -lm")
- ELSEIF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD)
- SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm")
- ENDIF(LMMS_BUILD_APPLE)
- IF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU)
- SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
- ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU)
+ ENDIF()
+ SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS}")
 ENDFOREACH(_item ${PLUGIN_SOURCES})
 
 

diff --git a/plugins/LadspaEffect/tap/CMakeLists.txt b/plugins/LadspaEffect/tap/CMakeLists.txt
@@ -10,13 +10,8 @@ FOREACH(_item ${PLUGIN_SOURCES})
  IF(LMMS_BUILD_WIN32)
  ADD_CUSTOM_COMMAND(TARGET "${_plugin}" POST_BUILD COMMAND "${STRIP}" \"$<TARGET_FILE:${_plugin}>\")
  ENDIF(LMMS_BUILD_WIN32)
- IF(LMMS_BUILD_APPLE)
- SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Bsymbolic -lm")
- ELSEIF(NOT LMMS_BUILD_OPENBSD)
- SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm")
- ENDIF(LMMS_BUILD_APPLE)
- IF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU)
- SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
- ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU)
+ IF(NOT MSVC)
+ TARGET_LINK_LIBRARIES("${_plugin}" m)
+ ENDIF()
 ENDFOREACH(_item ${PLUGIN_SOURCES})