piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

more nowx fixes

Browse Source 
disabled njoy test build


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1545 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-12-14 23:52:01 +00:00
parent 7790afb1f3
commit 7f8cc4ec62
16 changed files with 107 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Plugins/Plugin_Wiimote/Src/SConscript
View File

@ -8,16 +8,19 @@ name = "Plugin_Wiimote"
files = [
"Config.cpp",
"ConfigDlg.cpp",
"Console.cpp",
"DataReports.cpp",
"EmuDefinitions.cpp",
"EmuMain.cpp",
"EmuSubroutines.cpp",
"Encryption.cpp",
"FillReport.cpp",
"main.cpp",
]
if wmenv['HAVE_WX']:
files += [
"ConfigDlg.cpp",
"Console.cpp",
"FillReport.cpp",
]
libs = [ 'common' ]

4
Source/Plugins/Plugin_Wiimote/Src/main.cpp
View File

@ -41,6 +41,7 @@ bool g_UseRealWiiMote = false;
HINSTANCE g_hInstance;
#if defined(HAVE_WX) && HAVE_WX
class wxDLLApp : public wxApp
{
bool OnInit()
@ -51,6 +52,7 @@ class wxDLLApp : public wxApp
IMPLEMENT_APP_NO_MAIN(wxDLLApp)
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
#endif
#ifdef _WIN32
BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
@ -113,6 +115,7 @@ extern "C" void DllAbout(HWND _hParent)
extern "C" void DllConfig(HWND _hParent)
{
#if defined(HAVE_WX) && HAVE_WX
wxWindow win;
#ifdef _WIN32
win.SetHWND(_hParent);
@ -122,6 +125,7 @@ extern "C" void DllConfig(HWND _hParent)
#ifdef _WIN32
win.SetHWND(0);
#endif
#endif
}
extern "C" void Wiimote_Initialize(SWiimoteInitialize _WiimoteInitialize)