Linux compile fixes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2246 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
cf068ebb06
commit
71d9832004
|
@ -30,5 +30,4 @@ files = [
|
||||||
|
|
||||||
env_common = env.Clone()
|
env_common = env.Clone()
|
||||||
env_common.Append(CXXFLAGS = [ '-fPIC' ])
|
env_common.Append(CXXFLAGS = [ '-fPIC' ])
|
||||||
env_common.Append(CXXFLAGS = [ '-mssse3' ]) # For TextureDecoder
|
|
||||||
env_common.StaticLibrary("videocommon", files)
|
env_common.StaticLibrary("videocommon", files)
|
||||||
|
|
|
@ -170,6 +170,7 @@ bool RecordingPlayIR(IRReportType &_IR)
|
||||||
// Return true if this particual numerical key is pressed
|
// Return true if this particual numerical key is pressed
|
||||||
bool IsNumericalKeyPressed(int _Key)
|
bool IsNumericalKeyPressed(int _Key)
|
||||||
{
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
// Check which key it is
|
// Check which key it is
|
||||||
std::string TmpKey = StringFromFormat("%i", _Key);
|
std::string TmpKey = StringFromFormat("%i", _Key);
|
||||||
if(GetAsyncKeyState(TmpKey[0]))
|
if(GetAsyncKeyState(TmpKey[0]))
|
||||||
|
@ -177,11 +178,16 @@ bool IsNumericalKeyPressed(int _Key)
|
||||||
else
|
else
|
||||||
// That numerical key is pressed
|
// That numerical key is pressed
|
||||||
return false;
|
return false;
|
||||||
|
#else
|
||||||
|
// TODO linux port
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if a switch is pressed
|
// Check if a switch is pressed
|
||||||
bool IsSwitchPressed(int _Key)
|
bool IsSwitchPressed(int _Key)
|
||||||
{
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
// Check if that switch is pressed
|
// Check if that switch is pressed
|
||||||
switch (_Key)
|
switch (_Key)
|
||||||
{
|
{
|
||||||
|
@ -192,6 +198,10 @@ bool IsSwitchPressed(int _Key)
|
||||||
|
|
||||||
// That switch was not pressed
|
// That switch was not pressed
|
||||||
return false;
|
return false;
|
||||||
|
#else
|
||||||
|
// TODO linux port
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if we should start the playback of a recording. Once it has been started it can currently
|
// Check if we should start the playback of a recording. Once it has been started it can currently
|
||||||
|
|
Loading…
Reference in New Issue