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

Linux build fix. 

Also fixed a couple of compiler warnings (one in SystemTimers.cpp that was an actual bug too!).


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6185 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-09-06 13:38:22 +00:00
parent d02dd6d3fa
commit c551a2ee51
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/HW/SystemTimers.cpp
View File

@ -285,7 +285,7 @@ void Init()
fakeTBStartTicks = CoreTiming::GetTicks(); fakeTBStartTicks = CoreTiming::GetTicks();
fakeDecStartValue = 0xFFFFFFFF; fakeDecStartValue = 0xFFFFFFFF;
u64 fakeDecStartTicks = CoreTiming::GetTicks(); fakeDecStartTicks = CoreTiming::GetTicks();
et_Dec = CoreTiming::RegisterEvent("DecCallback", DecrementerCallback); et_Dec = CoreTiming::RegisterEvent("DecCallback", DecrementerCallback);
et_AI = CoreTiming::RegisterEvent("AICallback", AICallback); et_AI = CoreTiming::RegisterEvent("AICallback", AICallback);

2
Source/Core/Core/Src/IPC_HLE/hci.h
View File

@ -79,6 +79,8 @@
#pragma once #pragma once
#include <stdint.h>
// All structs in this file are packed // All structs in this file are packed
#pragma pack(push, 1) #pragma pack(push, 1)

6
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.h
View File

@ -141,14 +141,14 @@ private:
// WiiMote accel data // WiiMote accel data
AccelData m_accel; AccelData m_accel;
// wiimote index, 0-3
const unsigned int m_index;
double ir_sin,ir_cos; //for the low pass filter double ir_sin,ir_cos; //for the low pass filter
//UDPWiimote //UDPWiimote
UDPWrapper* m_udp; UDPWrapper* m_udp;
// wiimote index, 0-3
const unsigned int m_index;
bool m_rumble_on; bool m_rumble_on;
bool m_speaker_mute; bool m_speaker_mute;