fix for issue 411, njoy testing is re-enabled in windows, but not for debug config (it hates logging?)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1573 8ced0084-cf51-0410-be5f-012b33b47a6e

4 files changed, 54 insertions, 63 deletions

diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln
index 968ed171ab..792e513ee2 100644
--- a/Source/Dolphin.sln
+++ b/Source/Dolphin.sln
@@ -372,9 +372,13 @@ Global
 		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|Win32.ActiveCfg = Debug|Win32

 		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|x64.ActiveCfg = Debug|x64

 		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|Win32.ActiveCfg = DebugFast|Win32

+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|Win32.Build.0 = DebugFast|Win32

 		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|x64.ActiveCfg = DebugFast|x64

+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|x64.Build.0 = DebugFast|x64

 		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|Win32.ActiveCfg = Release|Win32

+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|Win32.Build.0 = Release|Win32

 		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|x64.ActiveCfg = Release|x64

+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|x64.Build.0 = Release|x64

 		{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Debug|Win32.ActiveCfg = Debug|Win32

 		{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Debug|Win32.Build.0 = Debug|Win32

 		{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
index a6b4ddd4d3..1555f6acaf 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
@@ -32,55 +32,47 @@
 // Set this if you want to use the rumble 'hack' for controller one
 //#define USE_RUMBLE_DINPUT_HACK
 
-#include "Common.h"
-#ifdef _WIN32
-#define _CRT_SECURE_NO_WARNINGS
-#define DIRECTINPUT_VERSION 0x0800
-#define WIN32_LEAN_AND_MEAN
-#include <tchar.h>
-#include <math.h>
-
-#ifdef USE_RUMBLE_DINPUT_HACK
-#include <dinput.h>		// used for rumble
-#endif
-
-#endif
-
 #include <vector>
 #include <stdio.h>
 #include <time.h>
 #include <SDL.h>
 
-#ifdef _WIN32
-#define SLEEP(x) Sleep(x)
-#else
-#include <unistd.h>
-#include <sys/ioctl.h>
-#define SLEEP(x) usleep(x*1000)
-#endif
-#ifdef __linux__
-#include <linux/input.h>
-#endif
+#include "Common.h"
+#include "pluginspecs_pad.h"
+#include "IniFile.h"
 
 #if defined(HAVE_WX) && HAVE_WX
 #include "GUI/AboutBox.h"
 #include "GUI/ConfigBox.h"
 #endif
 
-#include "Common.h"
-#include "pluginspecs_pad.h"
-#include "IniFile.h"
-
 #ifdef _WIN32
 #pragma comment(lib, "SDL.lib")
 #pragma comment(lib, "comctl32.lib")
+#include <tchar.h>
+#include <math.h>
+#define _CRT_SECURE_NO_WARNINGS
+#define DIRECTINPUT_VERSION 0x0800
+#define WIN32_LEAN_AND_MEAN
 
-// Required for the rumble part
 #ifdef USE_RUMBLE_DINPUT_HACK
 #pragma comment(lib, "dxguid.lib")
 #pragma comment(lib, "dinput8.lib")
 #pragma comment(lib, "winmm.lib")
+#include <dinput.h>
 #endif
+#endif // _WIN32
+
+#ifdef _WIN32
+#define SLEEP(x) Sleep(x)
+#else
+#include <unistd.h>
+#include <sys/ioctl.h>
+#define SLEEP(x) usleep(x*1000)
+#endif
+
+#ifdef __linux__
+#include <linux/input.h>
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj b/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj
index 53ad61616e..d75e8404db 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj
+++ b/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj
@@ -52,7 +52,7 @@
 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="true"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="4"

 			/>

 			<Tool

@@ -132,7 +132,7 @@
 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -210,7 +210,7 @@
 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="true"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -289,7 +289,7 @@
 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -369,7 +369,7 @@
 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="true"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -449,7 +449,7 @@
 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h
index b361766193..4d5d7d9e35 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h
+++ b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h
@@ -32,52 +32,47 @@
 // Set this if you want to use the rumble 'hack' for controller one
 //#define USE_RUMBLE_DINPUT_HACK
 
-#ifdef _WIN32
-#define _CRT_SECURE_NO_WARNINGS
-#define DIRECTINPUT_VERSION 0x0800
-#define WIN32_LEAN_AND_MEAN
-#include <tchar.h>
-#include <math.h>
-
-#ifdef USE_RUMBLE_DINPUT_HACK
-#include <dinput.h>		// used for rumble
-#endif
-
-#endif
-
 #include <vector>
 #include <stdio.h>
 #include <time.h>
 #include <SDL.h>
 
-#ifdef _WIN32
-#define SLEEP(x) Sleep(x)
-#else
-#include <unistd.h>
-#include <sys/ioctl.h>
-#define SLEEP(x) usleep(x*1000)
-#endif
-#ifdef __linux__
-#include <linux/input.h>
-#endif
-
-#include "GUI/AboutBox.h"
-#include "GUI/ConfigBox.h"
-
 #include "Common.h"
 #include "pluginspecs_pad.h"
 #include "IniFile.h"
 
+#if defined(HAVE_WX) && HAVE_WX
+#include "GUI/AboutBox.h"
+#include "GUI/ConfigBox.h"
+#endif
+
 #ifdef _WIN32
 #pragma comment(lib, "SDL.lib")
 #pragma comment(lib, "comctl32.lib")
+#include <tchar.h>
+#include <math.h>
+#define _CRT_SECURE_NO_WARNINGS
+#define DIRECTINPUT_VERSION 0x0800
+#define WIN32_LEAN_AND_MEAN
 
-// Required for the rumble part
 #ifdef USE_RUMBLE_DINPUT_HACK
 #pragma comment(lib, "dxguid.lib")
 #pragma comment(lib, "dinput8.lib")
 #pragma comment(lib, "winmm.lib")
+#include <dinput.h>
 #endif
+#endif // _WIN32
+
+#ifdef _WIN32
+#define SLEEP(x) Sleep(x)
+#else
+#include <unistd.h>
+#include <sys/ioctl.h>
+#define SLEEP(x) usleep(x*1000)
+#endif
+
+#ifdef __linux__
+#include <linux/input.h>
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////////////