Linux build fixes and some warning cleanup for GCC
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2406 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox
parent
3d9b3ba117
commit
8c93e39ddd
|
|
@ -84,3 +84,4 @@ public:
|
|||
};
|
||||
|
||||
#endif // _FIXED_SIZE_QUEUE_H
|
||||
|
||||
|
|
|
|||
|
|
@ -67,3 +67,4 @@
|
|||
///////////////////////////
|
||||
|
||||
#endif // __SETUP_h__
|
||||
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@ Thread::~Thread()
|
|||
}
|
||||
|
||||
|
||||
void Thread::WaitForDeath(const int _Wait)
|
||||
void Thread::WaitForDeath()
|
||||
{
|
||||
if (thread_id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include "Common.h"
|
||||
///////////////////////////////////
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Definitions
|
||||
// ------------
|
||||
|
|
@ -89,7 +88,11 @@ public:
|
|||
|
||||
void SetAffinity(int mask);
|
||||
static void SetCurrentThreadAffinity(int mask);
|
||||
#ifdef _WIN32
|
||||
void WaitForDeath(const int _Wait = INFINITE);
|
||||
#else
|
||||
void WaitForDeath();
|
||||
#endif
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
|||
|
|
@ -33,3 +33,4 @@ struct STileMetaContent
|
|||
// [TODO]: this global internal stuff sux... the whole data should be inside the ES
|
||||
// but this is the easiest way atm
|
||||
extern std::vector<STileMetaContent> m_TileMetaContent;
|
||||
|
||||
|
|
|
|||
|
|
@ -302,7 +302,11 @@ void Stop()
|
|||
if (GetParent((HWND)g_pWindowHandle) == NULL)
|
||||
#endif
|
||||
#ifndef SETUP_TIMER_WAITING // This is moved
|
||||
#ifdef _WIN32
|
||||
g_EmuThread->WaitForDeath(5000);
|
||||
#else
|
||||
g_EmuThread->WaitForDeath();
|
||||
#endif
|
||||
delete g_EmuThread; // Wait for emuthread to close.
|
||||
g_EmuThread = 0;
|
||||
#endif
|
||||
|
|
@ -575,7 +579,11 @@ void EmuThreadEnd()
|
|||
if (cpuThread)
|
||||
{
|
||||
// There is a CPU thread - join it.
|
||||
#ifdef _WIN32
|
||||
cpuThread->WaitForDeath(5000);
|
||||
#else
|
||||
cpuThread->WaitForDeath();
|
||||
#endif
|
||||
delete cpuThread;
|
||||
// Returns after game exited
|
||||
cpuThread = NULL;
|
||||
|
|
|
|||
|
|
@ -41,3 +41,4 @@ void SetSourcePath(const std::string path)
|
|||
sourcePath = path;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,3 +29,4 @@ namespace SDInterface
|
|||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -128,3 +128,4 @@ class wxCheatsWindow : public wxFrame
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -281,7 +281,6 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
|
|||
wxString::From8BitData(rISOFile.GetDescription((int)SConfig::GetInstance().m_InterfaceLanguage).c_str()), -1);
|
||||
break;
|
||||
}
|
||||
|
||||
SetItem(_Index, COLUMN_COMPANY, wxString::From8BitData(rISOFile.GetCompany().c_str()), -1);
|
||||
|
||||
SetItem(_Index, COLUMN_SIZE, NiceSizeFormat(rISOFile.GetFileSize()), -1);
|
||||
|
|
@ -943,3 +942,4 @@ bool CGameListCtrl::CopySJISToString( wxString& _rDestination, const char* _src
|
|||
#endif
|
||||
return returnCode;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -61,3 +61,4 @@ void wxSDCardWindow::OnEvent_ButtonClose_Press(wxCommandEvent& WXUNUSED(event))
|
|||
{
|
||||
EndModal(0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -43,3 +43,4 @@ protected:
|
|||
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -250,3 +250,4 @@ std::string VKToString(int keycode)
|
|||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -364,3 +364,4 @@ void GetButton(SDL_Joystick *joy, int ControllerID, int buttons, int axes, int h
|
|||
|
||||
|
||||
} // InputCommon
|
||||
|
||||
|
|
|
|||
|
|
@ -43,3 +43,4 @@ bool IsConnected(int Controller);
|
|||
} // XInput
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -25,3 +25,4 @@ bool SaveTexture(const char* filename, u32 textarget, u32 tex, int width, int he
|
|||
bool SaveData(const char* filename, const char* pdata);
|
||||
|
||||
#endif // _IMAGEWRITE_H
|
||||
|
||||
|
|
|
|||
|
|
@ -24,3 +24,4 @@ namespace VertexManager
|
|||
u8* s_pCurBufferPointer = NULL;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,3 +38,4 @@ void CloseConsole();
|
|||
HWND GetConsoleHwnd(void);
|
||||
#endif
|
||||
/////////////////////////////
|
||||
|
||||
|
|
|
|||
|
|
@ -143,3 +143,4 @@ enum {
|
|||
#endif
|
||||
|
||||
#endif // win32
|
||||
|
||||
|
|
|
|||
|
|
@ -28,3 +28,4 @@ void DrawMessages(); // draw the current messages on the screen. Only call once
|
|||
} // namespace
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -36,3 +36,4 @@ void SetShaderParameters(u32 width, u32 height, u32 offsetX, u32 offsetY, float
|
|||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,18 @@
|
|||
#include "EmuDefinitions.h" // for PadMapping
|
||||
#include "main.h"
|
||||
|
||||
// TODO: Figure out what to do for non-Win32
|
||||
#ifndef _WIN32
|
||||
#define VK_LEFT 0
|
||||
#define VK_RIGHT 0
|
||||
#define VK_UP 0
|
||||
#define VK_DOWN 0
|
||||
#define VK_NUMPAD4 0
|
||||
#define VK_NUMPAD6 0
|
||||
#define VK_NUMPAD8 0
|
||||
#define VK_NUMPAD5 0
|
||||
#endif
|
||||
|
||||
Config g_Config;
|
||||
|
||||
Config::Config()
|
||||
|
|
@ -65,7 +77,6 @@ void Config::Load(bool ChangePad)
|
|||
iniFile.Get(TmpSection.c_str(), "IRHeight", &iIRHeight, BOTTOM - TOP);
|
||||
|
||||
// Default controls
|
||||
#ifdef _WIN32
|
||||
int WmA = 65, WmB = 66,
|
||||
Wm1 = 49, Wm2 = 50,
|
||||
WmP = 80, WmM = 77, WmH = 72,
|
||||
|
|
@ -83,24 +94,6 @@ void Config::Load(bool ChangePad)
|
|||
CcDl = VK_NUMPAD4, CcDu = VK_NUMPAD8, CcDr = VK_NUMPAD6, CcDd = VK_NUMPAD5, // Numpad
|
||||
CcLl = 0x4a, CcLu = 0x49, CcLr = 0x4c, CcLd = 0x4b, // J, I, L, K
|
||||
CcRl = 0x44, CcRu = 0x52, CcRr = 0x47, CcRd = 0x46; // D, R, G, F
|
||||
#else
|
||||
int WmA = 0, WmB = 0,
|
||||
Wm1 = 0, Wm2 = 0,
|
||||
WmP = 0, WmM = 0, WmH = 0,
|
||||
WmL = 0, WmR = 0, WmU = 0, WmD = 0,
|
||||
WmShake = 0,
|
||||
WmPitchL = 0, WmPitchR = 0,
|
||||
|
||||
NcZ = 0, NcC = 0, NcL = 0, NcR = 0, NcU = 0, NcD = 0,
|
||||
NcShake = 0,
|
||||
|
||||
CcA = 0, CcB = 0, CcX = 0, CcY = 0, // C, Z, X, Y
|
||||
CcP = 0, CcM = 0, CcH = 0, // O instead of P, N instead of M, U instead of H
|
||||
CcTl = 0, CcZl = 0, CcZr = 0, CcTr = 0, // 7, 8, 9, 0
|
||||
CcDl = 0, CcDu = 0, CcDr = 0, CcDd = 0, // Numpad
|
||||
CcLl = 0, CcLu = 0x49, CcLr = 0, CcLd = 0, // J, I, L, K
|
||||
CcRl = 0, CcRu = 0x52, CcRr = 0, CcRd = 0; // D, R, G, F
|
||||
#endif
|
||||
|
||||
for (int i = 0; i < 1; i++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -192,3 +192,4 @@ void GetJoyState(InputCommon::CONTROLLER_STATE_NEW &_PadState, InputCommon::CONT
|
|||
|
||||
|
||||
} // end of namespace WiiMoteEmu
|
||||
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ void wiimote_gen_key(wiimote_key *key, u8 *keydata);
|
|||
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -38,3 +38,4 @@ void ClearScreen();
|
|||
///////////////////////////////
|
||||
|
||||
#endif // WIIMOTE_CONSOLE_H
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue