linux compile fixes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1005 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-29 20:51:35 +00:00 · 2008-10-29 20:51:35 +00:00 · 90bd960c5d
parent a26116ccb7
commit 90bd960c5d
2 changed files with 3 additions and 1 deletions
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h
@ -19,6 +19,7 @@

 #include <map>
 #include "hci.h"
+#include <string>

 class CWII_IPC_HLE_Device_usb_oh1_57e_305;

--- a/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote.cpp
+++ b/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote.cpp
@ -96,6 +96,7 @@ static u16 convert16bit(const u8* src) {
 }
 #ifdef _WIN32
 HINSTANCE g_hInstance;
+#endif 

 void GetMousePos(float& x, float& y)
 {
@ -132,7 +133,7 @@ IMPLEMENT_APP_NO_MAIN(wxDLLApp)

 WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);

-
+#ifdef _WIN32
 BOOL APIENTRY DllMain(HINSTANCE hinstDLL,	// DLL module handle
 					  DWORD dwReason,		// reason called
 					  LPVOID lpvReserved)	// reserved