Author: akhaldi Date: Sat Oct 9 14:34:03 2010 New Revision: 49073
URL: http://svn.reactos.org/svn/reactos?rev=49073&view=rev Log: [CMAKE] - Fix libmpg123 and add it to build.
Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt
Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/CMake... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] Sat Oct 9 14:34:03 2010 @@ -6,7 +6,7 @@ add_subdirectory(freetype) add_subdirectory(fullfat) #add_subdirectory(icu4ros) -#add_subdirectory(libmpg123) +add_subdirectory(libmpg123) add_subdirectory(libsamplerate) add_subdirectory(libwine) add_subdirectory(libxml2)
Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libmp... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Sat Oct 9 14:34:03 2010 @@ -1,13 +1,14 @@ -add_definitions(-DOPT_I386) -add_definitions(-DREAL_IS_FLOAT) -add_definitions(-DNOXFERMEM) -add_definitions(-DHAVE_CONFIG_H) -add_definitions(-DEOVERFLOW=75) -add_definitions(-Dlseek=_lseek) -add_definitions(-Dread=_read) -add_definitions(-Dstrdup=_strdup) +add_definitions( + -DOPT_I386 + -DREAL_IS_FLOAT + -DNOXFERMEM + -DHAVE_CONFIG_H + -DEOVERFLOW=75 + -Dlseek=_lseek + -Dread=_read + -Dstrdup=_strdup)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)
add_library(libmpg123 compat.c @@ -35,3 +36,5 @@ synth_real.c synth_s32.c tabinit.c) + +add_dependencies(libmpg123 psdk)