Merge pull request #759 from cxd4/fix-nrage

Get N-Rage linking with MinGW 64-bit.

Source/Script/MinGW/nrage.cmd

@@ -54,8 +54,18 @@ set OBJ_LIST=^
  %obj%\PakIO.o^
  %obj%\FileAccess.o^
  %obj%\Interface.o^
- %obj%\NRagePluginV2.o
+ %obj%\NRagePluginV2.o^
+ -ldinput8^
+ -loleaut32^
+ -lole32^
+ -luuid^
+ -lcomctl32^
+ -mwindows^
+ -lcomdlg32^
+ -lgdi32^
+ %obj%\NRagePluginV2.res
 
 ECHO Linking N-Rage objects...
+%MinGW%\bin\windres.exe -o %obj%\NRagePluginV2.res -i %src%\NRagePluginV2.rc -O coff
 %MinGW%\bin\g++.exe -o %obj%\PJ64_NRage.dll %OBJ_LIST% -shared -shared-libgcc
 PAUSE

Source/nragev20/Debug.h

@@ -24,7 +24,7 @@
 #ifndef _DEBUG_H_
 #define _DEBUG_H_
 
-#include <wtypes.h>
+#include <windows.h>
 
 #ifdef _DEBUG
 

Source/nragev20/XInputController.cpp

@@ -19,6 +19,10 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+//code from http://msdn.microsoft.com/en-us/library/ee417014(VS.85).aspx
+#include <windows.h>
+#include <wbemidl.h>
+
 #include "XInputController.h"
 #include "FileAccess.h"
 #include <wchar.h>

Source/nragev20/XInputController.h

@@ -28,9 +28,6 @@
 #ifndef _XINPUTCONTROLLER_H
 #define _XINPUTCONTROLLER_H
 
-//code from http://msdn.microsoft.com/en-us/library/ee417014(VS.85).aspx
-#include <wbemidl.h>
-#include <oleauto.h>
 //#include <wmsstd.h> <-- only needed for SAFE_RELEASE(x)
 
 /* fixes undefined FILE, etc. type errors in MSVC 2010 build -- cxd4 */

Source/nragev20/commonIncludes.h

@@ -29,7 +29,6 @@
 
 #include "settings.h"
 #include <tchar.h>
-#include <wtypes.h>
 #include "resource.h"
 #include "Debug.h"
 
@@ -42,7 +41,8 @@
 
 #ifdef ARRAYSIZE
 #undef ARRAYSIZE
-#define ARRAYSIZE( array ) (sizeof(array) / sizeof(array[0]))
+#endif //ARRAYSIZE
-#endif	//ARRAYSIZE
+
+#define ARRAYSIZE(array)        (sizeof(array) / sizeof((array)[0]))
 
 #endif // #ifndef _COMMONINCLUDES_H_