ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compile fix on linux 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2005 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-01-24 22:24:44 +00:00
parent 0db67cf51c
commit 2e92b94e4a
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DiscIO/Src/BannerLoader.cpp
View File

@ -170,8 +170,8 @@ bool IBannerLoader::CopyUnicodeToString( std::string& _rDestination, const u16*
} }
} }
#else #else
// not implement other than windows // FIXME: Horribly broke on non win32
_rDestination = _src; // _rDestination = _src;
returnCode = true; returnCode = true;
#endif #endif
return returnCode; return returnCode;

2
Source/Core/DiscIO/Src/BannerLoaderWii.cpp
View File

@ -126,11 +126,13 @@ CBannerLoaderWii::GetName(std::string& _rName, DiscIO::IVolume::ECountry languag
// find Banner type // find Banner type
SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile; SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile;
#ifdef _WIN32
if (DiscIO::IVolume::COUNTRY_JAP == language) if (DiscIO::IVolume::COUNTRY_JAP == language)
{ {
return CopyUnicodeToString(_rName, pBanner->m_Comment[0]); return CopyUnicodeToString(_rName, pBanner->m_Comment[0]);
} }
else else
#endif
{ {
// very stupid // very stupid
_rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE); _rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE);

2
Source/Core/VideoCommon/Src/Fifo.cpp
View File

@ -177,7 +177,7 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
} }
Video_SendFifoData(uData, distToSend); Video_SendFifoData(uData, distToSend);
Common::SyncInterlockedExchange((LONG*)&_fifo.CPReadPointer, readPtr); Common::SyncInterlockedExchange((LONG*)&_fifo.CPReadPointer, readPtr);
Common::SyncInterlockedExchangeAdd((LONG*)&_fifo.CPReadWriteDistance, -(__int64)distToSend); Common::SyncInterlockedExchangeAdd((LONG*)&_fifo.CPReadWriteDistance, -(s64)distToSend);
} }
//video_initialize.pLog("..........................IDLE",FALSE); //video_initialize.pLog("..........................IDLE",FALSE);
Common::SyncInterlockedExchange((LONG*)&_fifo.CPReadIdle, 1); Common::SyncInterlockedExchange((LONG*)&_fifo.CPReadIdle, 1);

2
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp
View File

@ -226,7 +226,7 @@ wxString ConfigBox::GetButtonText(int id)
case IDB_BUTTONSTART: return m_JoyButtonStart[controller]->GetValue(); case IDB_BUTTONSTART: return m_JoyButtonStart[controller]->GetValue();
case IDB_BUTTONHALFPRESS: return m_JoyButtonHalfpress[controller]->GetValue(); case IDB_BUTTONHALFPRESS: return m_JoyButtonHalfpress[controller]->GetValue();
default: return wxString(""); default: return wxString();
} }
} }