[xcode] - finally fix the last pieces which were forgotten during xcode project merge. Now we really use the stuff from tools/darwin/Configurations/ for all platforms and targets.

3 files changed, 3 insertions, 205 deletions

diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index 1a346f1d8b..7d3093e367 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -13114,20 +13114,6 @@
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_MODEL_TUNING = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					_DEBUG,
-					TARGET_POSIX,
-					TARGET_DARWIN,
-					TARGET_DARWIN_OSX,
-					_LINUX,
-					_REENTRANT,
-					_FILE_DEFINED,
-					"_FILE_OFFSET_BITS=64",
-					_LARGEFILE64_SOURCE,
-					__STDC_CONSTANT_MACROS,
-					HAVE_CONFIG_H,
-					HAS_SPC_CODEC,
-				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = "";
 				GENERATE_PROFILING_CODE = NO;
@@ -13168,51 +13154,6 @@
 					"$(OTHER_CFLAGS)",
 					"-Wreorder",
 				);
-				OTHER_LDFLAGS = (
-					"-headerpad_max_install_names",
-					"-Wl,-search_paths_first",
-					"-all_load",
-					"-L$XBMC_DEPENDS/lib",
-					"-lffi",
-					"-lintl",
-					"-lssl",
-					"-lbz2",
-					"-lexpat",
-					"-lresolv",
-					"-lgpg-error",
-					"-lssh",
-					"-llzo2",
-					"-lpcre",
-					"-lpcrecpp",
-					"-lfribidi",
-					"-lcdio",
-					"-lfreetype",
-					"-lfontconfig",
-					"-lsqlite3",
-					"-ltinyxml",
-					"-lmicrohttpd",
-					"-lyajl",
-					"-ljpeg",
-					"-lcrypto",
-					"-lgcrypt",
-					"-lavdevice",
-					"-lavfilter",
-					"-lavcodec",
-					"-lavformat",
-					"-lpostproc",
-					"-lavutil",
-					"-lswresample",
-					"-lswscale",
-					"-lGLEW",
-					"-lSDL",
-					"-lsmbclient",
-					"-lpython2.6",
-					"-ltag",
-					"-L$XBMC_DEPENDS/lib/mysql",
-					"-lmysqlclient",
-					"-lxml2",
-					"-lxslt",
-				);
 				PRODUCT_NAME = XBMC;
 				USE_HEADERMAP = NO;
 				WARNING_CFLAGS = "";
@@ -13240,20 +13181,6 @@
 				GCC_MODEL_PPC64 = NO;
 				GCC_MODEL_TUNING = "";
 				GCC_OPTIMIZATION_LEVEL = 2;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					TARGET_POSIX,
-					TARGET_DARWIN,
-					TARGET_DARWIN_OSX,
-					_LINUX,
-					_REENTRANT,
-					_FILE_DEFINED,
-					"_FILE_OFFSET_BITS=64",
-					_LARGEFILE64_SOURCE,
-					__STDC_CONSTANT_MACROS,
-					HAS_SDL_JOYSTICK,
-					HAVE_CONFIG_H,
-					HAS_SPC_CODEC,
-				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_UNROLL_LOOPS = YES;
 				GCC_VERSION = "";
@@ -13294,51 +13221,6 @@
 					"$(OTHER_CFLAGS)",
 					"-Wreorder",
 				);
-				OTHER_LDFLAGS = (
-					"-headerpad_max_install_names",
-					"-Wl,-search_paths_first",
-					"-all_load",
-					"-L$XBMC_DEPENDS/lib",
-					"-lffi",
-					"-lintl",
-					"-lssl",
-					"-lbz2",
-					"-lexpat",
-					"-lresolv",
-					"-lgpg-error",
-					"-lssh",
-					"-llzo2",
-					"-lpcre",
-					"-lpcrecpp",
-					"-lfribidi",
-					"-lcdio",
-					"-lfreetype",
-					"-lfontconfig",
-					"-lsqlite3",
-					"-ltinyxml",
-					"-lmicrohttpd",
-					"-lyajl",
-					"-ljpeg",
-					"-lcrypto",
-					"-lgcrypt",
-					"-lavdevice",
-					"-lavfilter",
-					"-lavcodec",
-					"-lavformat",
-					"-lpostproc",
-					"-lavutil",
-					"-lswresample",
-					"-lswscale",
-					"-lGLEW",
-					"-lSDL",
-					"-lsmbclient",
-					"-lpython2.6",
-					"-ltag",
-					"-L$XBMC_DEPENDS/lib/mysql",
-					"-lmysqlclient",
-					"-lxml2",
-					"-lxslt",
-				);
 				PRODUCT_NAME = XBMC;
 				USE_HEADERMAP = NO;
 				WARNING_CFLAGS = "";
