Merge remote-tracking branch 'dolphin-emu/master' into gameinis

AndroidSetup.md

@@ -0,0 +1,68 @@
+# How to Set Up an Android Development Environment
+
+If you'd like to contribute to the Android project, but do not currently have a development environment setup, follow the instructions in this guide.
+
+## Prerequisites
+
+* A Linux VM or host, or a Mac.
+* JDK 7 for your platform.
+* CMake
+* [Android NDK](https://developer.android.com/tools/sdk/ndk/index.html) 
+* [Android Studio](http://developer.android.com/tools/studio/index.html) **OR**
+* [Android SDK Tools](http://developer.android.com/sdk/index.html#Other) (for command-line usage)
+
+If you downloaded Android Studio, extract it and then see [Setting up Android Studio](#setting-up-android-studio).
+
+If you instead chose to download the commoand-line SDK tools, see [Setting up the SDK Tools](#setting-up-the-sdk-tools).
+
+## Setting up Android Studio
+
+1. Launch Android Studio, which will start a first-launch wizard.
+2. Choose a custom installation.
+3. If offered a choice of themes, select your preference.
+4. When offered a choice of components, uncheck the "Android Virtual Device" option. ![Android Studio Components][components]
+5. Accept all licenses, and click Finish. Android Studio will download the SDK Tools package automatically. (Ubuntu users, if you get an error running the `mksdcard` tool, make sure the `lib32stdc++6` package is installed.)
+6. At the Android Studio welcome screen, click "Configure", then "SDK Manager".
+7. Use the SDK Manager to get necessary dependencies, as described in [Getting Dependencies](#getting-dependencies).
+8. When done, follow the steps in [Readme.md](Readme.md#installation-on-android) to compile and deploy the application.
+
+## Setting up the SDK Tools
+
+1. In `Source/Android`, create a file called `local.properties`.
+2. Add a single line: `sdk.dir=<sdk-path>`, where `<sdk-path>` is the path where you extracted the SDK Tools package.
+3. Follow the steps in [Readme.md](Readme.md#installation-on-android) to compile and deploy the application.
+
+## Executing Gradle Tasks
+
+In Android Studio, you can find a list of possible Gradle tasks in a tray at the top right of the screen:
+
+![Gradle Tasks][gradle]
+
+Double clicking any of these tasks will execute it, and also add it to a short list in the main toolbar:
+
+![Gradle Task Shortcuts][shortcut]
+
+Clicking the green triangle next to this list will execute the currently selected task.
+
+For command-line users, any task may be executed with `Source/Android/gradlew <task-name>`.
+
+## Getting Dependencies
+
+Most dependencies for the Android project are supplied by Gradle automatically. However, Android platform libraries (and a few Google-supplied supplementary libraries) must be downloaded through the Android package manager.
+
+1. Launch the Android SDK Manager from the commandline by executing `<sdk-path>/tools/android`, or by clicking on its icon in Android Studio's main toolbar:
+![Android Studio Package Icon][package-icon]
+2. At the bottom of the window, click "Deselect All", and then "Updates".
+3. Install or update the following packages:
+
+* SDK Platform, under "Android 5.0.1 (API 21)". This will allow compiling apps that target Lollipop.
+* Android Support Repository
+* Android Support Library
+* Google Repository
+
+In the future, if the project targets a newer version of Android, or use newer versions of the tools/build-tools packages, it will be necessary to use this tool to download updates.
+
+[components]: http://i.imgur.com/Oo1Fs93.png
+[package-icon]: http://i.imgur.com/NUpkAH8.png
+[gradle]: http://i.imgur.com/dXIH6o3.png
+[shortcut]: http://i.imgur.com/eCWP4Yy.png

CMakeLists.txt

@@ -13,6 +13,18 @@ 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)
+
+# Enable SDL for default on operating systems that aren't OSX, Android, Linux or Windows.
+if(NOT APPLE AND NOT ANDROID AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT MSVC)
+	option(ENABLE_SDL "Enables SDL as a generic controller backend" ON)
+else()
+	option(ENABLE_SDL "Enables SDL as a generic controller backend" OFF)
+endif()
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT ANDROID)
+	option(ENABLE_EVDEV "Enables the evdev controller backend" ON)
+endif()
+
 if(APPLE)
 	option(OSX_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
 endif()
@@ -300,6 +312,14 @@ if(WIN32)
 	add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
 endif(WIN32)
 
+# Dolphin requires threads.
+# The Apple build may not need an explicit flag because one of the
+# frameworks may already provide it.
+# But for non-OSX systems, we will use the CMake Threads package.
+IF(NOT APPLE)
+  FIND_PACKAGE(Threads)
+ENDIF(NOT APPLE)
+
 if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE "Release" CACHE STRING
 		"Build type (Release/Debug/RelWithDebInfo/MinSizeRe)" FORCE)
@@ -508,6 +528,19 @@ if(USE_EGL)
 	add_definitions(-DUSE_EGL=1)
 endif()
 
+if(ENABLE_EVDEV)
+	include(FindLibudev REQUIRED)
+	include(FindLibevdev REQUIRED)
+	if(LIBUDEV_FOUND AND LIBEVDEV_FOUND)
+		message("libevdev/libudev found, enabling evdev controller backend")
+		add_definitions(-DHAVE_LIBUDEV=1)
+		add_definitions(-DHAVE_LIBEVDEV=1)
+		include_directories(${LIBUDEV_INCLUDE_DIR} ${LIBEVDEV_INCLUDE_DIR})
+	else()
+		message(FATAL_ERROR "Couldn't find libevdev and/or libudev. Can't build evdev controller backend.\nDisable ENABLE_EVDEV if you wish to build without controller support")
+	endif()
+endif()
+
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #
@@ -614,26 +647,21 @@ if(OPENAL_FOUND)
 	endif()
 endif()
 
-if(NOT ANDROID)
+if(ENABLE_SDL)
-	if(NOT APPLE)
+	include(FindSDL2 OPTIONAL)
-		include(FindSDL2 OPTIONAL)
-	endif()
 	if(SDL2_FOUND)
 		message("Using shared SDL2")
 		add_definitions(-DHAVE_SDL=1)
 		include_directories(${SDL2_INCLUDE_DIR})
 	else(SDL2_FOUND)
 		# SDL2 not found, try SDL
-		if(NOT APPLE)
+		include(FindSDL OPTIONAL)
-			include(FindSDL OPTIONAL)
-		endif()
 		if(SDL_FOUND)
 			message("Using shared SDL")
 			add_definitions(-DHAVE_SDL=1)
 			include_directories(${SDL_INCLUDE_DIR})
 		else(SDL_FOUND)
 			message("SDL NOT found, disabling SDL input")
-			add_definitions(-DHAVE_SDL=0)
 		endif(SDL_FOUND)
 	endif(SDL2_FOUND)
 endif()
@@ -839,7 +867,7 @@ add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND})
 ########################################
 # Start compiling our code
 #
-add_definitions(-std=gnu++0x)
+add_definitions(-std=c++1y)
 
 # These aren't actually needed for C11/C++11
 # but some dependencies require them (LLVM, libav).

CMakeTests/FindLLVM.cmake

@@ -1,6 +1,9 @@
 # This file only exists because LLVM's cmake files are broken.
 # This affects both LLVM 3.4 and 3.5.
 # Hopefully when they fix their cmake system we don't need this garbage.
+
+include(CheckLibraryExists)
+
 list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config")
 list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.5")
 list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.4")
@@ -11,13 +14,16 @@ foreach(LLVM_CONFIG_NAME ${LLVM_CONFIG_EXECUTABLES})
 		execute_process(COMMAND ${LLVM_CONFIG_EXE} --version OUTPUT_VARIABLE LLVM_PACKAGE_VERSION
 			OUTPUT_STRIP_TRAILING_WHITESPACE )
 		if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "3.3")
-			set(LLVM_FOUND 1)
 			execute_process(COMMAND ${LLVM_CONFIG_EXE} --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
 				OUTPUT_STRIP_TRAILING_WHITESPACE )
 			execute_process(COMMAND ${LLVM_CONFIG_EXE} --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS
 				OUTPUT_STRIP_TRAILING_WHITESPACE )
-			set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -lLLVM-${LLVM_PACKAGE_VERSION}")
+			check_library_exists(LLVM-${LLVM_PACKAGE_VERSION} LLVMVerifyFunction "${LLVM_LDFLAGS}" HAVE_DYNAMIC_LLVM_${LLVM_PACKAGE_VERSION})
-			break()
+			if (HAVE_DYNAMIC_LLVM_${LLVM_PACKAGE_VERSION})
+				set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -lLLVM-${LLVM_PACKAGE_VERSION}")
+				set(LLVM_FOUND 1)
+				break()
+			endif()
 		endif()
 	endif()
 endforeach()

CMakeTests/FindLibevdev.cmake

@@ -0,0 +1,33 @@
+# - Try to find libevdev
+# Once done this will define
+#  LIBEVDEV_FOUND - System has libevdev
+#  LIBEVDEV_INCLUDE_DIRS - The libevdev include directories
+#  LIBEVDEV_LIBRARIES - The libraries needed to use libevdev
+
+find_package(PkgConfig)
+pkg_check_modules(PC_LIBEVDEV QUIET libevdev)
+
+FIND_PATH(
+    LIBEVDEV_INCLUDE_DIR libevdev/libevdev.h
+    HINTS ${PC_LIBEVDEV_INCLUDEDIR} ${PC_LIBEVDEV_INCLUDE_DIRS}
+    /usr/include
+    /usr/local/include
+    ${LIBEVDEV_PATH_INCLUDES}
+)
+
+FIND_LIBRARY(
+    LIBEVDEV_LIBRARY
+    NAMES evdev libevdev
+    HINTS ${PC_LIBEVDEV_LIBDIR} ${PC_LIBEVDEV_LIBRARY_DIRS}
+    PATHS ${ADDITIONAL_LIBRARY_PATHS}
+        ${LIBEVDEV_PATH_LIB}
+)
+
+set(LIBEVDEV_LIBRARIES ${LIBEVDEV_LIBRARY} )
+set(LIBEVDEV_INCLUDE_DIRS ${LIBEVDEV_INCLUDE_DIR} )
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(libevdev  DEFAULT_MSG
+                                  LIBEVDEV_LIBRARY LIBEVDEV_INCLUDE_DIR)
+
+mark_as_advanced(LIBEVDEV_INCLUDE_DIR LIBEVDEV_LIBRARY )

CMakeTests/FindLibudev.cmake

@@ -0,0 +1,28 @@
+# - Try to find LIBUDEV
+# Once done this will define
+#  LIBUDEV_FOUND - System has LIBUDEV
+#  LIBUDEV_INCLUDE_DIRS - The LIBUDEV include directories
+#  LIBUDEV_LIBRARIES - The libraries needed to use LIBUDEV
+
+FIND_PATH(
+    LIBUDEV_INCLUDE_DIR libudev.h
+    /usr/include
+    /usr/local/include
+    ${LIBUDEV_PATH_INCLUDES}
+)
+
+FIND_LIBRARY(
+    LIBUDEV_LIBRARY
+    NAMES udev libudev
+    PATHS ${ADDITIONAL_LIBRARY_PATHS}
+        ${LIBUDEV_PATH_LIB}
+)
+
+set(LIBUDEV_LIBRARIES ${LIBUDEV_LIBRARY} )
+set(LIBUDEV_INCLUDE_DIRS ${LIBUDEV_INCLUDE_DIR} )
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LIBUDEV  DEFAULT_MSG
+                                  LIBUDEV_LIBRARY LIBUDEV_INCLUDE_DIR)
+
+mark_as_advanced(LIBUDEV_INCLUDE_DIR LIBUDEV_LIBRARY )

CMakeTests/FindPolarSSL.cmake

@@ -34,6 +34,7 @@ if (POLARSSL_FOUND)
 	set(CMAKE_REQUIRED_LIBRARIES ${POLARSSL_LIBRARY})
 	unset(POLARSSL_WORKS CACHE)
 	check_cxx_source_compiles("
+	#include <cstring>
 	#include <polarssl/ctr_drbg.h>
 	#include <polarssl/entropy.h>
 	#include <polarssl/net.h>

CMakeTests/FindSDL2.cmake

@@ -172,9 +172,22 @@ IF(SDL2_LIBRARY_TEMP)
   SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
 
   SET(SDL2_FOUND "YES")
+
+  # extract the major and minor version numbers from SDL2/SDL_version.h
+  # we have to handle framework a little bit differently :
+  if("${SDL2_INCLUDE_DIR}" MATCHES ".framework")
+    set(SDL2_VERSION_H_INPUT "${SDL2_INCLUDE_DIR}/Headers/SDL_version.h")
+  else()
+    set(SDL2_VERSION_H_INPUT "${SDL2_INCLUDE_DIR}/SDL_version.h")
+  endif()
+  FILE(READ "${SDL2_VERSION_H_INPUT}" SDL2_VERSION_H_CONTENTS)
+  STRING(REGEX REPLACE ".*#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+).*#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+).*#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+).*"
+                       "\\1.\\2.\\3" SDL2_VERSION "${SDL2_VERSION_H_CONTENTS}")
+#MESSAGE("SDL2 Version is ${SDL2_VERSION}")
+
 ENDIF(SDL2_LIBRARY_TEMP)
 
 INCLUDE(FindPackageHandleStandardArgs)
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
-                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR VERSION_VAR SDL2_VERSION)

Data/Sys/GameSettings/FB2.ini

@@ -0,0 +1,29 @@
+# FB2E01, FB2P01 - Super Mario Bros. The Lost Levels
+
+[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 = Texture filtering will cause glitches.
+
+[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_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False

Data/Sys/GameSettings/FFY.ini

@@ -0,0 +1,29 @@
+# FFYE01, FFYJ01, FFYP01 - Mega Man 5
+
+[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
+
+[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_Settings]
+SafeTextureCacheColorSamples = 0
+EFBScale = 2
+
+[Video_Hacks]
+EFBToTextureEnable = False
+
+[Video_Enhancements]
+MaxAnisotropy = 0
+ForceFiltering = False

Data/Sys/GameSettings/G2R.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,8 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GAC.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GAFE01.ini

@@ -167,7 +167,7 @@ $NES Balloon Fight - P2 Infinite Lives (donny2112)
 $NES Clu Clu Land - P1 Infinite Lives (donny2112)
 01527EEE 08000000
 01659020 00000009
-$NES Clu Clu Land - Max out Clock (C-stick Right) (donny2112)
+$NES Clu Clu Land - Max out Clock (C Stick Right) (donny2112)
 01523F59 08000000
 BD2F5408 00010000
 03658FCE 00000999
@@ -175,7 +175,7 @@ BD2F5408 00010000
 $NES Clu Clu Land D - P1 Infinite Lives (donny2112)
 01527EEE 08000000
 01659020 00000009
-$NES Clu Clu Land D - Max out Clock (C-stick Right) (donny2112)
+$NES Clu Clu Land D - Max out Clock (C Stick Right) (donny2112)
 01526C12 08000000
 BD2F5408 00010000
 03658FC6 00000999
@@ -183,7 +183,7 @@ BD2F5408 00010000
 $NES Donkey Kong - P1 Infinite Lives (donny2112)
 01523F81 08000000
 01658FF5 00000009
-$NES Donkey Kong - Jump to get Hammer (Hold A+C-stick Right) (donny2112)
+$NES Donkey Kong - Jump to get Hammer (Hold A + C Stick Right) (donny2112)
 015246D9 08000000
 BD2F5408 00810000
 01659040 00000001
@@ -237,7 +237,7 @@ $NES Legend of Zelda - Have Magical Shield (donny2112)
 $NES Legend of Zelda - Max Hearts/Invincibility (donny2112)
 01521605 08000000
 0165960F 000000FF
-$NES Legend of Zelda - Freeze Enemies (C-stick Left) (donny2112)
+$NES Legend of Zelda - Freeze Enemies (C Stick Left) (donny2112)
 01527C62 08000000
 BD2F5408 00020000
 0165960C 00000001

Data/Sys/GameSettings/GALE01r0.ini

@@ -319,10 +319,10 @@ C225910C 00000025
 C022C9E8 00000000
 
 # Gameplay Codes
-$Normal C-Stick Functionality in Singleplayer Modes [Zauron]
+$Normal C Stick Functionality in Singleplayer Modes [Zauron]
 0416AB64 60000000
 
-$Normal C-Stick Functionality in Develop Mode [Magus, Achilles]
+$Normal C Stick Functionality in Develop Mode [Magus, Achilles]
 *Does not work with Nana
 0406AD38 38000000
 04030024 38000000

Data/Sys/GameSettings/GALE01r1.ini

@@ -40,10 +40,10 @@ $Spoof Controller Plugins (P4) [Achilles]
 04375F24 38000001
 
 # Gameplay Codes
-$Normal C-Stick Functionality in Singleplayer Modes [Zauron, Standardtoaster]
+$Normal C Stick Functionality in Singleplayer Modes [Zauron, Standardtoaster]
 0416B18C 60000000
 
-$Normal C-Stick Functionality in Develop Mode [Magus, Achilles]
+$Normal C Stick Functionality in Develop Mode [Magus, Achilles]
 *Does not work with Nana
 0406AE48 38000000
 040300A4 38000000

Data/Sys/GameSettings/GALE01r2.ini

@@ -1,28 +1,6 @@
 # GALE01 - Super Smash Bros. Melee
 
 [ActionReplay]
-$Global Melee Netplay Settings
-0445BF28 FFFFFFFF
-0445BF2C FFFFFFFF
-0045C370 000000FF
-0045BF12 00000001
-0045BF18 00000008
-0045BF14 00000004
-0045BF18 00000008
-041A45A0 3C000202
-041A45A4 901E0000
-0422D638 38000006
-0416B480 60000000
-0445C388 470000B0
-0445C20C 39400000
-0245C390 00030000
-0445C0D4 01010100
-0045C110 00000001
-0445C230 10000000
-0045C114 00000027
-0445C228 80000000
-0045C22C 00001111
-
 $Items Off
 0045C370 000000FF
 
@@ -42,7 +20,7 @@ $Boot to Character Select [Dan Salvato]
 $Debug Menu
 0422D638 38000006
 
-$C-Stick in Single Player [Zauron]
+$C Stick in Single Player [Zauron]
 0416B480 60000000
 
 $Disable Peach's Castle Bullets [Zauron]
@@ -147,9 +125,6 @@ $Input Delay Tester [Dan Salvato]
 $Widescreen Support v1.2 [Dan Salvato]
 04BDC5E4 3FCFC217
 
-$Netplay Safe Kill Music [JMC47]
-024D3886 00000000
-
 $Tournament Stages Only for Random
 0445C388 47000090
 
@@ -168,6 +143,221 @@ $True Special Message Delete [JMC47]
 
 [Gecko]
 # General Codes
+$Netplay Community Settings
+*Boot to CSS, unlock everything, 4 stock 8 minute friendly fire on, trophy messages off,
+*L+R+A+Start during stage load returns to CSS, name tags don't reset on close or exit,
+*L-cancel % on results screen, normal C Stick functionality in 1P modes,
+*Stage striking, A+B salty runback, unrestricted pause camera, C Stick pause camera translation,
+*Normal C Stick functionality in develop mode, debug menu access and set to English,
+*Universal debug menu control, leaving debug menu loads CSS, 20XXTE neutral spawns
+0445BF28 FFFFFFFF
+0445BF2C FFFFFFFF
+0415d94c 4e800020
+041a45a0 3c000202
+041a45a4 901e0000
+C21BFA20 00000003
+3DE08017 61EF2898
+7DE903A6 4E800421
+38600002 00000000
+0424cec4 48000058
+04162ee8 60000000
+0245C390 00000125
+0245C395 01266363
+041644E8 38600001
+041648F4 38600001
+04164F34 38600001
+043D4A48 00340102
+043D4A4C 04000A00
+043D4A50 08010100
+043D4A60 FF000000
+043D4A70 00000000
+043D4A78 E70000B0
+0415d984 4e800020
+0425b8bc 38600002
+04261B1C 60000000
+04261B30 60000000
+041A55EC 4E800020
+C208D600 00000009
+8A830678 3DC08000
+61CE45D4 1EB40008
+7DCEAA14 81EE0000
+39EF0001 91EE0000
+3A0EFFFC 82300000
+7E717BD6 3E408045
+62523DA4 1EB40E90
+7E52AA14 92720000
+3880FFFF 00000000
+C208D6A4 00000009
+8A830678 3DC08000
+61CE45D4 1EB40008
+7DCEAA14 81EE0000
+3A0EFFFC 82300000
+3A310064 92300000
+7E717BD6 3E408045
+62523DA4 1EB40E90
+7E52AA14 92720000
+EC010024 00000000
+04040BBC 60000000
+20C61DB8 16200D20
+06C61DB8 00000014
+1620151A 200C2024
+20312026 2028202F
+1A210300 00000000
+020045D0 000F0000
+E2000001 00000000
+C225A3BC 00000025
+39E00001 3E008046
+6210B0FC 1E2F000C
+7E31802E 5630014B
+4182000C 3A200001
+48000020 56300109
+4182000C 3A200002
+48000010 563002D7
+418200DC 3A200003
+3EA0803F 62B506D0
+3EC0804D 62D66CAE
+3A800000 3A600000
+3A400000 2C110001
+40820014 8A560000
+2C12001C 418100A8
+48000050 2C110003
+40820010 3A80003F
+3A600002 4800003C
+1E12001C 7E10AA14
+8AF0000A 3E008045
+6210C388 82100000
+7E10BC30 561007FF
+41820010 3A600002
+3A80003F 4800000C
+3A600000 3A800000
+1E12001C 7E10A82E
+2C120016 41800008
+82100010 82100018
+82100004 82100008
+8210001C 82100008
+9A900000 1E12001C
+3A100008 7E70A9AE
+3A00001E 9A160000
+2C110001 41820010
+3A520001 2C12001D
+41A0FF4C 39EF0001
+2C0F0005 41A0FEE8
+C022C9E8 00000000
+C216E2DC 00000017
+3C608000 60633300
+3C80804D 88846CAE
+38C00000 7CA6182E
+7C052000 41820014
+2C05FFFF 4182000C
+38C6000C 4BFFFFE8
+38C60004 3CE08048
+88E707C8 2C070000
+41820008 38C60004
+7CA6182E 90A3FFFC
+4182005C 39000000
+3C80803F 60840E06
+80E40000 39080001
+2C080004 40800040
+1D280024 7CC9202E
+7C063800 4082FFE8
+3863FFFC 7D064378
+38C6FFFF 2C060000
+4081001C 7C8618AE
+7CA818AE 7CA619AE
+7C8819AE 3908FFFF
+4BFFFFE0 881F0007
+60000000 00000000
+C216E48C 00000004
+3CA08000 60A532FC
+8085FFFC 7C6428AE
+38840001 9085FFFC
+60000000 00000000
+C216DF54 00000004
+3CA08000 60A532FC
+8085FFFC 7C6428AE
+38840001 9085FFFC
+60000000 00000000
+C216DF30 00000003
+3C808000 608432F8
+38A00000 90A40000
+3B9A0000 00000000
+C216E468 00000003
+3C808000 608432F8
+38A00000 90A40000
+3F600004 00000000
+06003300 00000060
+00000019 00010203
+00020103 00000008
+00010203 02000301
+00000006 00010302
+03000201 0000001a
+01030002 00010203
+00000018 02030001
+00020103 00000012
+03020001 03000201
+0000001c 00030102
+00010302 ffffffff
+00010203 00010203
+0416B480 60000000
+C21A4160 00000008
+39C00000 3DE08046
+61EFB108 820F0000
+5611018D 41820010
+561101CF 41820008
+38000002 39CE0001
+2C0E0004 4080000C
+39EF000C 4BFFFFD8
+981F0003 00000000
+04452F54 42000000
+04452F58 42000000
+04452F5C 42000000
+04452F60 40200000
+04452F64 47000000
+C202CB34 0000000C
+7C040774 3E00804C
+62101FD4 1DE00044
+7E107A14 C022C3D8
+FE200850 C1F00000
+FC0F0840 4081000C
+FC0F8840 41800010
+C21F0314 FE0F802A
+D21F0314 C1F00004
+FC0F0840 4081000C
+FC0F8840 41800010
+C21F0318 FE0F802A
+D21F0318 00000000
+0406AE90 38000000
+040300A4 38000000
+0422D638 38000006
+043FA25B 01000000
+C23039A4 00000016
+39400000 39000000
+38E00008 3C80804C
+608420BC 1CAA0044
+7D242A14 80690008
+70631F10 7D081B78
+80690000 70600020
+41820008 38E00000
+5460C8C6 5060D884
+5060F002 7D080378
+54606006 7D080378
+54604007 4182000C
+38E00000 7D080378
+394A0001 2C0A0004
+4180FFA4 7500F000
+41820028 886DB7AC
+2C030000 41820014
+3863FFFF 986DB7AC
+5508013E 48000014
+98EDB7AC 4800000C
+38600000 986DB7AC
+7D034378 4E800020
+60000000 00000000
+041b0a14 38600002
+
+$Netplay Safe Kill Music [JMC47]
+024D3886 00000000
+
 $Unlock All Characters and Stages [Datel]
 *Also Unlocks All Star Mode, Sound Test, and Vs. Mode Additions
 0445BF28 FFFFFFFF
@@ -353,10 +543,10 @@ C223C5A0 0000000F
 60000000 00000000
 
 # Gameplay Codes
-$Normal C-Stick Functionality in Singleplayer Modes [Zauron]
+$Normal C Stick Functionality in Singleplayer Modes [Zauron]
 0416B480 60000000
 
-$Normal C-Stick Functionality in Develop Mode [Magus, Achilles]
+$Normal C Stick Functionality in Develop Mode [Magus, Achilles]
 *Does not work with Nana
 0406AE90 38000000
 040300A4 38000000
@@ -873,21 +1063,8 @@ C2021ABC 00000002
 60000000 00000000
 C236A4A8 00000007
 C03F0034 2C0E0001
-41820024 3C004260
+41820024 3C004080
-90010030 3C00421C
+90010030 3C004040
-90010034 C0010030
-EC210032 C0010034
-EC210024 39C00000
-281E0000 00000000
-
-$Properly Display in 4:3 [Dan Salvato, mirrorbender]
-C2021ABC 00000002
-39C00001 38600006
-60000000 00000000
-C236A4A8 00000007
-C03F0034 2C0E0001
-41820024 3C004160
-90010030 3C004150
 90010034 C0010030
 EC210032 C0010034
 EC210024 39C00000

Data/Sys/GameSettings/GALP01.ini

@@ -222,7 +222,7 @@ C225AEF4 00000025
 C022CA40 00000000
 
 # Gameplay Codes
-$Normal C-Stick Functionality in Singleplayer Modes [Zauron]
+$Normal C Stick Functionality in Singleplayer Modes [Zauron]
 0416BE50 60000000
 
 $Skip Result Screen & KO Star Count Equals Placement [Sham Rock]

Data/Sys/GameSettings/GAUE08.ini

@@ -31,28 +31,28 @@ $No 4th+ Places
 $No Top Speed/No Shifting Needed
 3A1EA826 00000020
 04205CC0 00000000
-$C-Stick Sends Car 1 Back To Start
+$C Stick Sends Car 1 Back To Start
 3A1EA826 00000080
 00206704 00000000
-$C-Stick Sends Car 2 Back To Start
+$C Stick Sends Car 2 Back To Start
 3A1EA826 00000080
 00207264 00000000
-$C-Stick Sends Car 3 Back To Start
+$C Stick Sends Car 3 Back To Start
 3A1EA826 00000080
 00207DC4 00000000
-$C-Stick Sends Car 4 Back To Start
+$C Stick Sends Car 4 Back To Start
 3A1EA826 00000080
 00208924 00000000
-$C-Stick Sends Car 5 Back To Start
+$C Stick Sends Car 5 Back To Start
 3A1EA826 00000080
 00209484 00000000
-$C-Stick Sends Car 6 Back To Start
+$C Stick Sends Car 6 Back To Start
 3A1EA826 00000080
 00209FE4 00000000
-$C-Stick Sends Car 7 Back To Start
+$C Stick Sends Car 7 Back To Start
 3A1EA826 00000080
 0020AB44 00000000
-$C-Stick Sends All Car Back To Start
+$C Stick Sends All Cars Back To Start
 7A1EA826 00000080
 00000000 80206704
 00000000 00070B60

Data/Sys/GameSettings/GB3.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GBV.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 3
-EmulationIssues = Needs Real xfb for videos to display. Slow audio with HLE.
+EmulationIssues = Needs Real xfb for videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -21,7 +20,3 @@ EmulationIssues = Needs Real xfb for videos to display. Slow audio with HLE.
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
-[DSP]
-EnableJIT = True
-

Data/Sys/GameSettings/GBX.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,7 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True
-

Data/Sys/GameSettings/GDD.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE. Needs real xfb for the videos to display.
+EmulationIssues = Needs real xfb for the videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,11 +17,6 @@ EmulationIssues = Slow audio with HLE. Needs real xfb for the videos to display.
 [ActionReplay]
 # Add action replay cheats here.
 
-[Video]
-
-[DSP]
-EnableJIT = True
-
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True

Data/Sys/GameSettings/GE5.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GFG.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
+EmulationIssues = Needs real xfb for the videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,9 +17,6 @@ EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
 [ActionReplay]
 # Add action replay cheats here.
 
-[DSP]
-EnableJIT = True
-
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True

Data/Sys/GameSettings/GFO.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,8 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GIL.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -20,6 +19,3 @@ EmulationIssues = Slow audio with HLE.
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GLC.ini

@@ -21,7 +21,6 @@ EmulationStateId = 4
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-DstAlphaPass = True
 
 [Video_Hacks]
 EFBToTextureEnable = True

Data/Sys/GameSettings/GM8.ini

@@ -21,4 +21,3 @@ EmulationIssues =
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
-EFBToTextureEnable = False

Data/Sys/GameSettings/GMN.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Videos require real XFB, slow audio with HLE.
+EmulationIssues = Videos require real XFB.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -21,6 +20,3 @@ EmulationIssues = Videos require real XFB, slow audio with HLE.
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GNH.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GOB.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GP8.ini

@@ -2,12 +2,11 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Slow audio with HLE.
+EmulationIssues =
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -17,6 +16,3 @@ EmulationIssues = Slow audio with HLE.
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/GZ2J01.ini

@@ -0,0 +1,40 @@
+# GZ2J01 - The Legend of Zelda: Twilight Princess [GC]
+
+[EmuState]
+EmulationIssues = Enable the "Hyrule Field Speed Hack" patch in game properties for a speed boost.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+$Hyrule Field Speed Hack
+0x8003D50C:dword:0x60000000
+0x8003D528:dword:0x60000000
+0x8003D540:dword:0x60000000
+0x8003D55C:dword:0x60000000
+0x8003D55C:dword:0x60000000
+0x8003D560:dword:0x60000000
+0x8003D564:dword:0x60000000
+0x8003D568:dword:0x60000000
+0x8003D56C:dword:0x60000000
+0x8003D570:dword:0x60000000
+0x8003D574:dword:0x60000000
+0x8003D578:dword:0x60000000
+0x8003D57C:dword:0x60000000
+0x8003D580:dword:0x60000000
+0x8003D584:dword:0x60000000
+0x8003D588:dword:0x60000000
+0x8003D58C:dword:0x60000000
+0x8003D590:dword:0x60000000
+0x8003D594:dword:0x60000000
+0x8003D598:dword:0x60000000
+0x8003D59C:dword:0x60000000
+0x8003D5A0:dword:0x60000000
+0x8003D5A4:dword:0x60000000
+0x8003D5A8:dword:0x60000000
+0x8003D5AC:dword:0x60000000
+0x8003D5B0:dword:0x60000000
+0x8003D5B8:dword:0x60000000
+0x8003D5D4:dword:0x60000000
+0x8003D5EC:dword:0x60000000
+0x8003D608:dword:0x60000000

Data/Sys/GameSettings/GZP.ini

@@ -1,13 +1,12 @@
-# GZPE70, GZPP70- Zapper
+# GZPE70, GZPP70 - Zapper
 
 [Core]
 # Values set here will override the main Dolphin settings.
-DSPHLE = False
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
+EmulationIssues = Needs real xfb for the videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -21,6 +20,3 @@ EmulationIssues = Needs real xfb for the videos to display. Slow audio with HLE.
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
-[DSP]
-EnableJIT = True

Data/Sys/GameSettings/RSB.ini

@@ -16,3 +16,6 @@ EmulationIssues = Classic mode score report needs real xfb. Nes masterpieces and
 
 [ActionReplay]
 # Add action replay cheats here.
+
+[Video_Stereoscopy]
+StereoConvergenceMinimum = 136

Data/Sys/GameSettings/SF8.ini

@@ -20,3 +20,5 @@ EmulationIssues = Sound crackling can be fixed by lle audio.
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 
+[Video_Stereoscopy]
+StereoConvergenceMinimum = 26

Data/Sys/GameSettings/SMN.ini

@@ -5,7 +5,6 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = If "Store EFB Copies to Texture Only" is enabled, "Scaled EFB Copy" needs to be disabled for the coins to spin.
 EmulationStateId = 4
 
 [OnLoad]
@@ -20,5 +19,4 @@ EmulationStateId = 4
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 
-[Video_Hacks]
+[Video_Hacks]
-EFBScaledCopy = False

Data/Sys/Themes/Clean Blue/README.txt

@@ -1,3 +0,0 @@
-By Michael "MaJoR" Roesch of the Dolphin team
-
-dolphin-emu.org

Data/Sys/Themes/Clean Lite/README.txt

@@ -1,3 +0,0 @@
-By Michael "MaJoR" Roesch of the Dolphin team
-
-dolphin-emu.org

Data/Sys/Themes/Clean Pink/README.txt

@@ -1,3 +0,0 @@
-By Michael "MaJoR" Roesch of the Dolphin team
-
-dolphin-emu.org

Data/Sys/Themes/Clean/README.txt

@@ -1,3 +0,0 @@
-By Michael "MaJoR" Roesch of the Dolphin team
-
-dolphin-emu.org

Externals/Bochs_disasm/Bochs_disasm.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -16,7 +16,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

Externals/LZO/LZO.vcxproj

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -16,7 +16,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

Externals/SFML/build/vc2010/SFML_Network.vcxproj

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -16,7 +16,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -80,4 +80,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Externals/SOIL/SOIL.vcxproj

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -16,7 +16,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">

Externals/enet/enet.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -45,7 +45,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -66,4 +66,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Externals/gtest/LICENSE

@@ -0,0 +1,28 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.