From c551a2ee51b6e336daa5198c20f3e4aab32f11b5 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 6 Sep 2010 13:38:22 +0000 Subject: [PATCH] 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 --- Source/Core/Core/Src/HW/SystemTimers.cpp | 2 +- Source/Core/Core/Src/IPC_HLE/hci.h | 2 ++ .../Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.h | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index 69491cad8f..815aaafe37 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -285,7 +285,7 @@ void Init() fakeTBStartTicks = CoreTiming::GetTicks(); fakeDecStartValue = 0xFFFFFFFF; - u64 fakeDecStartTicks = CoreTiming::GetTicks(); + fakeDecStartTicks = CoreTiming::GetTicks(); et_Dec = CoreTiming::RegisterEvent("DecCallback", DecrementerCallback); et_AI = CoreTiming::RegisterEvent("AICallback", AICallback); diff --git a/Source/Core/Core/Src/IPC_HLE/hci.h b/Source/Core/Core/Src/IPC_HLE/hci.h index c3fb538b07..150e81a709 100644 --- a/Source/Core/Core/Src/IPC_HLE/hci.h +++ b/Source/Core/Core/Src/IPC_HLE/hci.h @@ -79,6 +79,8 @@ #pragma once +#include + // All structs in this file are packed #pragma pack(push, 1) diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.h b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.h index 1be37eda18..114fa9bddd 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.h +++ b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/WiimoteEmu.h @@ -141,14 +141,14 @@ private: // WiiMote accel data AccelData m_accel; + // wiimote index, 0-3 + const unsigned int m_index; + double ir_sin,ir_cos; //for the low pass filter //UDPWiimote UDPWrapper* m_udp; - // wiimote index, 0-3 - const unsigned int m_index; - bool m_rumble_on; bool m_speaker_mute;