Merge branch 'master' into wii-network

Conflicts: CMakeLists.txt Source/Core/Core/Core.vcxproj Source/Core/DolphinWX/Dolphin.vcxproj Source/Core/DolphinWX/Dolphin.vcxproj.filters Source/Dolphin_2010.sln Source/VSProps/Dolphin.Win32.props Source/VSProps/Dolphin.x64.props
2026-06-19 01:16:48 -07:00 · 2013-08-16 19:17:07 +12:00
parent 417552b21e bff2bc1288
commit 9de7611ff9
613 changed files with 28216 additions and 20036 deletions
@@ -7,7 +7,9 @@ option(ANDROID "Enables a build for Android" OFF)
 option(USE_EGL "Enables EGL OpenGL Interface" OFF)
 option(USE_X11 "Enables X11 Support" ON)
 option(USE_WAYLAND "Enables Wayland Support" OFF)
-option(USE_GLES "Enables GLES And EGL, disables OGL" 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(FASTLOG "Enable all logs" OFF)
@@ -83,22 +85,22 @@ endfunction(enable_precompiled_headers)
 # for revision info
 include(FindGit OPTIONAL)
 if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
-# defines DOLPHIN_WC_REVISION
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-	OUTPUT_VARIABLE DOLPHIN_WC_REVISION
-	OUTPUT_STRIP_TRAILING_WHITESPACE)
-# defines DOLPHIN_WC_DESCRIBE
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
-	OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
-	OUTPUT_STRIP_TRAILING_WHITESPACE)
+	# defines DOLPHIN_WC_REVISION
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+		OUTPUT_VARIABLE DOLPHIN_WC_REVISION
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	# defines DOLPHIN_WC_DESCRIBE
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
+		OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
+		OUTPUT_STRIP_TRAILING_WHITESPACE)

-# remove hash from description
+	# remove hash from description
 	STRING(REGEX REPLACE "-[^-]+((-dirty)?)$" "\\1" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")

-# defines DOLPHIN_WC_BRANCH
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
-	OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
-	OUTPUT_STRIP_TRAILING_WHITESPACE)
+	# defines DOLPHIN_WC_BRANCH
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+		OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()

 # version number
@@ -116,10 +118,17 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
 	add_definitions(-marm -march=armv7-a)
 	add_definitions(-D_M_ARM=1)
 	add_definitions(-D_M_GENERIC=1)
-# Set generic options so you don't have to pass anything to cmake to build ARM
+	# Set generic options so you don't have to pass anything to cmake to build ARM
 	set(USE_GLES 1)
 endif()

+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
+	set(_M_GENERIC 1)
+	set(_M_MIPS 1)
+	add_definitions(-D_M_MIPS=1)
+	add_definitions(-D_M_GENERIC=1)
+endif()
+
 # Set these next two lines to test generic
 #set(_M_GENERIC 1)
 #add_definitions(-D_M_GENERIC=1)
@@ -189,13 +198,13 @@ if(APPLE)
 	set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.7.sdk")
 	set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
 	if(EXISTS "${SYSROOT_PATH}/")
-        set(TARGET_SYSROOT ${SYSROOT_PATH})
+		set(TARGET_SYSROOT ${SYSROOT_PATH})
 	elseif(EXISTS "${SYSROOT_LEGACY_PATH}/")
-        set(TARGET_SYSROOT ${SYSROOT_LEGACY_PATH})
+		set(TARGET_SYSROOT ${SYSROOT_LEGACY_PATH})
 	endif()
 	if(${TARGET_SYSROOT})
-        set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,${TARGET_SYSROOT}")
+		set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}")
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,${TARGET_SYSROOT}")
 	endif()
 	# Do not warn about frameworks that are not available on all architectures.
 	# This avoids a warning when linking with QuickTime.
@@ -266,19 +275,35 @@ if(FASTLOG)
 	add_definitions(-DDEBUGFAST)
 endif()

-
 option(GDBSTUB "Enable gdb stub for remote debugging." OFF)
 if(GDBSTUB)
 	add_definitions(-DUSE_GDBSTUB)
 endif(GDBSTUB)

+if(ANDROID)
+	message("Building for Android")
+	add_definitions(-DANDROID)
+	set(USE_X11 0)
+	set(USE_WAYLAND 0)
+	set(USE_UPNP 0)
+	set(USE_GLES3 1)
+endif()
+
 # For now GLES and EGL are tied to each other.
 # Enabling GLES also disables the OpenGL plugin.
