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

Merge branch 'master' of github.com:project64/project64 into wx_3.0

This commit is contained in:
Julio C. Rocha 2015-11-10 19:23:06 -08:00
parent d12e345cba 2b35fd2cff
commit 39da51dd39
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64/Plugins/Controller Plugin.h
View File

@ -71,8 +71,8 @@ public:
private: private:
friend CControl_Plugin; //controller plugin class has full access friend CControl_Plugin; //controller plugin class has full access
uint32_t & m_Present; int32_t & m_Present;
uint32_t & m_RawData; int32_t & m_RawData;
int32_t & m_PlugType; int32_t & m_PlugType;
BUTTONS m_Buttons; BUTTONS m_Buttons;

5
Source/Project64/Project64.vcxproj
View File

@ -39,6 +39,9 @@
<StackReserveSize>1</StackReserveSize> <StackReserveSize>1</StackReserveSize>
<DataExecutionPrevention>false</DataExecutionPrevention> <DataExecutionPrevention>false</DataExecutionPrevention>
</Link> </Link>
<Manifest>
<EnableDPIAwareness>true</EnableDPIAwareness>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Logging.cpp" /> <ClCompile Include="Logging.cpp" />
@ -319,4 +322,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
</Project> </Project>