From f9133a7376f2f3a6874ce5044c1af2e8b5f4ccd0 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Wed, 7 Dec 2011 08:26:44 +0100
Subject: [PATCH] Link to the required OS X frameworks.

Previously, there was just one list of frameworks regardless of which part
of the code depended on which frameworks. Now we keep separate lists for
the Dolphin core, the Dolphin GUI and internal use by wxWidgets.
---
 CMakeLists.txt                       | 29 +++++++++++++---------------
 Externals/wxWidgets3/CMakeLists.txt  | 12 +++++++++++-
 Source/Core/DolphinWX/CMakeLists.txt | 20 +++++++++++++++----
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3611a7cf56..de5e795044 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,23 +107,20 @@ if (APPLE)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none")
-	FIND_LIBRARY(ATB_LIBRARY AudioToolbox)
-	FIND_LIBRARY(AU_LIBRARY AudioUnit)		
-	FIND_LIBRARY(CARBON_LIBRARY Carbon)
-	FIND_LIBRARY(COCOA_LIBRARY Cocoa)
-	FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio)
-	FIND_LIBRARY(COREFUND_LIBRARY CoreFoundation)
-	FIND_LIBRARY(CORESERV_LIBRARY CoreServices)
-	FIND_LIBRARY(IOB_LIBRARY IOBluetooth)
-	FIND_LIBRARY(IOK_LIBRARY IOKit)		
-	FIND_LIBRARY(OGL_LIBRARY OpenGL)
-	FIND_LIBRARY(WEBKIT_LIBRARY WebKit)		
-	SET(EXTRA_LIBS ${ATB_LIBRARY} ${AU_LIBRARY} ${CARBON_LIBRARY}
-		${COCOA_LIBRARY} ${COREAUDIO_LIBRARY} ${COREFUND_LIBRARY}
-		${CORESERV_LIBRARY} ${IOB_LIBRARY} ${IOK_LIBRARY} ${OGL_LIBRARY}
-		${WEBKIT_LIBRARY})
+	find_library(APPKIT_LIBRARY AppKit)
+	find_library(APPSERV_LIBRARY ApplicationServices)
+	find_library(ATB_LIBRARY AudioToolbox)
+	find_library(AU_LIBRARY AudioUnit)
+	find_library(CARBON_LIBRARY Carbon)
+	find_library(COCOA_LIBRARY Cocoa)
+	find_library(COREAUDIO_LIBRARY CoreAudio)
+	find_library(COREFUND_LIBRARY CoreFoundation)
+	find_library(CORESERV_LIBRARY CoreServices)
+	find_library(IOB_LIBRARY IOBluetooth)
+	find_library(IOK_LIBRARY IOKit)
+	find_library(WEBKIT_LIBRARY WebKit)
 endif()
- 
+
 if(WIN32)
 	add_definitions(-D_SECURE_SCL=0)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
diff --git a/Externals/wxWidgets3/CMakeLists.txt b/Externals/wxWidgets3/CMakeLists.txt
index f7570c15d5..3281e55955 100644
--- a/Externals/wxWidgets3/CMakeLists.txt
+++ b/Externals/wxWidgets3/CMakeLists.txt
@@ -1239,7 +1239,17 @@ add_definitions(-D__WXOSX_COCOA__)
 add_definitions(-DWXBUILDING)
 add_definitions(-Wno-deprecated-declarations)
 add_definitions(-Wno-shadow)
-set(LIBS iconv)
+set(LIBS
+	iconv
+	${APPKIT_LIBRARY}
+	${APPSERV_LIBRARY}
+	${ATB_LIBRARY}
+	${CARBON_LIBRARY}
+	${COCOA_LIBRARY}
+	${COREFUND_LIBRARY}
+	${CORESERV_LIBRARY}
+	${IOK_LIBRARY}
+	)
 
 include_directories(../libpng)
 add_subdirectory(../libpng ../libpng)
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 61b1b2a20c..3d6e8df9ca 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -71,10 +71,22 @@ endif()
 
 if(WIN32)
 	set(SRCS ${SRCS} Src/stdafx.cpp)
-elseif((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND)
-	# TODO
-elseif((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND wxWidgets_FOUND)
-	# TODO
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	list(APPEND LIBS
+		${APPKIT_LIBRARY}
+		${AU_LIBRARY}
+		${COREAUDIO_LIBRARY}
+		${COREFUND_LIBRARY}
+		${CORESERV_LIBRARY}
+		${IOB_LIBRARY}
+		${IOK_LIBRARY}
+		)
+	if(wxWidgets_FOUND)
+		list(APPEND LIBS
+			${APPSERV_LIBRARY}
+			${COCOA_LIBRARY}
+			)
+	endif()
 else()
 	set(SRCS ${SRCS} Src/X11Utils.cpp)
 endif()