mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-18 17:12:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverted r762 and r763 - i don't see any good reason to keep this revision as long as nobody fixes the windows build (btw: i don't understand why we need a non-WX build at all). if someone is going to fix it he can revert this revision.

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@766 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
fires.gc 2008-10-04 17:26:12 +00:00
parent 59b115d197
commit c7ae1fd402
20 changed files with 102 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
View file

@ -15,7 +15,10 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
// =======================================================================================
// Includes
// ------------------
#include "Globals.h"
#include "ChunkFile.h"
#include "resource.h"
@ -33,12 +36,14 @@
#include "DSPHandler.h"
#include "Config.h"
#ifdef USE_WX
#include "Debugger/Debugger.h" // for the CDebugger class
#include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
#endif
// ===================
// =======================================================================================
// DSP struct
// -------------------
DSPInitialize g_dspInitialize;
u8* g_pMemory;
@ -63,9 +68,12 @@ struct DSPState
};
DSPState g_dspState;
// ====================
#ifdef USE_WX
//////////////////////////////////////////////////////////////////////////////////////////
// wxWidgets - Some kind of stuff wx needs
// ｯｯｯｯｯｯｯｯｯ
class wxDLLApp : public wxApp
{
bool OnInit()
@ -76,7 +84,8 @@ class wxDLLApp : public wxApp
IMPLEMENT_APP_NO_MAIN(wxDLLApp)
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
#endif
///////////////////
#ifdef _WIN32
HINSTANCE g_hInstance = NULL;
@ -117,7 +126,9 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
#endif
// =======================================================================================
// Open and close console
// -------------------
void OpenConsole()
{
#if defined (_WIN32)
@ -134,21 +145,22 @@ void CloseConsole()
FreeConsole();
#endif
}
// ===================
// =======================================================================================
// Create debugging window - We could use use wxWindow win; new CDebugger(win) like nJoy but I don't
// know why it would be better. - There's a lockup problem with ShowModal(), but Show() doesn't work
// because then DLL_PROCESS_DETACH is called immediately after DLL_PROCESS_ATTACH.
#ifdef USE_WX
// -------------------
CDebugger* m_frame;
#endif
void DllDebugger(HWND _hParent)
{
#ifdef USE_WX
m_frame = new CDebugger(NULL);
m_frame->ShowModal();
#endif
}
// ===================
void GetDllInfo(PLUGIN_INFO* _PluginInfo)
{