Merge branch 'master' into android-core-control

CMakeLists.txt

@@ -104,8 +104,8 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 endif()
 
 # version number
-set(DOLPHIN_VERSION_MAJOR "3")
-set(DOLPHIN_VERSION_MINOR "5")
+set(DOLPHIN_VERSION_MAJOR "4")
+set(DOLPHIN_VERSION_MINOR "0")
 if(DOLPHIN_IS_STABLE)
 	set(DOLPHIN_VERSION_PATCH "0")
 else()
@@ -602,10 +602,18 @@ if(USE_UPNP)
 	add_definitions(-DUSE_UPNP)
 endif()
 
-
-message("Using PolarSSL from Externals")
-add_subdirectory(Externals/polarssl/)
-include_directories(Externals/polarssl/include)
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
+	include(FindPolarSSL)
+endif()
+if(POLARSSL_FOUND AND POLARSSL_WORKS)
+	message("Using shared PolarSSL")
+	include_directories(${POLARSSL_INCLUDE_DIR})
+else()
+	message("Using PolarSSL from Externals")
+	set(POLARSSL_LIBRARY polarssl)
+	add_subdirectory(Externals/polarssl/)
+	include_directories(Externals/polarssl/include)
+endif()
 
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
@@ -637,15 +645,15 @@ if(WIN32)
 	find_library(GLEW glew32s PATHS Externals/GLew)
 	include_directories(Externals/GLew/include)
 else()
-	if(NOT ANDROID)
+	if(NOT USE_GLES3)
 		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-			check_lib(GLEW GLEW GL/glew.h)
+			include(FindGLEW)
 		endif()
-		if(NOT GLEW_FOUND)
+		if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_9_METHODS)
 			message("Using static GLEW from Externals")
 			add_subdirectory(Externals/GLew)
 			include_directories(Externals/GLew/include)
-		endif(NOT GLEW_FOUND)
+		endif()
 	endif()
 endif()
 
@@ -770,7 +778,6 @@ add_subdirectory(Source)
 # Install shared data files
 #
 if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
-	install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN)
 	install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN)
 endif()
 if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin"))

CMakeTests/FindGLEW.cmake

@@ -0,0 +1,32 @@
+include(FindPkgConfig OPTIONAL)
+
+# This is a hack to deal with Ubuntu's mess.
+# Ubuntu's version of glew is 1.8, but they have patched in most of glew 1.9.
+# So Ubuntu's version works for dolphin.
+macro(test_glew)
+	set(CMAKE_REQUIRED_INCLUDES ${GLEW_INCLUDE_DIRS})
+	set(CMAKE_REQUIRED_LIBRARIES GLEW)
+	check_cxx_source_runs("
+	#include <GL/glew.h>
+	int main()
+	{
+	#ifdef GLEW_ARB_shader_image_load_store
+	return 0;
+	#else
+	return 1;
+	#endif
+	}"
+	GLEW_HAS_1_9_METHODS)
+endmacro()
+
+if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
+	pkg_search_module(GLEW glew>=1.8)
+endif()
+
+if(GLEW_FOUND)
+	test_glew()
+	if (GLEW_HAS_1_9_METHODS)
+		include_directories(${GLEW_INCLUDE_DIRS})
+		message("GLEW found")
+	endif()
+endif()

CMakeTests/FindPolarSSL.cmake

@@ -0,0 +1,59 @@
+# Locate polarssl library
+# This module defines
+#  POLARSSL_FOUND
+#  POLARSSL_LIBRARY
+#  POLARSSL_INCLUDE_DIR
+#  POLARSSL_WORKS, this is true if polarssl is found and contains the methods
+#  needed by dolphin-emu
+
+if(POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY)
+	# Already in cache, be silent
+	set(POLARSSL_FIND_QUIETLY TRUE)
+endif()
+
+find_path(POLARSSL_INCLUDE_DIR polarssl/ssl.h)
+find_library(POLARSSL_LIBRARY polarssl)
+
+if (POLARSSL_INCLUDE_DIR AND POLARSSL_LIBRARY)
+	set (POLARSSL_FOUND TRUE)
+endif ()
+
+if (POLARSSL_FOUND)
+	if (NOT POLARSSL_FIND_QUIETLY)
+		message (STATUS "Found the polarssl libraries at ${POLARSSL_LIBRARY}")
+		message (STATUS "Found the polarssl headers at ${POLARSSL_INCLUDE_DIR}")
+	endif (NOT POLARSSL_FIND_QUIETLY)
+
+	message(STATUS "Checking to see if system version contains necessary methods")
+
+	set(CMAKE_REQUIRED_INCLUDES ${POLARSSL_INCLUDE_DIR})
+	set(CMAKE_REQUIRED_LIBRARIES ${POLARSSL_LIBRARY})
+	check_cxx_source_compiles("
+	#include <polarssl/net.h>
+	#include <polarssl/ssl.h>
+	#include <polarssl/havege.h>
+	int main()
+	{
+	ssl_context ctx;
+	ssl_session session;
+	havege_state hs;
+
+	ssl_init(&ctx);
+	havege_init(&hs);
+	ssl_set_rng(&ctx, havege_random, &hs);
+	ssl_set_session(&ctx, &session);
+
+	ssl_close_notify(&ctx);
+	ssl_session_free(&session);
+	ssl_free(&ctx);
+
+	return 0;
+	}"
+	POLARSSL_WORKS)
+
+else ()
+	message (STATUS "Could not find polarssl")
+endif ()
+
+MARK_AS_ADVANCED(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
+

Data/Sys/GameSettings/D43J01.ini

@@ -0,0 +1,21 @@
+# D43J01 - ZELDA OCARINA MULTI PACK
+
+[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 =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+$loophack
+0x806866E4:word:0x60000000
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/G3EE51.ini

@@ -0,0 +1,22 @@
+# G3EE51 - Extreme G3
+
+[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 = 
+
+[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
+

Data/Sys/GameSettings/G4ZE69.ini

@@ -0,0 +1,20 @@
+# G4ZE69 - The Sims 2 GameCube
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/Sys/GameSettings/G4ZP69.ini

@@ -0,0 +1,20 @@
+# G4ZP69 - The Sims 2 GameCube
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]