-if(USE_GLES)
-	message("GLES rendering enabled")
-	add_definitions(-DUSE_GLES=1)
-	add_definitions(-DUSE_EGL=1)
+if(USE_GLES3)
+	message("GLES3 rendering enabled")
+	add_definitions(-DUSE_GLES=1 -DUSE_EGL=1 -DUSE_GLES3=1)
+	include_directories(Externals/GLES3)
 	set(USE_EGL True)
+	set(USE_GLES True)
+else()
+	if(USE_GLES)
+		message("GLES2 rendering enabled. OpenGL disabled")
+		add_definitions(-DUSE_GLES=1)
+		add_definitions(-DUSE_EGL=1)
+		set(USE_EGL True)
+	endif()
 endif()
 # For now Wayland and EGL are tied to each other.
 # The alternative would be an shm path
@@ -291,18 +316,12 @@ if(USE_EGL)
 	message("EGL OpenGL interface enabled")
 	add_definitions(-DUSE_EGL=1)
 else()
-# Using GLX
+	# Using GLX
 	set(USE_X11 1)
 	set(USE_WAYLAND 0)
 endif()
 add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)

-if(ANDROID)
-	message("Building for Android")
-	add_definitions(-DANDROID)
-	set(USE_X11 0)
-	set(USE_WAYLAND 0)
-endif()
 ########################################
 # Dependency checking
 #
@@ -378,8 +397,8 @@ if(NOT ANDROID)
 	endif(OPENAL_FOUND)

 	if(UNIX AND NOT APPLE)
-# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
-# This is where we detect platforms and set the variables accordingly.
+		# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
+		# This is where we detect platforms and set the variables accordingly.
 		pkg_check_modules(WAYLAND wayland-egl wayland-client wayland-cursor)
 		if(USE_WAYLAND AND WAYLAND_FOUND)
 			pkg_check_modules(XKBCOMMON xkbcommon)
@@ -395,8 +414,8 @@ if(NOT ANDROID)
 			add_definitions(-DHAVE_WAYLAND=0)
 		endif(USE_WAYLAND AND WAYLAND_FOUND)

-# Note: We do not need to explicitly check for X11 as it is done in the cmake
-# FindOpenGL module on linux.
+		# Note: We do not need to explicitly check for X11 as it is done in the cmake
+		# FindOpenGL module on linux.
 		if(USE_X11 AND X11_FOUND)
 			set(USE_X11 1)
 			add_definitions(-DHAVE_X11=1)
@@ -408,11 +427,11 @@ if(NOT ANDROID)
 			message("X11 support disabled")
 			add_definitions(-DHAVE_X11=0)
 		endif(USE_X11 AND X11_FOUND)
-	
+
 		if (NOT USE_WAYLAND AND NOT USE_X11)
 			message(FATAL_ERROR "\n"
-			"No suitable display platform found\n"
-			"Requires wayland or x11 to run")
+				"No suitable display platform found\n"
+				"Requires wayland or x11 to run")
 		endif()
 	endif()

@@ -423,6 +442,13 @@ if(NOT ANDROID)
 		else()
 			add_definitions(-DHAVE_XRANDR=0)
 		endif(XRANDR_FOUND)
+
+		pkg_check_modules(XINPUT2 xi>=1.5.0)
+		if(XINPUT2_FOUND)
+			add_definitions(-DHAVE_X11_XINPUT2=1)
+		else()
+			add_definitions(-DHAVE_X11_XINPUT2=0)
+		endif(XINPUT2_FOUND)
 	endif()
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()
@@ -526,17 +552,17 @@ if(NOT ANDROID)
 	else(SDL2_FOUND)
 		# SDL2 not found, try SDL
 		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-		include(FindSDL OPTIONAL)
