Merge branch 'master' of https://github.com/wgois/OIS

Conflicts: demos/OISConsole.cpp Had pushed this fix to the wrong repo previously - KR

Merge branch 'master' of https://github.com/wgois/OIS
Conflicts: demos/OISConsole.cpp Had pushed this fix to the wrong repo previously - KR
7087bd0f · Kyle Rassweiler · abd16784 · 692546bf · 7087bd0f · 7087bd0f
Commit 7087bd0f authored Nov 15, 2015 by Kyle Rassweiler
20 changed files
--- a/Win32/DemoFFTest/DemoFFTest_vs2010.vcxproj
+++ b/Win32/DemoFFTest/DemoFFTest_vs2010.vcxproj
--- a/Win32/DemoFFTest/FF.rc
+++ b/Win32/DemoFFTest/FF.rc
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-//#include "afxres.h"
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1)
-#endif
-#include "winresrc.h" 
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG1 DIALOGEX 0, 0, 100, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Capture Window"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    LTEXT           "This window is used as Input Capture Window, and to display some info. Press Q or ESC to exit or hit button 1 of joystick",
-                    IDC_STATIC,7,7,82,86
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_DIALOG1, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        TOPMARGIN, 7
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+//#include "afxres.h"
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+#include "winresrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_DIALOG1 DIALOGEX 0, 0, 100, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Capture Window"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "This window is used as Input Capture Window, and to display some info. Press Q or ESC to exit or hit button 1 of joystick",
+                    IDC_STATIC,7,7,82,86
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_DIALOG1, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        TOPMARGIN, 7
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
--- a/Win32/DemoFFTest/resource.h
+++ b/Win32/DemoFFTest/resource.h
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by CommandLine.rc
-//
-#define IDD_DIALOG1                     101
-#define IDC_BUTTON1                     1001
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1002
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by CommandLine.rc
+//
+#define IDD_DIALOG1                     101
+#define IDC_BUTTON1                     1001
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1002
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
--- a/Win32/OIS.rc
+++ b/Win32/OIS.rc
--- a/Win32/OIS.vcproj
+++ b/Win32/OIS.vcproj
--- a/Win32/OIS.workspace
+++ b/Win32/OIS.workspace
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_workspace_file>
-	<Workspace title="ois workspace">
-		<Project filename="ois.cbp" active="1" />
-		<Project filename="DemoFFTest\DemoFFTest.cbp">
-			<Depends filename="ois.cbp" />
-		</Project>
-		<Project filename="CommandLine\CommandLine.cbp">
-			<Depends filename="ois.cbp" />
-		</Project>
-	</Workspace>
-</CodeBlocks_workspace_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_workspace_file>
+	<Workspace title="ois workspace">
+		<Project filename="ois.cbp" active="1" />
+		<Project filename="DemoFFTest\DemoFFTest.cbp">
+			<Depends filename="ois.cbp" />
+		</Project>
+		<Project filename="CommandLine\CommandLine.cbp">
+			<Depends filename="ois.cbp" />
+		</Project>
+	</Workspace>
+</CodeBlocks_workspace_file>
--- a/Win32/OIS_vc8.vcproj
+++ b/Win32/OIS_vc8.vcproj
--- a/Win32/OIS_vc9.vcproj
+++ b/Win32/OIS_vc9.vcproj
--- a/Win32/OIS_vs2010.sln
+++ b/Win32/OIS_vs2010.sln
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OIS", "OIS_vs2010.vcxproj", "{9CC704CB-4956-4479-BDEC-57CBC03F700E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_Console", "CommandLine\CommandLine_vs2010.vcxproj", "{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_FFTest", "DemoFFTest\DemoFFTest_vs2010.vcxproj", "{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.Build.0 = Debug|Win32
-		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|x64.ActiveCfg = Debug|x64
-		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|x64.Build.0 = Debug|x64
-		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.ActiveCfg = Release|Win32
-		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.Build.0 = Release|Win32
-		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|x64.ActiveCfg = Release|x64
-		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|x64.Build.0 = Release|x64
-		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|Win32.Build.0 = Debug|Win32
-		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|x64.ActiveCfg = Debug|x64
-		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|x64.Build.0 = Debug|x64
-		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|Win32.ActiveCfg = Release|Win32
-		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|Win32.Build.0 = Release|Win32
-		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|x64.ActiveCfg = Release|x64
-		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|x64.Build.0 = Release|x64
-		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|Win32.Build.0 = Debug|Win32
-		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|x64.ActiveCfg = Debug|x64
-		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|x64.Build.0 = Debug|x64
-		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|Win32.ActiveCfg = Release|Win32
-		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|Win32.Build.0 = Release|Win32
-		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|x64.ActiveCfg = Release|x64
-		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OIS", "OIS_vs2010.vcxproj", "{9CC704CB-4956-4479-BDEC-57CBC03F700E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_Console", "CommandLine\CommandLine_vs2010.vcxproj", "{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_FFTest", "DemoFFTest\DemoFFTest_vs2010.vcxproj", "{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.Build.0 = Debug|Win32
+		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|x64.ActiveCfg = Debug|x64
+		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|x64.Build.0 = Debug|x64
+		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.ActiveCfg = Release|Win32
+		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.Build.0 = Release|Win32
+		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|x64.ActiveCfg = Release|x64
+		{9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|x64.Build.0 = Release|x64
+		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|Win32.Build.0 = Debug|Win32
+		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|x64.ActiveCfg = Debug|x64
+		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|x64.Build.0 = Debug|x64
+		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|Win32.ActiveCfg = Release|Win32
+		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|Win32.Build.0 = Release|Win32
+		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|x64.ActiveCfg = Release|x64
+		{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|x64.Build.0 = Release|x64
+		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|Win32.Build.0 = Debug|Win32
+		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|x64.ActiveCfg = Debug|x64
+		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|x64.Build.0 = Debug|x64
+		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|Win32.ActiveCfg = Release|Win32
+		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|Win32.Build.0 = Release|Win32
+		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|x64.ActiveCfg = Release|x64
+		{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/Win32/OIS_vs2010.vcxproj
+++ b/Win32/OIS_vs2010.vcxproj
--- a/Win32/OIS_vs2010.vcxproj.filters
+++ b/Win32/OIS_vs2010.vcxproj.filters
--- a/Win32/SDL/OIS_sdl_vc8.vcproj
+++ b/Win32/SDL/OIS_sdl_vc8.vcproj
--- a/Win32/SDL/SdlDemo/SdlDemo.cpp
+++ b/Win32/SDL/SdlDemo/SdlDemo.cpp
--- a/Win32/SDL/SdlDemo/SdlDemo.rc
+++ b/Win32/SDL/SdlDemo/SdlDemo.rc
--- a/Win32/SDL/SdlDemo/SdlDemo.vcproj
+++ b/Win32/SDL/SdlDemo/SdlDemo.vcproj
--- a/Win32/SDL/SdlDemo/resource.h
+++ b/Win32/SDL/SdlDemo/resource.h
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by SdlDemo.rc
-//
-#define IDD_MAIN_WINDOW                 101
-#define IDC_OUTPUT                      1001
-#define IDC_SDL_WIN                     1002
-#define IDC_BUFF_MOUSE                  1003
-#define IDC_BUFF_KEYS                   1004
-#define ID_EXIT                         1005
-#define IDC_BUTTON1                     1006
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1007
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by SdlDemo.rc
+//
+#define IDD_MAIN_WINDOW                 101
+#define IDC_OUTPUT                      1001
+#define IDC_SDL_WIN                     1002
+#define IDC_BUFF_MOUSE                  1003
+#define IDC_BUFF_KEYS                   1004
+#define ID_EXIT                         1005
+#define IDC_BUTTON1                     1006
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1007
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
--- a/Win32/SDL/ois_sdl_vc8.sln
+++ b/Win32/SDL/ois_sdl_vc8.sln
--- a/Win32/ois.cbp
+++ b/Win32/ois.cbp
--- a/Win32/ois.sln
+++ b/Win32/ois.sln
--- a/Win32/ois_vc8.sln
+++ b/Win32/ois_vc8.sln