linux compile fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1005 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
a26116ccb7
commit
90bd960c5d
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include "hci.h"
|
#include "hci.h"
|
||||||
|
#include <string>
|
||||||
|
|
||||||
class CWII_IPC_HLE_Device_usb_oh1_57e_305;
|
class CWII_IPC_HLE_Device_usb_oh1_57e_305;
|
||||||
|
|
||||||
|
|
|
@ -96,6 +96,7 @@ static u16 convert16bit(const u8* src) {
|
||||||
}
|
}
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
HINSTANCE g_hInstance;
|
HINSTANCE g_hInstance;
|
||||||
|
#endif
|
||||||
|
|
||||||
void GetMousePos(float& x, float& y)
|
void GetMousePos(float& x, float& y)
|
||||||
{
|
{
|
||||||
|
@ -132,7 +133,7 @@ IMPLEMENT_APP_NO_MAIN(wxDLLApp)
|
||||||
|
|
||||||
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
|
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
|
BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
|
||||||
DWORD dwReason, // reason called
|
DWORD dwReason, // reason called
|
||||||
LPVOID lpvReserved) // reserved
|
LPVOID lpvReserved) // reserved
|
||||||
|
|
Loading…
Reference in New Issue