-	endif()
-	if(SDL_FOUND)
-		message("Using shared SDL")
-		include_directories(${SDL_INCLUDE_DIR})
-	else(SDL_FOUND)
-		# TODO: Use the prebuilt one on Windows
-		message("Using static SDL from Externals")
-		include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include)
-		add_subdirectory(Externals/SDL)
-	endif(SDL_FOUND)
+			include(FindSDL OPTIONAL)
+		endif()
+		if(SDL_FOUND)
+			message("Using shared SDL")
+			include_directories(${SDL_INCLUDE_DIR})
+		else(SDL_FOUND)
+			# TODO: Use the prebuilt one on Windows
+			message("Using static SDL from Externals")
+			include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include)
+			add_subdirectory(Externals/SDL)
+		endif(SDL_FOUND)
 	endif(SDL2_FOUND)
 endif()

@@ -557,11 +583,26 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	include(FindSFML OPTIONAL)
 endif()
 if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
-       message("Using shared SFML")
+	message("Using shared SFML")
 else()
-       message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
-       add_subdirectory(Externals/SFML)
-       include_directories(Externals/SFML/include)
+	message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
+	add_subdirectory(Externals/SFML)
+	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()


@@ -624,24 +665,9 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)

 	if(wxWidgets_FOUND)
-		EXECUTE_PROCESS(
+		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
 			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
-				${wxWidgets_CONFIG_OPTIONS} --version
-			OUTPUT_VARIABLE wxWidgets_VERSION
-			OUTPUT_STRIP_TRAILING_WHITESPACE
-			ERROR_QUIET
-			)
-		message("Found wxWidgets version ${wxWidgets_VERSION}")
-		if(${wxWidgets_VERSION} VERSION_LESS "2.8.9")
-			message("At least 2.8.9 is required; ignoring found version")
-			unset(wxWidgets_FOUND)
-		endif()
-	endif(wxWidgets_FOUND)
-		
-	if(wxWidgets_FOUND)
-		EXECUTE_PROCESS(
-			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
-				${wxWidgets_CONFIG_OPTIONS} --version
+			${wxWidgets_CONFIG_OPTIONS} --version
 			OUTPUT_VARIABLE wxWidgets_VERSION
 			OUTPUT_STRIP_TRAILING_WHITESPACE
 			ERROR_QUIET
@@ -658,26 +684,26 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 		endif()
 	endif(wxWidgets_FOUND)

-		if(UNIX AND NOT APPLE)
-			# There is a bug in the FindGTK module in cmake version 2.8.2 that
-			# does not find gdk-pixbuf-2.0.  On the other hand some 2.8.3
-			# users have complained that pkg-config does not find
-			# gdk-pixbuf-2.0.  On yet another hand, cmake version 2.8.3 in
-			# Ubuntu Natty does not find the glib libraries correctly.
-			# Ugly!!!
-			execute_process(COMMAND lsb_release -c -s
-				OUTPUT_VARIABLE DIST_NAME
-				ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-			if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
-					VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
-				check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED)
-			else()
-				include(FindGTK2)
-				if(GTK2_FOUND)
-					include_directories(${GTK2_INCLUDE_DIRS})
-				endif()
+	if(UNIX AND NOT APPLE)
+		# There is a bug in the FindGTK module in cmake version 2.8.2 that
+		# does not find gdk-pixbuf-2.0.  On the other hand some 2.8.3
+		# users have complained that pkg-config does not find
+		# gdk-pixbuf-2.0.  On yet another hand, cmake version 2.8.3 in
+		# Ubuntu Natty does not find the glib libraries correctly.
+		# Ugly!!!
+		execute_process(COMMAND lsb_release -c -s
+			OUTPUT_VARIABLE DIST_NAME
+			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+		if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
+				VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
+			check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED)
+		else()
+			include(FindGTK2)
+			if(GTK2_FOUND)
+				include_directories(${GTK2_INCLUDE_DIRS})
 			endif()
 		endif()
+	endif()

 	if(wxWidgets_FOUND)
 		include(${wxWidgets_USE_FILE})
@@ -700,7 +726,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 		else()
 			message(FATAL_ERROR "wxWidgets in Externals is not compatible with your platform")
 		endif()
-		
+
 		include_directories(
 			Externals/wxWidgets3
 			Externals/wxWidgets3/include)
@@ -0,0 +1,179 @@
+# Locate miniupnp library
+# This module defines
+#  MINIUPNP_FOUND, if false, do not try to link to miniupnp
+#  MINIUPNP_LIBRARY, the miniupnp variant
+#  MINIUPNP_INCLUDE_DIR, where to find miniupnpc.h and family)
+#  MINIUPNPC_VERSION_PRE1_6 --> set if we detect the version of miniupnpc is
+#                               pre 1.6
+#  MINIUPNPC_VERSION_PRE1_5 --> set if we detect the version of miniupnpc is
+#                               pre 1.5
+#
+# Note that the expected include convention is
+#  #include "miniupnpc.h"
+# and not
+#  #include <miniupnpc/miniupnpc.h>
+# This is because, the miniupnpc location is not standardized and may exist
+# in locations other than miniupnpc/
+
+#=============================================================================
+# Copyright 2011 Mark Vejvoda
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+	# Already in cache, be silent
+	set(MINIUPNP_FIND_QUIETLY TRUE)
+endif (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+
+find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h
+	PATH_SUFFIXES miniupnpc)
+find_library(MINIUPNP_LIBRARY miniupnpc)
+
+if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+	set (MINIUPNP_FOUND TRUE)
+endif ()
+
+if (MINIUPNP_FOUND)
+	if (NOT MINIUPNP_FIND_QUIETLY)
+		message (STATUS "Found the miniupnpc libraries at ${MINIUPNP_LIBRARY}")
+		message (STATUS "Found the miniupnpc headers at ${MINIUPNP_INCLUDE_DIR}")
+	endif (NOT MINIUPNP_FIND_QUIETLY)
+
+	message(STATUS "Detecting version of miniupnpc in path: ${MINIUPNP_INCLUDE_DIR}")
+
+	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	check_cxx_source_runs("
+	#include <miniwget.h>
+	#include <miniupnpc.h>
+	#include <upnpcommands.h>
+	#include <stdio.h>
+	int main()
+	{
+	static struct UPNPUrls urls;
+	static struct IGDdatas data;
+
+	GetUPNPUrls (&urls, &data, \"myurl\",0);
+
+	return 0;
+	}"
+	MINIUPNPC_VERSION_1_7_OR_HIGHER)
+
+IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	check_cxx_source_runs("
+	#include <miniwget.h>
+	#include <miniupnpc.h>
+	#include <upnpcommands.h>
+	#include <stdio.h>
+	int main()
+	{
+	struct UPNPDev *devlist = NULL;
+	int upnp_delay = 5000;
+	const char *upnp_multicastif = NULL;
+	const char *upnp_minissdpdsock = NULL;
+	int upnp_sameport = 0;
+	int upnp_ipv6 = 0;
+	int upnp_error = 0;
+	devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
+
+	return 0;
+	}"
+	MINIUPNPC_VERSION_PRE1_7)
+   ENDIF()
+
+   IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	   check_cxx_source_runs("
+	   #include <miniwget.h>
+	   #include <miniupnpc.h>
+	   #include <upnpcommands.h>
+	   #include <stdio.h>
+	   int main()
+	   {
+	   struct UPNPDev *devlist = NULL;
+	   int upnp_delay = 5000;
+	   const char *upnp_multicastif = NULL;
+	   const char *upnp_minissdpdsock = NULL;
+	   int upnp_sameport = 0;
+	   int upnp_ipv6 = 0;
+	   int upnp_error = 0;
+	   devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport);
+
+	   return 0;
+	   }"
+	   MINIUPNPC_VERSION_PRE1_6)
+
+   ENDIF()
+
+   IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	   check_cxx_source_runs("
+	   #include <miniwget.h>
+	   #include <miniupnpc.h>
+	   #include <upnpcommands.h>
+	   #include <stdio.h>
+	   static struct UPNPUrls urls;
+	   static struct IGDdatas data;
+	   int main()
+	   {
+	   char externalIP[16]     = "";
+	   UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
+
+	   return 0;
+	   }"
+	   MINIUPNPC_VERSION_1_5_OR_HIGHER)
+	ENDIF()
+
+	IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+		set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+		set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+		check_cxx_source_runs("
+		#include <miniwget.h>
+		#include <miniupnpc.h>
+		#include <upnpcommands.h>
+		#include <stdio.h>
+		static struct UPNPUrls urls;
+		static struct IGDdatas data;
+		int main()
+		{
+		char externalIP[16]     = "";
+		UPNP_GetExternalIPAddress(urls.controlURL, data.servicetype, externalIP);
+
+		return 0;
+		}"
+		MINIUPNPC_VERSION_PRE1_5)
+
+ENDIF()
+
+IF(MINIUPNPC_VERSION_PRE1_5)
+	message(STATUS "Found miniupnpc version is pre v1.5")
+ENDIF()
+IF(MINIUPNPC_VERSION_PRE1_6)
+	message(STATUS "Found miniupnpc version is pre v1.6")
+ENDIF()
+IF(MINIUPNPC_VERSION_PRE1_7)
+	message(STATUS "Found miniupnpc version is pre v1.7")
+ENDIF()
+
+IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7)
+	message(STATUS "Found miniupnpc version is v1.7 or higher")
+ENDIF()
+
+else ()
+	message (STATUS "Could not find miniupnp")
+endif ()
+
+MARK_AS_ADVANCED(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY)
+
@@ -5,8 +5,6 @@ TLBHack = 1
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C43213D8 0000FF01
 $Infinite Health
 04112828 48232224
 04344A4C D017021C
