diff --git a/Binary/win32/SDL.dll b/Binary/win32/SDL.dll
index 3ce97a59de..a7b6bc6a9d 100644
Binary files a/Binary/win32/SDL.dll and b/Binary/win32/SDL.dll differ
diff --git a/Binary/x64/SDL.dll b/Binary/x64/SDL.dll
new file mode 100644
index 0000000000..8ff4b2802a
Binary files /dev/null and b/Binary/x64/SDL.dll differ
diff --git a/Externals/SDL/win32/include/SDL.h b/Externals/SDL/include/SDL.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL.h
rename to Externals/SDL/include/SDL.h
diff --git a/Externals/SDL/win32/include/SDL_active.h b/Externals/SDL/include/SDL_active.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_active.h
rename to Externals/SDL/include/SDL_active.h
diff --git a/Externals/SDL/win32/include/SDL_audio.h b/Externals/SDL/include/SDL_audio.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_audio.h
rename to Externals/SDL/include/SDL_audio.h
diff --git a/Externals/SDL/win32/include/SDL_byteorder.h b/Externals/SDL/include/SDL_byteorder.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_byteorder.h
rename to Externals/SDL/include/SDL_byteorder.h
diff --git a/Externals/SDL/win32/include/SDL_cdrom.h b/Externals/SDL/include/SDL_cdrom.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_cdrom.h
rename to Externals/SDL/include/SDL_cdrom.h
diff --git a/Externals/SDL/win32/include/SDL_config.h b/Externals/SDL/include/SDL_config.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_config.h
rename to Externals/SDL/include/SDL_config.h
diff --git a/Externals/SDL/win32/include/SDL_config.h.in b/Externals/SDL/include/SDL_config.h.in
similarity index 99%
rename from Externals/SDL/win32/include/SDL_config.h.in
rename to Externals/SDL/include/SDL_config.h.in
index 13a3f9a036..fb49c0e2fa 100644
--- a/Externals/SDL/win32/include/SDL_config.h.in
+++ b/Externals/SDL/include/SDL_config.h.in
@@ -136,6 +136,7 @@
#undef HAVE_CLOCK_GETTIME
#undef HAVE_DLVSYM
#undef HAVE_GETPAGESIZE
+#undef HAVE_MPROTECT
#else
/* We may need some replacement for stdarg.h here */
@@ -201,13 +202,13 @@
#undef SDL_CDROM_WIN32
/* Enable various input drivers */
+#undef SDL_INPUT_LINUXEV
#undef SDL_INPUT_TSLIB
#undef SDL_JOYSTICK_BEOS
#undef SDL_JOYSTICK_DC
#undef SDL_JOYSTICK_DUMMY
#undef SDL_JOYSTICK_IOKIT
#undef SDL_JOYSTICK_LINUX
-#undef SDL_JOYSTICK_LINUXEV
#undef SDL_JOYSTICK_MACOS
#undef SDL_JOYSTICK_MINT
#undef SDL_JOYSTICK_OS2
diff --git a/Externals/SDL/win32/include/SDL_config_dreamcast.h b/Externals/SDL/include/SDL_config_dreamcast.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_config_dreamcast.h
rename to Externals/SDL/include/SDL_config_dreamcast.h
diff --git a/Externals/SDL/win32/include/SDL_config_macos.h b/Externals/SDL/include/SDL_config_macos.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_config_macos.h
rename to Externals/SDL/include/SDL_config_macos.h
diff --git a/Externals/SDL/win32/include/SDL_config_macosx.h b/Externals/SDL/include/SDL_config_macosx.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_config_macosx.h
rename to Externals/SDL/include/SDL_config_macosx.h
diff --git a/Externals/SDL/win32/include/SDL_config_minimal.h b/Externals/SDL/include/SDL_config_minimal.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_config_minimal.h
rename to Externals/SDL/include/SDL_config_minimal.h
diff --git a/Externals/SDL/win32/include/SDL_config_nds.h b/Externals/SDL/include/SDL_config_nds.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_config_nds.h
rename to Externals/SDL/include/SDL_config_nds.h
diff --git a/Externals/SDL/win32/include/SDL_config_os2.h b/Externals/SDL/include/SDL_config_os2.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_config_os2.h
rename to Externals/SDL/include/SDL_config_os2.h
diff --git a/Externals/SDL/win32/include/SDL_config_symbian.h b/Externals/SDL/include/SDL_config_symbian.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_config_symbian.h
rename to Externals/SDL/include/SDL_config_symbian.h
diff --git a/Externals/SDL/win32/include/SDL_config_win32.h b/Externals/SDL/include/SDL_config_win32.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_config_win32.h
rename to Externals/SDL/include/SDL_config_win32.h
diff --git a/Externals/SDL/win32/include/SDL_copying.h b/Externals/SDL/include/SDL_copying.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_copying.h
rename to Externals/SDL/include/SDL_copying.h
diff --git a/Externals/SDL/win32/include/SDL_cpuinfo.h b/Externals/SDL/include/SDL_cpuinfo.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_cpuinfo.h
rename to Externals/SDL/include/SDL_cpuinfo.h
diff --git a/Externals/SDL/win32/include/SDL_endian.h b/Externals/SDL/include/SDL_endian.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_endian.h
rename to Externals/SDL/include/SDL_endian.h
diff --git a/Externals/SDL/win32/include/SDL_error.h b/Externals/SDL/include/SDL_error.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_error.h
rename to Externals/SDL/include/SDL_error.h
diff --git a/Externals/SDL/win32/include/SDL_events.h b/Externals/SDL/include/SDL_events.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_events.h
rename to Externals/SDL/include/SDL_events.h
diff --git a/Externals/SDL/win32/include/SDL_getenv.h b/Externals/SDL/include/SDL_getenv.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_getenv.h
rename to Externals/SDL/include/SDL_getenv.h
diff --git a/Externals/SDL/win32/include/SDL_joystick.h b/Externals/SDL/include/SDL_joystick.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_joystick.h
rename to Externals/SDL/include/SDL_joystick.h
diff --git a/Externals/SDL/win32/include/SDL_keyboard.h b/Externals/SDL/include/SDL_keyboard.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_keyboard.h
rename to Externals/SDL/include/SDL_keyboard.h
diff --git a/Externals/SDL/win32/include/SDL_keysym.h b/Externals/SDL/include/SDL_keysym.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_keysym.h
rename to Externals/SDL/include/SDL_keysym.h
diff --git a/Externals/SDL/win32/include/SDL_loadso.h b/Externals/SDL/include/SDL_loadso.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_loadso.h
rename to Externals/SDL/include/SDL_loadso.h
diff --git a/Externals/SDL/win32/include/SDL_main.h b/Externals/SDL/include/SDL_main.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_main.h
rename to Externals/SDL/include/SDL_main.h
diff --git a/Externals/SDL/win32/include/SDL_mouse.h b/Externals/SDL/include/SDL_mouse.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_mouse.h
rename to Externals/SDL/include/SDL_mouse.h
diff --git a/Externals/SDL/win32/include/SDL_mutex.h b/Externals/SDL/include/SDL_mutex.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_mutex.h
rename to Externals/SDL/include/SDL_mutex.h
diff --git a/Externals/SDL/win32/include/SDL_name.h b/Externals/SDL/include/SDL_name.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_name.h
rename to Externals/SDL/include/SDL_name.h
diff --git a/Externals/SDL/win32/include/SDL_opengl.h b/Externals/SDL/include/SDL_opengl.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_opengl.h
rename to Externals/SDL/include/SDL_opengl.h
diff --git a/Externals/SDL/win32/include/SDL_platform.h b/Externals/SDL/include/SDL_platform.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_platform.h
rename to Externals/SDL/include/SDL_platform.h
diff --git a/Externals/SDL/win32/include/SDL_quit.h b/Externals/SDL/include/SDL_quit.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_quit.h
rename to Externals/SDL/include/SDL_quit.h
diff --git a/Externals/SDL/win32/include/SDL_rwops.h b/Externals/SDL/include/SDL_rwops.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_rwops.h
rename to Externals/SDL/include/SDL_rwops.h
diff --git a/Externals/SDL/win32/include/SDL_stdinc.h b/Externals/SDL/include/SDL_stdinc.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_stdinc.h
rename to Externals/SDL/include/SDL_stdinc.h
diff --git a/Externals/SDL/win32/include/SDL_syswm.h b/Externals/SDL/include/SDL_syswm.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_syswm.h
rename to Externals/SDL/include/SDL_syswm.h
diff --git a/Externals/SDL/win32/include/SDL_thread.h b/Externals/SDL/include/SDL_thread.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_thread.h
rename to Externals/SDL/include/SDL_thread.h
diff --git a/Externals/SDL/win32/include/SDL_timer.h b/Externals/SDL/include/SDL_timer.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_timer.h
rename to Externals/SDL/include/SDL_timer.h
diff --git a/Externals/SDL/win32/include/SDL_types.h b/Externals/SDL/include/SDL_types.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_types.h
rename to Externals/SDL/include/SDL_types.h
diff --git a/Externals/SDL/win32/include/SDL_version.h b/Externals/SDL/include/SDL_version.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_version.h
rename to Externals/SDL/include/SDL_version.h
diff --git a/Externals/SDL/win32/include/SDL_video.h b/Externals/SDL/include/SDL_video.h
similarity index 100%
rename from Externals/SDL/win32/include/SDL_video.h
rename to Externals/SDL/include/SDL_video.h
diff --git a/Externals/SDL/win32/include/begin_code.h b/Externals/SDL/include/begin_code.h
similarity index 100%
rename from Externals/SDL/win32/include/begin_code.h
rename to Externals/SDL/include/begin_code.h
diff --git a/Externals/SDL/win32/include/close_code.h b/Externals/SDL/include/close_code.h
similarity index 100%
rename from Externals/SDL/win32/include/close_code.h
rename to Externals/SDL/include/close_code.h
diff --git a/Externals/SDL/win32/SDL.dll b/Externals/SDL/win32/SDL.dll
new file mode 100644
index 0000000000..a7b6bc6a9d
Binary files /dev/null and b/Externals/SDL/win32/SDL.dll differ
diff --git a/Externals/SDL/win32/SDL.lib b/Externals/SDL/win32/SDL.lib
new file mode 100644
index 0000000000..97362ba56b
Binary files /dev/null and b/Externals/SDL/win32/SDL.lib differ
diff --git a/Externals/SDL/win32/include/SDL_config.h.default b/Externals/SDL/win32/include/SDL_config.h.default
deleted file mode 100644
index c82f42adf0..0000000000
--- a/Externals/SDL/win32/include/SDL_config.h.default
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-#include "SDL_platform.h"
-
-/* Add any platform that doesn't build using the configure system */
-#if defined(__DREAMCAST__)
-#include "SDL_config_dreamcast.h"
-#elif defined(__MACOS__)
-#include "SDL_config_macos.h"
-#elif defined(__MACOSX__)
-#include "SDL_config_macosx.h"
-#elif defined(__SYMBIAN32__)
-#include "SDL_config_symbian.h" /* must be before win32! */
-#elif defined(__WIN32__)
-#include "SDL_config_win32.h"
-#elif defined(__OS2__)
-#include "SDL_config_os2.h"
-#else
-#include "SDL_config_minimal.h"
-#endif /* platform config */
-
-#endif /* _SDL_config_h */
diff --git a/Externals/SDL/win32/include/SDL_config_amiga.h b/Externals/SDL/win32/include/SDL_config_amiga.h
deleted file mode 100644
index 23e0861928..0000000000
--- a/Externals/SDL/win32/include/SDL_config_amiga.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2006 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_amiga_h
-#define _SDL_config_amiga_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#define SDL_HAS_64BIT_TYPE 1
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STRING_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_AHI 1
-#define SDL_AUDIO_DRIVER_DISK 1
-#define SDL_AUDIO_DRIVER_DUMMY 1
-
-/* Enable various cdrom drivers */
-#define SDL_CDROM_DUMMY 1
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_AMIGA 1
-
-/* Enable various shared object loading systems */
-#define SDL_LOADSO_DUMMY 1
-
-/* Enable various threading systems */
-#define SDL_THREAD_AMIGA 1
-
-/* Enable various timer systems */
-#define SDL_TIMER_AMIGA 1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_CYBERGRAPHICS 1
-#define SDL_VIDEO_DRIVER_DUMMY 1
-
-/* Enable OpenGL support */
-#define SDL_VIDEO_OPENGL 1
-
-#endif /* _SDL_config_amiga_h */
diff --git a/Externals/SDL/win32/lib/SDL.dll b/Externals/SDL/win32/lib/SDL.dll
deleted file mode 100644
index 3ce97a59de..0000000000
Binary files a/Externals/SDL/win32/lib/SDL.dll and /dev/null differ
diff --git a/Externals/SDL/win32/lib/SDL.lib b/Externals/SDL/win32/lib/SDL.lib
deleted file mode 100644
index 993fd2ba7e..0000000000
Binary files a/Externals/SDL/win32/lib/SDL.lib and /dev/null differ
diff --git a/Externals/SDL/win32/lib/SDLmain.lib b/Externals/SDL/win32/lib/SDLmain.lib
deleted file mode 100644
index 13bf9f970d..0000000000
Binary files a/Externals/SDL/win32/lib/SDLmain.lib and /dev/null differ
diff --git a/Externals/SDL/win32/version.txt b/Externals/SDL/win32/version.txt
deleted file mode 100644
index 404cf266d0..0000000000
--- a/Externals/SDL/win32/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-SDL-1.2.13
\ No newline at end of file
diff --git a/Externals/SDL/x64/SDL.dll b/Externals/SDL/x64/SDL.dll
new file mode 100644
index 0000000000..8ff4b2802a
Binary files /dev/null and b/Externals/SDL/x64/SDL.dll differ
diff --git a/Externals/SDL/x64/SDL.lib b/Externals/SDL/x64/SDL.lib
new file mode 100644
index 0000000000..ab1f22975c
Binary files /dev/null and b/Externals/SDL/x64/SDL.lib differ
diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln
index 3d337db0e8..be8fec9a18 100644
--- a/Source/Dolphin.sln
+++ b/Source/Dolphin.sln
@@ -265,8 +265,8 @@ Global
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.Debug|Win32.Build.0 = Debug|Win32
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.Debug|x64.ActiveCfg = Debug|x64
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.Debug|x64.Build.0 = Debug|x64
- {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.DebugFast|Win32.ActiveCfg = Debug|Win32
- {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.DebugFast|Win32.Build.0 = Debug|Win32
+ {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+ {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.DebugFast|Win32.Build.0 = DebugFast|Win32
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.DebugFast|x64.ActiveCfg = DebugFast|x64
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.DebugFast|x64.Build.0 = DebugFast|x64
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.Release|Win32.ActiveCfg = Release|Win32
@@ -287,13 +287,16 @@ Global
{805B34AA-82A5-4875-8DC7-3C85BDC0BCEE}.Release|x64.Build.0 = Release|x64
{521498BE-6089-4780-8223-E67C22F4E068}.Debug|Win32.ActiveCfg = Debug|Win32
{521498BE-6089-4780-8223-E67C22F4E068}.Debug|Win32.Build.0 = Debug|Win32
- {521498BE-6089-4780-8223-E67C22F4E068}.Debug|x64.ActiveCfg = Debug|Win32
- {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|Win32.ActiveCfg = Debug|Win32
- {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|Win32.Build.0 = Debug|Win32
- {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|x64.ActiveCfg = Debug|Win32
+ {521498BE-6089-4780-8223-E67C22F4E068}.Debug|x64.ActiveCfg = Debug|x64
+ {521498BE-6089-4780-8223-E67C22F4E068}.Debug|x64.Build.0 = Debug|x64
+ {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+ {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|Win32.Build.0 = DebugFast|Win32
+ {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|x64.ActiveCfg = DebugFast|x64
+ {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|x64.Build.0 = DebugFast|x64
{521498BE-6089-4780-8223-E67C22F4E068}.Release|Win32.ActiveCfg = Release|Win32
{521498BE-6089-4780-8223-E67C22F4E068}.Release|Win32.Build.0 = Release|Win32
- {521498BE-6089-4780-8223-E67C22F4E068}.Release|x64.ActiveCfg = Release|Win32
+ {521498BE-6089-4780-8223-E67C22F4E068}.Release|x64.ActiveCfg = Release|x64
+ {521498BE-6089-4780-8223-E67C22F4E068}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
index 5c3da4269c..c65eb95e61 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
+++ b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
@@ -11,14 +11,17 @@
+
@@ -40,7 +43,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/config.cpp b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/config.cpp
index ff8660c2ab..c857c7bec2 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/config.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/config.cpp
@@ -47,7 +47,7 @@ int OpenConfig(HINSTANCE hInst, HWND _hParent)
psp[0].hInstance = hInst;
psp[0].pszTemplate = MAKEINTRESOURCE(IDD_CONFIG);
psp[0].pszIcon = NULL;
- psp[0].pfnDlgProc = ControllerTab1;
+ psp[0].pfnDlgProc = (DLGPROC)ControllerTab1;
psp[0].pszTitle = "Controller 1";
psp[0].lParam = 0;
@@ -56,7 +56,7 @@ int OpenConfig(HINSTANCE hInst, HWND _hParent)
psp[1].hInstance = hInst;
psp[1].pszTemplate = MAKEINTRESOURCE(IDD_CONFIG);
psp[1].pszIcon = NULL;
- psp[1].pfnDlgProc = ControllerTab2;
+ psp[1].pfnDlgProc = (DLGPROC)ControllerTab2;
psp[1].pszTitle = "Controller 2";
psp[1].lParam = 0;
@@ -65,7 +65,7 @@ int OpenConfig(HINSTANCE hInst, HWND _hParent)
psp[2].hInstance = hInst;
psp[2].pszTemplate = MAKEINTRESOURCE(IDD_CONFIG);
psp[2].pszIcon = NULL;
- psp[2].pfnDlgProc = ControllerTab3;
+ psp[2].pfnDlgProc = (DLGPROC)ControllerTab3;
psp[2].pszTitle = "Controller 3";
psp[2].lParam = 0;
@@ -74,7 +74,7 @@ int OpenConfig(HINSTANCE hInst, HWND _hParent)
psp[3].hInstance = hInst;
psp[3].pszTemplate = MAKEINTRESOURCE(IDD_CONFIG);
psp[3].pszIcon = NULL;
- psp[3].pfnDlgProc = ControllerTab4;
+ psp[3].pfnDlgProc = (DLGPROC)ControllerTab4;
psp[3].pszTitle = "Controller 4";
psp[3].lParam = 0;
@@ -484,7 +484,7 @@ int GetButton(HWND hDlg, int item)
void OpenAbout(HINSTANCE hInst, HWND _hParent)
{
- DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT), _hParent, AboutDlg);
+ DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT), _hParent, (DLGPROC)AboutDlg);
}
BOOL CALLBACK AboutDlg(HWND abouthWnd, UINT message, WPARAM wParam, LPARAM lParam)
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/nJoy.h
index a1ac25c3a7..532957dbb4 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/nJoy.h
+++ b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL/nJoy.h
@@ -43,7 +43,7 @@
#include "IniFile.h"
#pragma comment(lib, "SDL.lib")
-#pragma comment(lib, "SDLmain.lib")
+// #pragma comment(lib, "SDLmain.lib")
//////////////////////////////////////////////////////////////////////////////////////////
// Define