Merge pull request #1 from dolphin-emu/master

update

CMakeLists.txt

@@ -11,6 +11,9 @@ option(ENABLE_QT "Enable Qt (use the experimental Qt interface)" OFF)
 option(ENABLE_PCH "Use PCH to speed up compilation" ON)
 option(ENABLE_LTO "Enables Link Time Optimization" OFF)
 option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
+if(APPLE)
+	option(OSX_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
+endif()
 
 option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)
 
@@ -45,6 +48,8 @@ endif()
 project(dolphin-emu)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
 set(DOLPHIN_IS_STABLE FALSE)
+# Libraries to link
+set(LIBS)
 
 # Set up paths
 if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
@@ -153,9 +158,7 @@ if(NOT ENABLE_GENERIC)
 		set(_M_ARM 1)
 		set(_M_ARM_32 1)
 		add_definitions(-D_M_ARM=1 -D_M_ARM_32=1)
-		if(${ANDROID_NDK_ABI_NAME} MATCHES "armeabi-v7a")
-			add_definitions(-marm -march=armv7-a)
-		endif()
+		add_definitions(-marm -march=armv7-a)
 	elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
 		# This option only applies to 64bit ARM
 		set(_M_ARM 1)
@@ -221,10 +224,18 @@ if(ENABLE_LTO)
 endif()
 
 if(APPLE)
-	# Ignore MacPorts and Fink and any other locally installed packages that
-	# might prevent building a distributable binary.
-	set(CMAKE_SYSTEM_PREFIX_PATH /usr)
-	set(ENV{PATH} /usr/bin:/bin:/usr/sbin:/sbin)
+	if(NOT OSX_USE_DEFAULT_SEARCH_PATH)
+		# Hack up the path to prioritize the path to built-in OS libraries to
+		# increase the chance of not depending on a bunch of copies of them
+		# installed by MacPorts, Fink, Homebrew, etc, and ending up copying
+		# them into the bundle.  Since we optionally depend on libraries which
+		# are not part of OS X (ffmpeg, libusb, etc.), however, don't remove
+		# the default path entirely as was done in a previous version of this
+		# file.  This is still kinda evil, since it defeats the user's path
+		# settings...
+		# See http://www.cmake.org/cmake/help/v3.0/command/find_program.html
+		set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};/usr")
+	endif()
 
 	# Some of our code contains Objective C constructs.
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c -stdlib=libc++")
@@ -280,6 +291,7 @@ if(APPLE)
 	find_library(COREAUDIO_LIBRARY CoreAudio)
 	find_library(COREFUND_LIBRARY CoreFoundation)
 	find_library(CORESERV_LIBRARY CoreServices)
+	find_library(FOUNDATION_LIBRARY foundation)
 	find_library(IOB_LIBRARY IOBluetooth)
 	find_library(IOK_LIBRARY IOKit)
 	find_library(QUICKTIME_LIBRARY QuickTime)
@@ -401,6 +413,7 @@ if(NOT ANDROID)
 		set(HAS_LLVM 1)
 
 		include_directories(${LLVM_INCLUDE_DIRS})
+		list(APPEND LIBS ${LLVM_LIBRARIES})
 
 		message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 	endif()
@@ -446,6 +459,10 @@ if(NOT ANDROID)
 	endif()
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()
+		if(LIBAV_FOUND)
+			LIST(APPEND LIBS ${LIBAV_LIBRARIES})
+		endif()
+
 	endif()
 
 	set(CMAKE_REQUIRED_LIBRARIES portaudio)
@@ -525,6 +542,7 @@ else()
 	include_directories(Externals/LZO)
 	set(LZO lzo2)
 endif()
+list(APPEND LIBS ${LZO})
 
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	check_lib(PNG png png.h QUIET)
@@ -609,6 +627,7 @@ if(USE_UPNP)
 		include_directories(Externals/miniupnpc/src)
 	endif()
 	add_definitions(-DUSE_UPNP)
+	list(APPEND LIBS miniupnpc)
 endif()
 
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
@@ -639,6 +658,12 @@ if (ANDROID)
 	message("Using static iconv from Externals")
 	include_directories(Externals/libiconv-1.14/include)
 	add_subdirectory(Externals/libiconv-1.14)
+	list(APPEND LIBS iconv)
+else()
+	find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+	find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
+	list(APPEND LIBS ${ICONV_LIBRARIES})
+	mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARIES)
 endif()
 
 if(ENABLE_QT)
@@ -685,6 +710,9 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 			include(FindGTK2)
 			if(GTK2_FOUND)
 				include_directories(${GTK2_INCLUDE_DIRS})
+				list(APPEND LIBS ${GTK2_LIBRARIES})
+			else()
+				message(FATAL_ERROR "GTK is required to build the WX UI. Please install the GTK development libraries.")
 			endif()
 		endif()
 	endif()
@@ -721,6 +749,23 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	add_definitions(-DHAVE_WX=1)
 endif(NOT DISABLE_WX AND NOT ANDROID)
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
+   ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+	set(LIBS ${LIBS} usbhid)
+endif()
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	# Link against OS X system frameworks.
+	list(APPEND LIBS
+		${APPKIT_LIBRARY}
+		${AU_LIBRARY}
+		${COREAUDIO_LIBRARY}
+		${COREFUND_LIBRARY}
+		${CORESERV_LIBRARY}
+		${IOK_LIBRARY}
+		${FORCEFEEDBACK}
+		)
+endif()
 
 ########################################
 # Pre-build events: Define configuration variables and write SCM info header

Contributing.md

@@ -1,6 +1,8 @@
-# Dolphin Code Styling
+# Dolphin Coding Style & Licensing
 
-## Table of Contents
+If you make any contributions to Dolphin after December 1st, 2014, you are agreeing that any code you have contributed will be licensed under the GNU GPL version 2 (or any later version).
+
+## Coding Style
 ---
 
 - [Introduction] (#introduction)
@@ -113,7 +115,7 @@ class ExampleClass : public SomeParent
 {
 public:
     ExampleClass(int x, int y);
-  
+
     int GetX() const;
     int GetY() const;
 

Data/Sys/GameSettings/301E01.ini

@@ -0,0 +1,20 @@
+# 301E01 - GameCube Service Disc
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = Certain tests may soft-lock
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]

Data/Sys/GameSettings/D85E01.ini

@@ -0,0 +1,23 @@
+# D85E01 - Multi Game Demo Disk 12
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos run at low FPS
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]

Data/Sys/GameSettings/DLSE64.ini

@@ -6,8 +6,8 @@ MMU = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/DLSP64.ini

@@ -6,8 +6,8 @@ MMU = 1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/DTLX01.ini

@@ -6,6 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/DVDXDV.ini

@@ -5,6 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 0
 EmulationIssues =
 
 [OnLoad]

Data/Sys/GameSettings/FA6E01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FA6P01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FA7E01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FA7P01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FA8E01.ini

@@ -1,12 +1,12 @@
-# FA8E01 - Kirby's Adventure
+# FA8E01 - Kirby's Adventure [NES]
 
 [Core]
 # Values set here will override the main dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FA8F01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FA8P01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FA9E01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FAAE01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FAAP01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FAGE01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.

Data/Sys/GameSettings/FAGP01.ini

@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Texture filtering will cause glitches.
 EmulationStateId = 4
+EmulationIssues = Texture filtering will cause glitches.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.