mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 17:19:44 -06:00
Fix Building in Linux, removed the define for _T() in Common.h so now we can have wx headers after including Common.h. Also, InterlockedExchange isn't in Linux so I just made it assign the variable
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@809 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -106,7 +106,7 @@ bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_game
|
||||
{
|
||||
if (_gameID != NULL)
|
||||
{
|
||||
BuildCompleteFilename(strMapFilename, _T("maps"), std::string(_gameID) + _T(".map"));
|
||||
BuildCompleteFilename(strMapFilename, "maps", std::string(_gameID) + ".map");
|
||||
success = g_symbolDB.LoadMap(strMapFilename.c_str());
|
||||
}
|
||||
}
|
||||
|
@ -535,7 +535,11 @@ void UpdateFifoRegister()
|
||||
dist = wp - rp;
|
||||
else
|
||||
dist = (wp - fifo.CPBase) + (fifo.CPEnd - rp);
|
||||
InterlockedExchange((LONG*)&fifo.CPReadWriteDistance,dist);
|
||||
#ifdef _WIN32
|
||||
InterlockedExchange((LONG*)&fifo.CPReadWriteDistance, dist);
|
||||
#else
|
||||
fifo.CPReadWriteDistance = dist;
|
||||
#endif
|
||||
//#ifdef _WIN32
|
||||
// not needed since we are already in the critical section in DC mode (see write16)
|
||||
// if (Core::g_CoreStartupParameter.bUseDualCore) LeaveCriticalSection(&fifo.sync);
|
||||
|
Reference in New Issue
Block a user