Merge branch 'udpnet' into old-dc-netplay (this is getting old)

.gitignore

@@ -7,6 +7,7 @@ Source/Core/Common/Src/scmrev.h
 # Ignore files output by build
 /[Bb]uild/
 /[Bb]inary/
+/obj/
 # Ignore files created by visual studio
 *.ipch
 *.opensdf
@@ -19,4 +20,4 @@ Source/Core/Common/Src/scmrev.h
 # Ignore transifix configuration directory
 .tx
 # Ignore tlog files
-*.tlog
+*.tlog

CMakeLists.txt

@@ -9,7 +9,6 @@ option(USE_X11 "Enables X11 Support" ON)
 option(USE_WAYLAND "Enables Wayland Support" OFF)
 option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF)
 option(USE_GLES3 "Enables GLES3 and EGL" OFF)
-option(USE_UPNP "Enables UPnP port mapping support" ON)
 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 option(ENABLE_PCH "Use PCH to speed up compilation" ON)
 
@@ -122,7 +121,9 @@ message(${CMAKE_SYSTEM_PROCESSOR})
 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
 	set(_M_GENERIC 1)
 	set(_M_ARM 1)
-	add_definitions(-marm -march=armv7-a)
+	if(${ANDROID_NDK_ABI_NAME} STREQUAL "armeabi-v7a")
+		add_definitions(-marm -march=armv7-a)
+	endif()
 	# Set generic options so you don't have to pass anything to cmake to build ARM
 	set(USE_GLES 1)
 endif()
@@ -243,14 +244,30 @@ if(APPLE)
 	find_library(IOB_LIBRARY IOBluetooth)
 	find_library(IOK_LIBRARY IOKit)
 	find_library(QUICKTIME_LIBRARY QuickTime)
+	find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
 	find_library(WEBKIT_LIBRARY WebKit)
 endif()
 
+
 if(WIN32)
 	add_definitions(-D_SECURE_SCL=0)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 	add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-endif(WIN32)
+else()
+	execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
+		OUTPUT_VARIABLE CXX_COMPILER_VERSION)
+	string(REGEX MATCH "based on LLVM [0-9.]*"
+		CXX_COMPILER_LLVM_VERSION
+		${CXX_COMPILER_VERSION})
+	if(NOT ("${CXX_COMPILER_LLVM_VERSION}" STREQUAL ""))
+		string(SUBSTRING "${CXX_COMPILER_LLVM_VERSION}"
+			14 -1 CXX_COMPILER_LLVM_VERSION)
+		message(version is ${CXX_COMPILER_LLVM_VERSION})
+		if(NOT ("${CXX_COMPILER_LLVM_VERSION}" VERSION_LESS "3.3"))
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=thread-safety -Werror=thread-safety-beta -DTHREAD_SAFETY_ANNOTATIONS")
+		endif()
+	endif()
+endif()
 
 if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE "Release" CACHE STRING
@@ -287,7 +304,6 @@ if(ANDROID)
 	add_definitions(-DANDROID)
 	set(USE_X11 0)
 	set(USE_WAYLAND 0)
-	set(USE_UPNP 0)
 	set(USE_GLES3 1)
 endif()
 
@@ -332,27 +348,28 @@ add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 # externals.
 include(CheckLib)
 include(CheckCXXSourceRuns)
+
+if(OPENMP)
+	include(FindOpenMP OPTIONAL)
+	if(OPENMP_FOUND)
+		message("OpenMP parallelization enabled")
+		add_definitions("${OpenMP_CXX_FLAGS}")
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}")
+	endif()
+endif()
+if(NOT OPENMP_FOUND)
+	add_definitions(-Wno-unknown-pragmas)
+	message("OpenMP parallelization disabled")
+endif()
+
 if(NOT ANDROID)
 
 	include(FindOpenGL)
 	include_directories(${OPENGL_INCLUDE_DIR})
 	if(NOT OPENGL_GLU_FOUND)
 		message(FATAL_ERROR "GLU is required but not found")
 	endif()
-
-	if(OPENMP)
-		include(FindOpenMP OPTIONAL)
-		if(OPENMP_FOUND)
-			message("OpenMP parallelization enabled")
-			add_definitions("${OpenMP_CXX_FLAGS}")
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}")
-		endif()
-	endif()
-	if(NOT OPENMP_FOUND)
-		add_definitions(-Wno-unknown-pragmas)
-		message("OpenMP parallelization disabled")
-	endif()
-
+
 	include(FindALSA OPTIONAL)
 	if(ALSA_FOUND)
 		add_definitions(-DHAVE_ALSA=1)
@@ -511,6 +528,8 @@ include_directories(Source/Core/VideoUICommon/Src)
 #
 add_subdirectory(Externals/Bochs_disasm)
 include_directories(Externals/Bochs_disasm)
+include_directories(Externals)
+add_subdirectory(Externals/enet)
 
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	check_lib(LZO lzo2 lzo/lzo1x.h QUIET)
@@ -594,21 +613,6 @@ else()
 	include_directories(Externals/SFML/include)
 endif()
 
-if(USE_UPNP)
-	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
-		include(FindMiniupnpc)
-	endif()
-	if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
-		message("Using shared miniupnpc")
-		include_directories(${MINIUPNP_INCLUDE_DIR})
-	else()
-		message("Using static miniupnpc from Externals")
-		add_subdirectory(Externals/miniupnpc)
-		include_directories(Externals/miniupnpc/src)
-	endif()
-	add_definitions(-DUSE_UPNP)
-endif()
-
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	include(FindPolarSSL)
 endif()

Data/Sys/GameSettings/G5TE69.ini

@@ -0,0 +1,34 @@
+# G5TE69 - Tiger Woods PGA TOUR 2005
+
+[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.
+EmulationIssues = 
+EmulationStateId = 4
+
+[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
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/Sys/GameSettings/G5TP69.ini

@@ -0,0 +1,34 @@
+# G5TP69 - Tiger Woods PGA TOUR 2005
+
+[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.
+EmulationIssues = 
+EmulationStateId = 4
+
+[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
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512