AacDecoder is now compiling under OS X

CMakeLists.txt

@@ -51,6 +51,7 @@ include_directories (
 add_subdirectory(src/core)
 add_subdirectory(src/musikbox)
 add_subdirectory(src/contrib/taglib_plugin)
+add_subdirectory(src/contrib/aacdecoder)
 add_subdirectory(src/contrib/oggdecoder)
 add_subdirectory(src/contrib/mpg123decoder)
 add_subdirectory(src/contrib/flacdecoder)

src/contrib/aacdecoder/AacDecoder.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "AacDecoder.h"
-#include <io.h>
 
 using musik::core::io::IDataStream;
 using musik::core::audio::IBuffer;

src/contrib/aacdecoder/CMakeLists.txt

@@ -1,33 +1,21 @@
-set ( aacdecoder_SOURCES
+set (aacdecoder_SOURCES
   aacdecoder_plugin.cpp
-	AACSourceSupplier.cpp
+  AacDecoderFactory.cpp
+  AacDecoder.cpp
   stdafx.cpp
-	drms.c
-	m4aAudioSource.cpp
-	mp4atom.c
-	mp4ff.c
-	mp4meta.c
-	mp4sample.c
-	mp4tagupdate.c
-	mp4util.c
-	)
-
-if(CMAKE_SYSTEM_NAME MATCHES "Windows")
-  add_definitions(-DWIN32)
-	if(NOT DEFINED MINGW)
-        	
-	endif(NOT DEFINED MINGW)
-else(CMAKE_SYSTEM_NAME MATCHES "Windows")
-  set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fpermissive)
-endif(CMAKE_SYSTEM_NAME MATCHES "Windows")
-
-add_definitions( 
-  -DXML_STATIC
-  -D_CRT_SECURE_NO_DEPRECATE
-  -D_DEBUG
+  drms/drms.c
+  mp4ff/mp4atom.c
+  mp4ff/mp4ff.c
+  mp4ff/mp4meta.c
+  mp4ff/mp4sample.c
+  mp4ff/mp4tagupdate.c
+  mp4ff/mp4util.c
 )
 
-add_library( aacdecoder SHARED ${aacdecoder_SOURCES} )
-target_link_libraries( aacdecoder ${musikCube_LINK_LIBS})
-
+include_directories(
+  "${CMAKE_CURRENT_SOURCE_DIR}/drms"
+  "${CMAKE_CURRENT_SOURCE_DIR}/mp4ff"
+)
 
+add_library(aacdecoder SHARED ${aacdecoder_SOURCES})
+target_link_libraries(aacdecoder ${musikbox_LINK_LIBS} faad)

src/contrib/aacdecoder/aacdecoder.vcproj

@@ -606,7 +606,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\accdecoder_plugin.cpp"
+				RelativePath=".\aacdecoder_plugin.cpp"
 				>
 			</File>
 			<File

src/contrib/aacdecoder/aacdecoder.vcxproj

@@ -155,7 +155,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AacDecoderFactory.cpp" />
-    <ClCompile Include="accdecoder_plugin.cpp" />
+    <ClCompile Include="aacdecoder_plugin.cpp" />
     <ClCompile Include="libfaad\bits.c" />
     <ClCompile Include="libfaad\cfft.c" />
     <ClCompile Include="libfaad\common.c" />

src/contrib/aacdecoder/aacdecoder.vcxproj.filters

@@ -219,7 +219,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="accdecoder_plugin.cpp">
+    <ClCompile Include="aacdecoder_plugin.cpp">
       <Filter>plugin</Filter>
     </ClCompile>
     <ClCompile Include="stdafx.cpp">