diff options
| -rw-r--r-- | Kodi.xcodeproj/project.pbxproj | 8 | ||||
| -rw-r--r-- | tools/darwin/Configurations/App-OSX.xcconfig | 2 | ||||
| -rw-r--r-- | tools/depends/configure.ac | 4 | ||||
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDCodecs/Video/VDA.cpp | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj index 70ef8fe732..f88402a0b5 100644 --- a/Kodi.xcodeproj/project.pbxproj +++ b/Kodi.xcodeproj/project.pbxproj @@ -678,6 +678,8 @@ 7CCDACCA19275D790074CF51 /* NptAppleLogConfig.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CCDACC019275D790074CF51 /* NptAppleLogConfig.mm */; settings = {COMPILER_FLAGS = "-I$SRCROOT/lib/libUPnP/Neptune/Source/System/Posix -I$SRCROOT/lib/libUPnP/Neptune/Source/Core"; }; }; 7CCDACCB19275D790074CF51 /* NptAppleLogConfig.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CCDACC019275D790074CF51 /* NptAppleLogConfig.mm */; }; 7CCF7FC9106A0DF500992676 /* TimeUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CCF7FC7106A0DF500992676 /* TimeUtils.cpp */; }; + 7CD46A141CCDEA7500BF4AD4 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CD46A131CCDEA7500BF4AD4 /* VideoToolbox.framework */; }; + 7CD46A161CCDF09500BF4AD4 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CD46A151CCDF09500BF4AD4 /* CoreMedia.framework */; }; 7CD4F7EC1C60DBC10015214B /* VideoFileItemListModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD4F7EA1C60DBC10015214B /* VideoFileItemListModifier.cpp */; }; 7CD4F7ED1C60DBC10015214B /* VideoFileItemListModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD4F7EA1C60DBC10015214B /* VideoFileItemListModifier.cpp */; }; 7CDAE9050FFCA3520040B25F /* DVDTSCorrection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */; }; @@ -3387,6 +3389,8 @@ 7CCDACC019275D790074CF51 /* NptAppleLogConfig.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NptAppleLogConfig.mm; sourceTree = "<group>"; }; 7CCF7FC7106A0DF500992676 /* TimeUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeUtils.cpp; sourceTree = "<group>"; }; 7CCF7FC8106A0DF500992676 /* TimeUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeUtils.h; sourceTree = "<group>"; }; + 7CD46A131CCDEA7500BF4AD4 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; }; + 7CD46A151CCDF09500BF4AD4 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 7CD4F7EA1C60DBC10015214B /* VideoFileItemListModifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoFileItemListModifier.cpp; sourceTree = "<group>"; }; 7CD4F7EB1C60DBC10015214B /* VideoFileItemListModifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFileItemListModifier.h; sourceTree = "<group>"; }; 7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDTSCorrection.cpp; sourceTree = "<group>"; }; @@ -5020,8 +5024,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7CD46A141CCDEA7500BF4AD4 /* VideoToolbox.framework in Frameworks */, F5ED9BFB155EC77400842059 /* ApplicationServices.framework in Frameworks */, E38E23930D2626E600618676 /* AudioUnit.framework in Frameworks */, + 7CD46A161CCDF09500BF4AD4 /* CoreMedia.framework in Frameworks */, E38E23920D2626E600618676 /* AudioToolbox.framework in Frameworks */, E38E23940D2626E600618676 /* Cocoa.framework in Frameworks */, F5ED9A0C155EBDC000842059 /* CoreAudio.framework in Frameworks */, @@ -8884,6 +8890,8 @@ E49910F7174E55E100741B6D /* OSX */ = { isa = PBXGroup; children = ( + 7CD46A151CCDF09500BF4AD4 /* CoreMedia.framework */, + 7CD46A131CCDEA7500BF4AD4 /* VideoToolbox.framework */, E38E25340D26365C00618676 /* ApplicationServices.framework */, E38E238C0D2626E600618676 /* AudioUnit.framework */, E38E238B0D2626E600618676 /* AudioToolbox.framework */, diff --git a/tools/darwin/Configurations/App-OSX.xcconfig b/tools/darwin/Configurations/App-OSX.xcconfig index 9781d6e2ba..c7aae2f7c3 100644 --- a/tools/darwin/Configurations/App-OSX.xcconfig +++ b/tools/darwin/Configurations/App-OSX.xcconfig @@ -24,7 +24,7 @@ ARCHS = i386 x86_64 ONLY_ACTIVE_ARCH = YES SDKROOT = macosx -MACOSX_DEPLOYMENT_TARGET = 10.7 +MACOSX_DEPLOYMENT_TARGET = 10.8 XBMC_DEPENDS = $(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(CURRENT_ARCH)-target diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac index 13717176d0..7b25715940 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -207,7 +207,7 @@ case $host in 4.* | 4.*.*) platform_cc=llvm-gcc-4.2 platform_cxx=llvm-g++-4.2 - ;; + ;; *) platform_cc=clang platform_cxx=clang++ @@ -254,7 +254,7 @@ case $host in AC_MSG_ERROR(error in configure of --with-sdk=$use_sdk) esac sdk_name=macosx$use_sdk - platform_min_version="macosx-version-min=10.7" + platform_min_version="macosx-version-min=10.8" use_sdk_path=[`$use_xcodebuild -version -sdk $sdk_name Path`] platform_os="osx" diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDA.cpp index 9670c5f46c..d5af5957f6 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDA.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDA.cpp @@ -37,7 +37,7 @@ using namespace VDA; CDecoder::CDecoder() : m_renderbuffers_count(3) { - m_ctx = av_vda_alloc_context(); + //m_ctx = av_vda_alloc_context(); m_bitstream = NULL; } |