@@ -13449,49 +13331,6 @@
 					"\"$(SRCROOT)/xbmc/interfaces/legacy\"",
 					"\"$(SRCROOT)/xbmc/interfaces/python\"",
 				);
-				OTHER_LDFLAGS = (
-					"-Wl,-headerpad_max_install_names",
-					"-Wl,-undefined,dynamic_lookup",
-					"-Wl,-read_only_relocs,suppress",
-					"-Wl,-all_load",
-					"-L$XBMC_DEPENDS/lib",
-					"-lbz2",
-					"-lintl",
-					"-lexpat",
-					"-lssl",
-					"-lgpg-error",
-					"-lresolv",
-					"-lffi",
-					"-lssh",
-					"-llzo2",
-					"-lpcre",
-					"-lpcrecpp",
-					"-lfribidi",
-					"-lfreetype",
-					"-lfontconfig",
-					"-lsqlite3",
-					"-ltinyxml",
-					"-lmicrohttpd",
-					"-lsmbclient",
-					"-lpython2.6",
-					"-lyajl",
-					"-ljpeg",
-					"-lcrypto",
-					"-lgcrypt",
-					"-lavdevice",
-					"-lavfilter",
-					"-lavcodec",
-					"-lavformat",
-					"-lpostproc",
-					"-lavutil",
-					"-lswresample",
-					"-lswscale",
-					"-ltag",
-					"-lxslt",
-					"-lxml2",
-					"-L$XBMC_DEPENDS/lib/mysql",
-					"-lmysqlclient",
-				);
 				PLIST_FILE_OUTPUT_FORMAT = xml;
 				PREBINDING = NO;
 				PRODUCT_NAME = XBMC;
@@ -13554,49 +13393,6 @@
 					"\"$(SRCROOT)/xbmc/interfaces/legacy\"",
 					"\"$(SRCROOT)/xbmc/interfaces/python\"",
 				);
-				OTHER_LDFLAGS = (
-					"-Wl,-headerpad_max_install_names",
-					"-Wl,-undefined,dynamic_lookup",
-					"-Wl,-read_only_relocs,suppress",
-					"-Wl,-all_load",
-					"-L$XBMC_DEPENDS/lib",
-					"-lbz2",
-					"-lintl",
-					"-lexpat",
-					"-lssl",
-					"-lgpg-error",
-					"-lresolv",
-					"-lffi",
-					"-lssh",
-					"-llzo2",
-					"-lpcre",
-					"-lpcrecpp",
-					"-lfribidi",
-					"-lfreetype",
-					"-lfontconfig",
-					"-lsqlite3",
-					"-ltinyxml",
-					"-lmicrohttpd",
-					"-lsmbclient",
-					"-lpython2.6",
-					"-lyajl",
-					"-ljpeg",
-					"-lcrypto",
-					"-lgcrypt",
-					"-lavdevice",
-					"-lavfilter",
-					"-lavcodec",
-					"-lavformat",
-					"-lpostproc",
-					"-lavutil",
-					"-lswresample",
-					"-lswscale",
-					"-ltag",
-					"-lxslt",
-					"-lxml2",
-					"-L$XBMC_DEPENDS/lib/mysql",
-					"-lmysqlclient",
-				);
 				PLIST_FILE_OUTPUT_FORMAT = xml;
 				PREBINDING = NO;
 				PRODUCT_NAME = XBMC;
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)