diff options
| -rw-r--r-- | libk3b/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libk3b/plugin/libsamplerate/float_cast.h | 36 |
2 files changed, 1 insertions, 37 deletions
diff --git a/libk3b/CMakeLists.txt b/libk3b/CMakeLists.txt index 8f51d69..0f7dc6f 100644 --- a/libk3b/CMakeLists.txt +++ b/libk3b/CMakeLists.txt @@ -57,6 +57,6 @@ tde_add_library( k3b SHARED AUTOMOC VERSION 3.0.0 EMBED k3bcore-static cddb-static k3bproject-static k3btools-static jobs-static k3bplugin-static ${VIDEODVDRIP_LIBRARIES} ${SUBLIBRARIES} - LINK dl tdeio-shared tdeui-shared k3bdevice-shared + LINK ${CMAKE_DL_LIBS} tdeio-shared tdeui-shared k3bdevice-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libk3b/plugin/libsamplerate/float_cast.h b/libk3b/plugin/libsamplerate/float_cast.h index 7088007..533b837 100644 --- a/libk3b/plugin/libsamplerate/float_cast.h +++ b/libk3b/plugin/libsamplerate/float_cast.h @@ -106,42 +106,6 @@ return intgr ; } -#elif (defined (__MWERKS__) && defined (macintosh)) - - /* This MacOS 9 solution was provided by Stephane Letz */ - - #undef HAVE_LRINT_REPLACEMENT - #define HAVE_LRINT_REPLACEMENT 1 - #include <math.h> - - #undef lrint - #undef lrintf - - #define lrint double2int - #define lrintf float2int - - inline int - float2int (float in) - { long res [2] ; - - asm - { fctiw in,in - stfd in,res - } - return res [1] ; - } /* float2int */ - - inline int - double2int (double in) - { long res [2] ; - - asm - { fctiw in,in - stfd in,res - } - return res [1] ; - } /* double2int */ - #elif (defined (__MACH__) && defined (__APPLE__)) /* For Apple MacOSX. */ |