@@ -7,13 +7,6 @@ EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
 0x803758bc=400
 [OnFrame]
 [ActionReplay]
-$(M)
-C4354E70 0000FF01
-C436F000 0000FF02
-4D30294C 4E800020
-C530294C 0000FF03
-0441FD80 00000000
-C6004010 000000FF
 $This Code Must Be On!
 043BC410 906D0000
 043BC414 88030004
@@ -8,11 +8,6 @@ EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
 0x80375c68=400
 [OnFrame]
 [ActionReplay]
-$(M)
-C43552C8 0000FF01
-C436F41C 0000FF02
-0D30294C 4E800020
-C530294C 0000FF03
 $Infinite Health
 423DDE0C 000A44BB
 423DDE0C 000B6000
@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]

@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]

@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]

@@ -10,10 +10,6 @@ EmulationStateId = 2
 [ActionReplay]
 #Add decrypted action replay cheats here.

-$(M) 
-06C2E568 88000000
-C41D3578 0000FF01
-
 $Infinite Money 
 06C2E569 08000000
 050943A8 0098967F
@@ -5,10 +5,7 @@
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
 [OnFrame]
-Master Code
-0FC07078 A8000000
-C4175B8C 0000FF00
 [ActionReplay]
-Everything unlocked
+$Everything unlocked
 042232F0 00FFFFFF
 002232FC 00002FFF
