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

compile fix 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1985 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-01-22 23:33:11 +00:00
parent 87bfe821eb
commit cb9baf6d07
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,7 +347,7 @@ THREAD_RETURN EmuThread(void *pArg)
PADInitialize.pLog = Callback_PADLog; PADInitialize.pLog = Callback_PADLog;
PADInitialize.padNumber = i; PADInitialize.padNumber = i;
// Check if we should init the plugin // Check if we should init the plugin
if(Plugins.OkayToInitPlugin(i)) Plugins.GetPAD(i)->Initialize((void *)&PADInitialize); Plugins.GetPAD(i)->Initialize((void *)&PADInitialize);
} }
// Load and Init WiimotePlugin - only if we are booting in wii mode // Load and Init WiimotePlugin - only if we are booting in wii mode

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 completly broken on not windows!!!!!
_rDestination = _src; // _rDestination = _src;
returnCode = true; returnCode = true;
#endif #endif
return returnCode; return returnCode;

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

@ -126,6 +126,8 @@ 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 // FIXME this should NOT be windows specific!!!
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]);
@ -136,6 +138,9 @@ CBannerLoaderWii::GetName(std::string& _rName, DiscIO::IVolume::ECountry languag
_rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE); _rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE);
return true; return true;
} }
#else
_rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE);
#endif
return true; return true;
} }

5
Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
View File

@ -51,7 +51,10 @@ HWND m_hWnd;
#ifdef USE_RUMBLE_DINPUT_HACK #ifdef USE_RUMBLE_DINPUT_HACK
bool g_rumbleEnable = FALSE; bool g_rumbleEnable = FALSE;
#endif #endif
// Declare config window so that we can write debugging info to it from functions in this file
#if defined(HAVE_WX) && HAVE_WX
ConfigBox* m_frame;
#endif
// Rumble in windows // Rumble in windows
#ifdef _WIN32 #ifdef _WIN32
HINSTANCE nJoy_hInst = NULL; HINSTANCE nJoy_hInst = NULL;