ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from cxd4/master 

fixes to linking (and compiling N-Rage) in VS2010
This commit is contained in:
project64 2015-01-31 08:04:53 +11:00
parent 8e715efe44 b9d1eb4f38
commit 0862430c67
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Project64/Project64.vcproj
View File

@ -51,6 +51,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
SubSystem="2" SubSystem="2"
RandomizedBaseAddress="1"
FixedBaseAddress="2" FixedBaseAddress="2"
DataExecutionPrevention="1" DataExecutionPrevention="1"
/> />

3
Source/nragev20/XInputController.h
View File

@ -33,6 +33,9 @@
#include <oleauto.h> #include <oleauto.h>
//#include <wmsstd.h> <-- only needed for SAFE_RELEASE(x) //#include <wmsstd.h> <-- only needed for SAFE_RELEASE(x)
/* fixes undefined FILE, etc. type errors in MSVC 2010 build -- cxd4 */
#include <stdio.h>
#ifndef SAFE_RELEASE // when Windows Media Device M? is not present #ifndef SAFE_RELEASE // when Windows Media Device M? is not present
#define SAFE_RELEASE(x) \ #define SAFE_RELEASE(x) \
if(x != NULL) \ if(x != NULL) \