@@ -6,8 +6,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C425B280 0000FF01
 $Press D-Pad Up - Team 1 Wins
 4A32C348 00000008
 40371238 00003F32
@@ -5,14 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-0658E214 98000000
-C404F588 0002FF00
-$Infinite Health
-0658E215 18000000
-04247EDC 80030BF8
-04247EE0 90030BFC
-04247EE4 4800000C
 $Max Health
 0658E216 18000000
 0425AB40 38000020
@@ -9,8 +9,6 @@ EmulationStateId = 4
 EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
 [OnFrame]
 [ActionReplay]
-$(M) Must Be ON
-C402F310 0000FF01
 $Mario: Max/Infinite Health
 04B07BD0 03E703E7
 02B07BEE 000003E7
@@ -6,9 +6,6 @@
 EmulationStateId = 4
 [OnFrame]
 [ActionReplay]
-$(M)
-0752E976 88000000
-C41641BC 0000FF01
 $Invincible
 0752E977 08000000
 04338650 00000001
@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M) (Datel)
-01521549 88000000
-C40959EC 0000FF00
 $Make Game Save Copyable (donny2112)
 01522C0A 08000000
 8C091F20 909C0028
@@ -5,9 +5,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(m)
-00080176 88000000
-C434E304 00000800
 $All 293 trophies
 00087EF5 08000000
 0245A3C8 00000125
@@ -12,8 +12,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C40EBABC 0000FF00
 $Max Total Races Played
 021B301C 0000270F
 $Low Total Play Time
@@ -5,8 +5,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C412A730 0000FF00
 $Infinite Boost
 04220D04 42C80000
 $Offensive Driving Complete
@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = Needs Real xfb for the videos to display.
 [OnFrame]
 [ActionReplay]
-$(m)
-01180C36 88000000
-C4201E68 0000FF00
 $Max Health
 01180C37 08000000
 02264788 0000270F
@@ -5,8 +5,6 @@ EmulationStateId = 3
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4170264 00000800
 $Infinite Continues
 04233DD8 00000063
 $Infinite Boost
--- a/Show More
+++ b/Show More