[CMAKE]

- Fix libmpg123 and add it to build.

svn path=/branches/cmake-bringup/; revision=49073

diff --git a/lib/3rdparty/CMakeLists.txt b/lib/3rdparty/CMakeLists.txt
index 0115771..049a3e1 100644 (file)
--- a/lib/3rdparty/CMakeLists.txt
+++ b/lib/3rdparty/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(expat)
 add_subdirectory(freetype)
 add_subdirectory(fullfat)
 #add_subdirectory(icu4ros)
-#add_subdirectory(libmpg123)
+add_subdirectory(libmpg123)
 add_subdirectory(libsamplerate)
 add_subdirectory(libwine)
 add_subdirectory(libxml2)

diff --git a/lib/3rdparty/libmpg123/CMakeLists.txt b/lib/3rdparty/libmpg123/CMakeLists.txt
index 3b97ae5..afd33ef 100644 (file)
--- a/lib/3rdparty/libmpg123/CMakeLists.txt
+++ b/lib/3rdparty/libmpg123/CMakeLists.txt
@@ -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 @@ add_library(libmpg123
     synth_real.c
     synth_s32.c
     tabinit.c)
+
+add_dependencies(libmpg123 psdk)