5 files changed, 6 insertions, 3 deletions
diff --git a/tools/darwin/Configurations/App-ATV2.xcconfig b/tools/darwin/Configurations/App-ATV2.xcconfig
index 521bfb7dd8..964cad7e2c 100644
--- a/tools/darwin/Configurations/App-ATV2.xcconfig
+++ b/tools/darwin/Configurations/App-ATV2.xcconfig
@@ -20,4 +20,6 @@
 
 #include "App-iOS.xcconfig"
 
+OTHER_LDFLAGS = -Wl,-undefined,dynamic_lookup -Wl,-read_only_relocs,suppress $(XBMC_OTHER_LDFLAGS_COMMON)
+
 GCC_PREPROCESSOR_DEFINITIONS = TARGET_DARWIN_IOS TARGET_DARWIN_IOS_ATV2 $(XBMC_GCC_PREPROCESSOR_DEFINITIONS_COMMON)
diff --git a/tools/darwin/Configurations/App-OSX.xcconfig b/tools/darwin/Configurations/App-OSX.xcconfig
index 3c747dc49a..a24b166644 100644
--- a/tools/darwin/Configurations/App-OSX.xcconfig
+++ b/tools/darwin/Configurations/App-OSX.xcconfig
@@ -28,6 +28,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.6
 
 
 
-OTHER_LDFLAGS = $(XBMC_OTHER_LDFLAGS_COMMON)
+OTHER_LDFLAGS = -Wl,-search_paths_first $(XBMC_OTHER_LDFLAGS_COMMON) -lcdio -lfontconfig -lGLEW -lSDL
 
 GCC_PREPROCESSOR_DEFINITIONS = TARGET_DARWIN_OSX $(XBMC_GCC_PREPROCESSOR_DEFINITIONS_COMMON)
diff --git a/tools/darwin/Configurations/Common.xcconfig b/tools/darwin/Configurations/Common.xcconfig
index c5a8fabbb4..353d7983a7 100644
--- a/tools/darwin/Configurations/Common.xcconfig
+++ b/tools/darwin/Configurations/Common.xcconfig
@@ -18,6 +18,6 @@
 //
 //
 
-XBMC_GCC_PREPROCESSOR_DEFINITIONS_COMMON = TARGET_POSIX TARGET_DARWIN _LINUX _REENTRANT _FILE_DEFINED _FILE_OFFSET_BITS=64 _LARGEFILE64_SOURCE __STDC_CONSTANT_MACROS HAVE_CONFIG_H HAS_SPC_CODEC
+XBMC_GCC_PREPROCESSOR_DEFINITIONS_COMMON = TARGET_POSIX TARGET_DARWIN _LINUX _REENTRANT _FILE_DEFINED _FILE_OFFSET_BITS=64 _LARGEFILE64_SOURCE __STDC_CONSTANT_MACROS HAVE_CONFIG_H HAS_SPC_CODEC NPT_CONFIG_ENABLE_LOGGING
 
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION
index 8fa07a53af..9bbbfeaf2e 100644
--- a/tools/depends/target/ffmpeg/FFMPEG-VERSION
+++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION
@@ -1,5 +1,5 @@
 LIBNAME=ffmpeg
 BASE_URL=https://github.com/xbmc/FFmpeg/archive
-VERSION=2.2-Helix-alpha1
+VERSION=2.2-Helix-alpha1.1
 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
 
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
index cb6b6be507..51e191887f 100644
--- a/tools/depends/target/ffmpeg/Makefile
+++ b/tools/depends/target/ffmpeg/Makefile
@@ -40,6 +40,7 @@ ifeq ($(OS), ios)
   ffmpg_config += --target-os=darwin
 endif
 ifeq ($(OS), osx)
+  ffmpg_config += --disable-outdev=sdl
   ffmpg_config += --disable-decoder=mpeg_xvmc --enable-vda --disable-crystalhd
   ffmpg_config += --target-os=darwin
 endif