From b0dff2853945c91212d526985293bcc21efc903f Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Wed, 16 Jun 2010 01:14:18 +0000
Subject: [PATCH] Attempt to resolve the conflict between SDL/include and
 SDL/Include.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5717 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Externals/SDL/{Include => Include_1.3}/SDL.h         |  0
 Externals/SDL/{Include => Include_1.3}/SDL_audio.h   |  0
 Externals/SDL/{Include => Include_1.3}/SDL_cdrom.h   |  0
 Externals/SDL/{Include => Include_1.3}/SDL_compat.h  |  0
 Externals/SDL/{Include => Include_1.3}/SDL_config.h  |  0
 .../{Include => Include_1.3}/SDL_config.h.default    |  0
 .../SDL/{Include => Include_1.3}/SDL_config.h.in     |  0
 .../{Include => Include_1.3}/SDL_config_dreamcast.h  |  0
 .../{Include => Include_1.3}/SDL_config_iphoneos.h   |  0
 .../SDL/{Include => Include_1.3}/SDL_config_macosx.h |  0
 .../{Include => Include_1.3}/SDL_config_minimal.h    |  0
 .../{Include => Include_1.3}/SDL_config_nintendods.h |  0
 .../SDL/{Include => Include_1.3}/SDL_config_os2.h    |  0
 .../SDL/{Include => Include_1.3}/SDL_config_win32.h  |  0
 Externals/SDL/{Include => Include_1.3}/SDL_copying.h |  0
 Externals/SDL/{Include => Include_1.3}/SDL_cpuinfo.h |  0
 Externals/SDL/{Include => Include_1.3}/SDL_endian.h  |  0
 Externals/SDL/{Include => Include_1.3}/SDL_error.h   |  0
 Externals/SDL/{Include => Include_1.3}/SDL_events.h  |  0
 Externals/SDL/{Include => Include_1.3}/SDL_haptic.h  |  0
 .../SDL/{Include => Include_1.3}/SDL_joystick.h      |  0
 .../SDL/{Include => Include_1.3}/SDL_keyboard.h      |  0
 Externals/SDL/{Include => Include_1.3}/SDL_keysym.h  |  0
 Externals/SDL/{Include => Include_1.3}/SDL_loadso.h  |  0
 Externals/SDL/{Include => Include_1.3}/SDL_main.h    |  0
 Externals/SDL/{Include => Include_1.3}/SDL_mouse.h   |  0
 Externals/SDL/{Include => Include_1.3}/SDL_mutex.h   |  0
 Externals/SDL/{Include => Include_1.3}/SDL_name.h    |  0
 Externals/SDL/{Include => Include_1.3}/SDL_opengl.h  |  0
 .../SDL/{Include => Include_1.3}/SDL_opengles.h      |  0
 Externals/SDL/{Include => Include_1.3}/SDL_pixels.h  |  0
 .../SDL/{Include => Include_1.3}/SDL_platform.h      |  0
 Externals/SDL/{Include => Include_1.3}/SDL_quit.h    |  0
 Externals/SDL/{Include => Include_1.3}/SDL_rect.h    |  0
 .../SDL/{Include => Include_1.3}/SDL_revision.h      |  0
 Externals/SDL/{Include => Include_1.3}/SDL_rwops.h   |  0
 .../SDL/{Include => Include_1.3}/SDL_scancode.h      |  0
 Externals/SDL/{Include => Include_1.3}/SDL_stdinc.h  |  0
 Externals/SDL/{Include => Include_1.3}/SDL_surface.h |  0
 Externals/SDL/{Include => Include_1.3}/SDL_syswm.h   |  0
 Externals/SDL/{Include => Include_1.3}/SDL_thread.h  |  0
 Externals/SDL/{Include => Include_1.3}/SDL_timer.h   |  0
 Externals/SDL/{Include => Include_1.3}/SDL_types.h   |  0
 Externals/SDL/{Include => Include_1.3}/SDL_version.h |  0
 Externals/SDL/{Include => Include_1.3}/SDL_video.h   |  0
 Externals/SDL/{Include => Include_1.3}/begin_code.h  |  0
 Externals/SDL/{Include => Include_1.3}/close_code.h  |  0
 Externals/SDL/{Include => Include_1.3}/doxyfile      |  0
 .../Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj   | 12 ++++++------
 Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj  | 12 ++++++------
 .../Plugin_WiimoteNew/Plugin_WiimoteNew.vcproj       | 12 ++++++------
 51 files changed, 18 insertions(+), 18 deletions(-)
 rename Externals/SDL/{Include => Include_1.3}/SDL.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_audio.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_cdrom.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_compat.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config.h.default (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config.h.in (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config_dreamcast.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config_iphoneos.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config_macosx.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config_minimal.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config_nintendods.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config_os2.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_config_win32.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_copying.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_cpuinfo.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_endian.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_error.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_events.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_haptic.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_joystick.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_keyboard.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_keysym.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_loadso.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_main.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_mouse.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_mutex.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_name.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_opengl.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_opengles.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_pixels.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_platform.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_quit.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_rect.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_revision.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_rwops.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_scancode.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_stdinc.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_surface.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_syswm.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_thread.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_timer.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_types.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_version.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/SDL_video.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/begin_code.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/close_code.h (100%)
 rename Externals/SDL/{Include => Include_1.3}/doxyfile (100%)

diff --git a/Externals/SDL/Include/SDL.h b/Externals/SDL/Include_1.3/SDL.h
similarity index 100%
rename from Externals/SDL/Include/SDL.h
rename to Externals/SDL/Include_1.3/SDL.h
diff --git a/Externals/SDL/Include/SDL_audio.h b/Externals/SDL/Include_1.3/SDL_audio.h
similarity index 100%
rename from Externals/SDL/Include/SDL_audio.h
rename to Externals/SDL/Include_1.3/SDL_audio.h
diff --git a/Externals/SDL/Include/SDL_cdrom.h b/Externals/SDL/Include_1.3/SDL_cdrom.h
similarity index 100%
rename from Externals/SDL/Include/SDL_cdrom.h
rename to Externals/SDL/Include_1.3/SDL_cdrom.h
diff --git a/Externals/SDL/Include/SDL_compat.h b/Externals/SDL/Include_1.3/SDL_compat.h
similarity index 100%
rename from Externals/SDL/Include/SDL_compat.h
rename to Externals/SDL/Include_1.3/SDL_compat.h
diff --git a/Externals/SDL/Include/SDL_config.h b/Externals/SDL/Include_1.3/SDL_config.h
similarity index 100%
rename from Externals/SDL/Include/SDL_config.h
rename to Externals/SDL/Include_1.3/SDL_config.h
diff --git a/Externals/SDL/Include/SDL_config.h.default b/Externals/SDL/Include_1.3/SDL_config.h.default
similarity index 100%
rename from Externals/SDL/Include/SDL_config.h.default
rename to Externals/SDL/Include_1.3/SDL_config.h.default
diff --git a/Externals/SDL/Include/SDL_config.h.in b/Externals/SDL/Include_1.3/SDL_config.h.in
similarity index 100%
rename from Externals/SDL/Include/SDL_config.h.in
rename to Externals/SDL/Include_1.3/SDL_config.h.in
diff --git a/Externals/SDL/Include/SDL_config_dreamcast.h b/Externals/SDL/Include_1.3/SDL_config_dreamcast.h
similarity index 100%
rename from Externals/SDL/Include/SDL_config_dreamcast.h
rename to Externals/SDL/Include_1.3/SDL_config_dreamcast.h
diff --git a/Externals/SDL/Include/SDL_config_iphoneos.h b/Externals/SDL/Include_1.3/SDL_config_iphoneos.h
similarity index 100%
rename from Externals/SDL/Include/SDL_config_iphoneos.h
rename to Externals/SDL/Include_1.3/SDL_config_iphoneos.h
diff --git a/Externals/SDL/Include/SDL_config_macosx.h b/Externals/SDL/Include_1.3/SDL_config_macosx.h
similarity index 100%
rename from Externals/SDL/Include/SDL_config_macosx.h
rename to Externals/SDL/Include_1.3/SDL_config_macosx.h
diff --git a/Externals/SDL/Include/SDL_config_minimal.h b/Externals/SDL/Include_1.3/SDL_config_minimal.h
similarity index 100%
rename from Externals/SDL/Include/SDL_config_minimal.h
rename to Externals/SDL/Include_1.3/SDL_config_minimal.h
diff --git a/Externals/SDL/Include/SDL_config_nintendods.h b/Externals/SDL/Include_1.3/SDL_config_nintendods.h
similarity index 100%
rename from Externals/SDL/Include/SDL_config_nintendods.h
rename to Externals/SDL/Include_1.3/SDL_config_nintendods.h
diff --git a/Externals/SDL/Include/SDL_config_os2.h b/Externals/SDL/Include_1.3/SDL_config_os2.h
similarity index 100%
rename from Externals/SDL/Include/SDL_config_os2.h
rename to Externals/SDL/Include_1.3/SDL_config_os2.h
diff --git a/Externals/SDL/Include/SDL_config_win32.h b/Externals/SDL/Include_1.3/SDL_config_win32.h
similarity index 100%
rename from Externals/SDL/Include/SDL_config_win32.h
rename to Externals/SDL/Include_1.3/SDL_config_win32.h
diff --git a/Externals/SDL/Include/SDL_copying.h b/Externals/SDL/Include_1.3/SDL_copying.h
similarity index 100%
rename from Externals/SDL/Include/SDL_copying.h
rename to Externals/SDL/Include_1.3/SDL_copying.h
diff --git a/Externals/SDL/Include/SDL_cpuinfo.h b/Externals/SDL/Include_1.3/SDL_cpuinfo.h
similarity index 100%
rename from Externals/SDL/Include/SDL_cpuinfo.h
rename to Externals/SDL/Include_1.3/SDL_cpuinfo.h
diff --git a/Externals/SDL/Include/SDL_endian.h b/Externals/SDL/Include_1.3/SDL_endian.h
similarity index 100%
rename from Externals/SDL/Include/SDL_endian.h
rename to Externals/SDL/Include_1.3/SDL_endian.h
diff --git a/Externals/SDL/Include/SDL_error.h b/Externals/SDL/Include_1.3/SDL_error.h
similarity index 100%
rename from Externals/SDL/Include/SDL_error.h
rename to Externals/SDL/Include_1.3/SDL_error.h
diff --git a/Externals/SDL/Include/SDL_events.h b/Externals/SDL/Include_1.3/SDL_events.h
similarity index 100%
rename from Externals/SDL/Include/SDL_events.h
rename to Externals/SDL/Include_1.3/SDL_events.h
diff --git a/Externals/SDL/Include/SDL_haptic.h b/Externals/SDL/Include_1.3/SDL_haptic.h
similarity index 100%
rename from Externals/SDL/Include/SDL_haptic.h
rename to Externals/SDL/Include_1.3/SDL_haptic.h
diff --git a/Externals/SDL/Include/SDL_joystick.h b/Externals/SDL/Include_1.3/SDL_joystick.h
similarity index 100%
rename from Externals/SDL/Include/SDL_joystick.h
rename to Externals/SDL/Include_1.3/SDL_joystick.h
diff --git a/Externals/SDL/Include/SDL_keyboard.h b/Externals/SDL/Include_1.3/SDL_keyboard.h
similarity index 100%
rename from Externals/SDL/Include/SDL_keyboard.h
rename to Externals/SDL/Include_1.3/SDL_keyboard.h
diff --git a/Externals/SDL/Include/SDL_keysym.h b/Externals/SDL/Include_1.3/SDL_keysym.h
similarity index 100%
rename from Externals/SDL/Include/SDL_keysym.h
rename to Externals/SDL/Include_1.3/SDL_keysym.h
diff --git a/Externals/SDL/Include/SDL_loadso.h b/Externals/SDL/Include_1.3/SDL_loadso.h
similarity index 100%
rename from Externals/SDL/Include/SDL_loadso.h
rename to Externals/SDL/Include_1.3/SDL_loadso.h
diff --git a/Externals/SDL/Include/SDL_main.h b/Externals/SDL/Include_1.3/SDL_main.h
similarity index 100%
rename from Externals/SDL/Include/SDL_main.h
rename to Externals/SDL/Include_1.3/SDL_main.h
diff --git a/Externals/SDL/Include/SDL_mouse.h b/Externals/SDL/Include_1.3/SDL_mouse.h
similarity index 100%
rename from Externals/SDL/Include/SDL_mouse.h
rename to Externals/SDL/Include_1.3/SDL_mouse.h
diff --git a/Externals/SDL/Include/SDL_mutex.h b/Externals/SDL/Include_1.3/SDL_mutex.h
similarity index 100%
rename from Externals/SDL/Include/SDL_mutex.h
rename to Externals/SDL/Include_1.3/SDL_mutex.h
diff --git a/Externals/SDL/Include/SDL_name.h b/Externals/SDL/Include_1.3/SDL_name.h
similarity index 100%
rename from Externals/SDL/Include/SDL_name.h
rename to Externals/SDL/Include_1.3/SDL_name.h
diff --git a/Externals/SDL/Include/SDL_opengl.h b/Externals/SDL/Include_1.3/SDL_opengl.h
similarity index 100%
rename from Externals/SDL/Include/SDL_opengl.h
rename to Externals/SDL/Include_1.3/SDL_opengl.h
diff --git a/Externals/SDL/Include/SDL_opengles.h b/Externals/SDL/Include_1.3/SDL_opengles.h
similarity index 100%
rename from Externals/SDL/Include/SDL_opengles.h
rename to Externals/SDL/Include_1.3/SDL_opengles.h
diff --git a/Externals/SDL/Include/SDL_pixels.h b/Externals/SDL/Include_1.3/SDL_pixels.h
similarity index 100%
rename from Externals/SDL/Include/SDL_pixels.h
rename to Externals/SDL/Include_1.3/SDL_pixels.h
diff --git a/Externals/SDL/Include/SDL_platform.h b/Externals/SDL/Include_1.3/SDL_platform.h
similarity index 100%
rename from Externals/SDL/Include/SDL_platform.h
rename to Externals/SDL/Include_1.3/SDL_platform.h
diff --git a/Externals/SDL/Include/SDL_quit.h b/Externals/SDL/Include_1.3/SDL_quit.h
similarity index 100%
rename from Externals/SDL/Include/SDL_quit.h
rename to Externals/SDL/Include_1.3/SDL_quit.h
diff --git a/Externals/SDL/Include/SDL_rect.h b/Externals/SDL/Include_1.3/SDL_rect.h
similarity index 100%
rename from Externals/SDL/Include/SDL_rect.h
rename to Externals/SDL/Include_1.3/SDL_rect.h
diff --git a/Externals/SDL/Include/SDL_revision.h b/Externals/SDL/Include_1.3/SDL_revision.h
similarity index 100%
rename from Externals/SDL/Include/SDL_revision.h
rename to Externals/SDL/Include_1.3/SDL_revision.h
diff --git a/Externals/SDL/Include/SDL_rwops.h b/Externals/SDL/Include_1.3/SDL_rwops.h
similarity index 100%
rename from Externals/SDL/Include/SDL_rwops.h
rename to Externals/SDL/Include_1.3/SDL_rwops.h
diff --git a/Externals/SDL/Include/SDL_scancode.h b/Externals/SDL/Include_1.3/SDL_scancode.h
similarity index 100%
rename from Externals/SDL/Include/SDL_scancode.h
rename to Externals/SDL/Include_1.3/SDL_scancode.h
diff --git a/Externals/SDL/Include/SDL_stdinc.h b/Externals/SDL/Include_1.3/SDL_stdinc.h
similarity index 100%
rename from Externals/SDL/Include/SDL_stdinc.h
rename to Externals/SDL/Include_1.3/SDL_stdinc.h
diff --git a/Externals/SDL/Include/SDL_surface.h b/Externals/SDL/Include_1.3/SDL_surface.h
similarity index 100%
rename from Externals/SDL/Include/SDL_surface.h
rename to Externals/SDL/Include_1.3/SDL_surface.h
diff --git a/Externals/SDL/Include/SDL_syswm.h b/Externals/SDL/Include_1.3/SDL_syswm.h
similarity index 100%
rename from Externals/SDL/Include/SDL_syswm.h
rename to Externals/SDL/Include_1.3/SDL_syswm.h
diff --git a/Externals/SDL/Include/SDL_thread.h b/Externals/SDL/Include_1.3/SDL_thread.h
similarity index 100%
rename from Externals/SDL/Include/SDL_thread.h
rename to Externals/SDL/Include_1.3/SDL_thread.h
diff --git a/Externals/SDL/Include/SDL_timer.h b/Externals/SDL/Include_1.3/SDL_timer.h
similarity index 100%
rename from Externals/SDL/Include/SDL_timer.h
rename to Externals/SDL/Include_1.3/SDL_timer.h
diff --git a/Externals/SDL/Include/SDL_types.h b/Externals/SDL/Include_1.3/SDL_types.h
similarity index 100%
rename from Externals/SDL/Include/SDL_types.h
rename to Externals/SDL/Include_1.3/SDL_types.h
diff --git a/Externals/SDL/Include/SDL_version.h b/Externals/SDL/Include_1.3/SDL_version.h
similarity index 100%
rename from Externals/SDL/Include/SDL_version.h
rename to Externals/SDL/Include_1.3/SDL_version.h
diff --git a/Externals/SDL/Include/SDL_video.h b/Externals/SDL/Include_1.3/SDL_video.h
similarity index 100%
rename from Externals/SDL/Include/SDL_video.h
rename to Externals/SDL/Include_1.3/SDL_video.h
diff --git a/Externals/SDL/Include/begin_code.h b/Externals/SDL/Include_1.3/begin_code.h
similarity index 100%
rename from Externals/SDL/Include/begin_code.h
rename to Externals/SDL/Include_1.3/begin_code.h
diff --git a/Externals/SDL/Include/close_code.h b/Externals/SDL/Include_1.3/close_code.h
similarity index 100%
rename from Externals/SDL/Include/close_code.h
rename to Externals/SDL/Include_1.3/close_code.h
diff --git a/Externals/SDL/Include/doxyfile b/Externals/SDL/Include_1.3/doxyfile
similarity index 100%
rename from Externals/SDL/Include/doxyfile
rename to Externals/SDL/Include_1.3/doxyfile
diff --git a/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj b/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj
index e32ef83007..0b215bdb30 100644
--- a/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj
+++ b/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -293,7 +293,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -373,7 +373,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;DEBUGFAST;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -455,7 +455,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;DEBUGFAST;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj
index 233b97b639..b46f31a0eb 100644
--- a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj
+++ b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\include;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -130,7 +130,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\include;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -213,7 +213,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\include;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				AssemblerListingLocation="$(IntDir)\"
@@ -299,7 +299,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\include;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				AssemblerListingLocation="$(IntDir)\"
@@ -382,7 +382,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\include;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
 				PreprocessorDefinitions="DEBUGFAST;WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				WarningLevel="3"
@@ -465,7 +465,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\include;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\..\Externals\WiiUse\inc;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\Core\Common\Src;..\..\Core\InputCommon\Src;..\..\Core\InputUICommon\Src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS;DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				WarningLevel="3"
diff --git a/Source/Plugins/Plugin_WiimoteNew/Plugin_WiimoteNew.vcproj b/Source/Plugins/Plugin_WiimoteNew/Plugin_WiimoteNew.vcproj
index f7f5b03621..7524a9fdcc 100644
--- a/Source/Plugins/Plugin_WiimoteNew/Plugin_WiimoteNew.vcproj
+++ b/Source/Plugins/Plugin_WiimoteNew/Plugin_WiimoteNew.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Plugin_WiimoteNew_TEST_EXPORTS;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -130,7 +130,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Plugin_WiimoteNew_TEST_EXPORTS;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -213,7 +213,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Plugin_WiimoteNew_TEST_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				AssemblerListingLocation="$(IntDir)\"
@@ -299,7 +299,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Plugin_WiimoteNew_TEST_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				AssemblerListingLocation="$(IntDir)\"
@@ -382,7 +382,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="DEBUGFAST;WIN32;NDEBUG;_WINDOWS;_USRDLL;Plugin_WiimoteNew_TEST_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				WarningLevel="3"
@@ -465,7 +465,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.3;..\..\Core\Common\Src;..\InputPluginCommon\Src;..\..\Core\InputCommon\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Plugin_WiimoteNew_TEST_EXPORTS;DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				WarningLevel="3"