[osx/ios] fixed broken build that caught me napping

diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index 788ec0b..4bcf7b8 100644 (file)
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -1372,7 +1372,6 @@
                F56C7210131EC151000AD0F6 /* EncoderVorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderVorbis.h; sourceTree = "<group>"; };
                F56C7211131EC151000AD0F6 /* EncoderWav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderWav.cpp; sourceTree = "<group>"; };
                F56C7212131EC151000AD0F6 /* EncoderWav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderWav.h; sourceTree = "<group>"; };
-               F56C7214131EC151000AD0F6 /* lame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lame.h; sourceTree = "<group>"; };
                F56C721D131EC151000AD0F6 /* PlayerCoreConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlayerCoreConfig.h; path = playercorefactory/PlayerCoreConfig.h; sourceTree = "<group>"; };
                F56C721E131EC151000AD0F6 /* PlayerCoreFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PlayerCoreFactory.cpp; path = playercorefactory/PlayerCoreFactory.cpp; sourceTree = "<group>"; };
                F56C721F131EC151000AD0F6 /* PlayerCoreFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlayerCoreFactory.h; path = playercorefactory/PlayerCoreFactory.h; sourceTree = "<group>"; };
@@ -3543,7 +3542,6 @@
                F56C71FE131EC151000AD0F6 /* cdrip */ = {
                        isa = PBXGroup;
                        children = (
-                               F56C7213131EC151000AD0F6 /* lame */,
                                F56C71FF131EC151000AD0F6 /* CDDAReader.cpp */,
                                F56C7200131EC151000AD0F6 /* CDDAReader.h */,
                                F56C7201131EC151000AD0F6 /* CDDARipper.cpp */,
@@ -3568,14 +3566,6 @@
                        path = cdrip;
                        sourceTree = "<group>";
                };
-               F56C7213131EC151000AD0F6 /* lame */ = {
-                       isa = PBXGroup;
-                       children = (
-                               F56C7214131EC151000AD0F6 /* lame.h */,
-                       );
-                       path = lame;
-                       sourceTree = "<group>";
-               };
                F56C721B131EC151000AD0F6 /* cores */ = {
                        isa = PBXGroup;
                        children = (

diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index 2263122..e3c0991 100644 (file)
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -1561,7 +1561,6 @@
                F56C81F2131F42E6000AD0F6 /* EncoderVorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderVorbis.h; sourceTree = "<group>"; };
                F56C81F3131F42E6000AD0F6 /* EncoderWav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderWav.cpp; sourceTree = "<group>"; };
                F56C81F4131F42E6000AD0F6 /* EncoderWav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderWav.h; sourceTree = "<group>"; };
-               F56C81F6131F42E6000AD0F6 /* lame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lame.h; sourceTree = "<group>"; };
                F56C81FF131F42E6000AD0F6 /* IOSAudioRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IOSAudioRenderer.cpp; path = AudioRenderers/IOSAudioRenderer.cpp; sourceTree = "<group>"; };
                F56C8200131F42E6000AD0F6 /* IOSAudioRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSAudioRenderer.h; path = AudioRenderers/IOSAudioRenderer.h; sourceTree = "<group>"; };
                F56C8201131F42E6000AD0F6 /* IAudioRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IAudioRenderer.h; path = AudioRenderers/IAudioRenderer.h; sourceTree = "<group>"; };
@@ -3899,7 +3898,6 @@
                F56C81E0131F42E6000AD0F6 /* cdrip */ = {
                        isa = PBXGroup;
                        children = (
-                               F56C81F5131F42E6000AD0F6 /* lame */,
                                F56C81E1131F42E6000AD0F6 /* CDDAReader.cpp */,
                                F56C81E2131F42E6000AD0F6 /* CDDAReader.h */,
                                F56C81E3131F42E6000AD0F6 /* CDDARipper.cpp */,
@@ -3924,14 +3922,6 @@
                        path = cdrip;
                        sourceTree = "<group>";
                };
-               F56C81F5131F42E6000AD0F6 /* lame */ = {
-                       isa = PBXGroup;
-                       children = (
-                               F56C81F6131F42E6000AD0F6 /* lame.h */,
-                       );
-                       path = lame;
-                       sourceTree = "<group>";
-               };
                F56C81FD131F42E6000AD0F6 /* cores */ = {
                        isa = PBXGroup;
                        children = (

diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index d71dffd..81d10f4 100644 (file)
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -2783,7 +2783,6 @@
                E38E148D0D25F9F900618676 /* EncoderVorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderVorbis.h; sourceTree = "<group>"; };
                E38E148E0D25F9F900618676 /* EncoderWav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderWav.cpp; sourceTree = "<group>"; };
                E38E148F0D25F9F900618676 /* EncoderWav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderWav.h; sourceTree = "<group>"; };
-               E38E14910D25F9F900618676 /* lame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lame.h; sourceTree = "<group>"; };
                E38E149E0D25F9F900618676 /* coff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coff.cpp; sourceTree = "<group>"; };
                E38E149F0D25F9F900618676 /* coff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coff.h; sourceTree = "<group>"; };
                E38E14A00D25F9F900618676 /* coffldr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coffldr.h; sourceTree = "<group>"; };
@@ -5291,7 +5290,6 @@
                E38E147F0D25F9F900618676 /* cdrip */ = {
                        isa = PBXGroup;
                        children = (
-                               E38E14900D25F9F900618676 /* lame */,
                                E38E14800D25F9F900618676 /* CDDAReader.cpp */,
                                E38E14810D25F9F900618676 /* CDDAReader.h */,
                                E38E14820D25F9F900618676 /* CDDARipper.cpp */,
@@ -5316,14 +5314,6 @@
                        path = cdrip;
                        sourceTree = "<group>";
                };
-               E38E14900D25F9F900618676 /* lame */ = {
-                       isa = PBXGroup;
-                       children = (
-                               E38E14910D25F9F900618676 /* lame.h */,
-                       );
-                       path = lame;
-                       sourceTree = "<group>";
-               };
                E38E149A0D25F9F900618676 /* cores */ = {
                        isa = PBXGroup;
                        children = (

diff --git a/tools/darwin/depends/Makefile.in b/tools/darwin/depends/Makefile.in
index ccf6b41..298251e 100644 (file)
--- a/tools/darwin/depends/Makefile.in
+++ b/tools/darwin/depends/Makefile.in
@@ -7,7 +7,7 @@ SUBDIRS := \
        liblzo2 freetype2 fontconfig \
        openssl libssh libssh2 librtmp curl \
        libjpeg-turbo tiff libpng libogg \
-       libvorbis libflac libmad fribidi libmpeg2 \
+       libvorbis libflac libmp3lame libmad fribidi libmpeg2 \
        libass libcdio libsamplerate libcrystalhd libnfs \
        libGLEW libsdl libsdl_mixer libsdl_image \
        libmicrohttpd libmodplug libbluray libyajl \

diff --git a/tools/darwin/depends/libmp3lame/Makefile b/tools/darwin/depends/libmp3lame/Makefile
new file mode 100644 (file)
index 0000000..66c7137
--- /dev/null
+++ b/tools/darwin/depends/libmp3lame/Makefile
@@ -0,0 +1,41 @@
+include ../Makefile.include
+
+# lib name, version
+LIBNAME=lame
+VERSION=3.99.5
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+BASE_URL=http://voxel.dl.sourceforge.net/project/lame/lame/3.99
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX)
+
+LIBDYLIB=$(SOURCE)/.libs/libmp3lame.dylib
+
+CLEAN_FILES=$(ARCHIVE) $(SOURCE)
+
+all: $(LIBDYLIB) .installed
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+       $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
+       rm -rf $(SOURCE)
+       $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+       echo $(SOURCE) > .gitignore
+       #cd $(SOURCE); autoreconf -vif
+       cd $(SOURCE); $(CONFIGURE)
+
+$(LIBDYLIB): $(SOURCE)
+       make -j 1 -C $(SOURCE)
+
+.installed:
+       make -C $(SOURCE) install
+       touch $@
+
+clean:
+       make -C $(SOURCE) clean
+       rm -f .installed
+
+distclean::
+       rm -rf $(SOURCE) .installed