empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linux: Fixed compilation errors/warnings

Browse source
This commit is contained in:
Sour 2019-01-16 23:54:00 -05:00
parent 47cb79681b
commit 3ee389781f
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/MemoryDumper.cpp
View file

@ -256,6 +256,7 @@ uint8_t MemoryDumper::GetMemoryValue(DebugMemoryType memoryType, uint32_t addres
case DebugMemoryType::ChrRam: case DebugMemoryType::ChrRam:
case DebugMemoryType::WorkRam: case DebugMemoryType::WorkRam:
case DebugMemoryType::SaveRam: case DebugMemoryType::SaveRam:
case DebugMemoryType::NametableRam:
return _mapper->GetMemoryValue(memoryType, address); return _mapper->GetMemoryValue(memoryType, address);
case DebugMemoryType::InternalRam: return _memoryManager->DebugRead(address); case DebugMemoryType::InternalRam: return _memoryManager->DebugRead(address);

2
Core/ShortcutKeyHandler.cpp
View file

@ -274,7 +274,7 @@ void ShortcutKeyHandler::ProcessKeys()
if(_runSingleFrameRepeatTimer) { if(_runSingleFrameRepeatTimer) {
double elapsedMs = _runSingleFrameRepeatTimer->GetElapsedMS(); double elapsedMs = _runSingleFrameRepeatTimer->GetElapsedMS();
if(_repeatStarted && elapsedMs >= 50 || !_repeatStarted && elapsedMs >= 500) { if((_repeatStarted && elapsedMs >= 50) || (!_repeatStarted && elapsedMs >= 500)) {
//Over 500ms has elapsed since the key was first pressed, or over 50ms since repeat mode started (20fps) //Over 500ms has elapsed since the key was first pressed, or over 50ms since repeat mode started (20fps)
//In this case, run another frame and pause again. //In this case, run another frame and pause again.
_repeatStarted = true; _repeatStarted = true;

4
Lua/compat.h
View file

@ -4,6 +4,10 @@
#include "lua.h" #include "lua.h"
#include "lauxlib.h" #include "lauxlib.h"
#ifndef _WIN32
#define gai_strerrorA gai_strerror
#endif
#if LUA_VERSION_NUM==501 #if LUA_VERSION_NUM==501
void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup); void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup);
void *luaL_testudata ( lua_State *L, int arg, const char *tname); void *luaL_testudata ( lua_State *L, int arg, const char *tname);