compile fix

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1985 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Core/Src/Core.cpp

@@ -347,7 +347,7 @@ THREAD_RETURN EmuThread(void *pArg)
 		PADInitialize.pLog = Callback_PADLog;
 		PADInitialize.padNumber = i;
 		// 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	

Source/Core/DiscIO/Src/BannerLoader.cpp

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

Source/Core/DiscIO/Src/BannerLoaderWii.cpp

@@ -126,6 +126,8 @@ CBannerLoaderWii::GetName(std::string& _rName, DiscIO::IVolume::ECountry languag
 
 	// find Banner type
 	SWiiBanner* pBanner = (SWiiBanner*)m_pBannerFile;
+#ifdef _WIN32 // FIXME this should NOT be windows specific!!!
+
 	if (DiscIO::IVolume::COUNTRY_JAP == language)
 	{
 		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);
 		return true;
 	}
+#else
+	_rName = StupidWideCharToString(pBanner->m_Comment[0], WII_BANNER_COMMENT_SIZE);
+#endif
 	return true;
 }
 

Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp

@@ -51,7 +51,10 @@ HWND m_hWnd;
 #ifdef USE_RUMBLE_DINPUT_HACK
 bool g_rumbleEnable = FALSE;
 #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
 #ifdef _WIN32
 HINSTANCE nJoy_hInst = NULL;