ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32: fix build. 3dview is broken for a bit while it is renovated

This commit is contained in:
zeromus 2009-12-15 04:42:11 +00:00
parent 32e64e3e51
commit dea5e779c8
1 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
desmume/src/windows/main.cpp
View File

@ -129,20 +129,20 @@ VideoInfo video;
#pragma comment(lib,"comctl32.lib")
#include "../wxdlg/wxdlg3dViewer.h"
//class wxDesmumeApp : public wxApp
//{
//public:
// //call me each frame or something.
// //sort of an idle routine
// static void frameUpdate()
// {
// if(!wxTheApp) return;
// wxDesmumeApp* self = ((wxDesmumeApp*)wxTheApp);
// self->DeletePendingObjects();
// }
//};
class wxDesmumeApp : public wxApp
{
public:
//call me each frame or something.
//sort of an idle routine
static void frameUpdate()
{
if(!wxTheApp) return;
wxDesmumeApp* self = ((wxDesmumeApp*)wxTheApp);
self->DeletePendingObjects();
}
};
//IMPLEMENT_APP_NO_MAIN( wxDesmumeApp )
IMPLEMENT_APP_NO_MAIN( wxDesmumeApp )
void wxTest() {
//wxdlg3dViewer *viewer = new wxdlg3dViewer(NULL);
@ -2637,36 +2637,36 @@ int _main()
return 0;
}
//int WINAPI WinMain (HINSTANCE hThisInstance,
// HINSTANCE hPrevInstance,
// LPSTR lpszArgument,
// int nFunsterStil)
//
//{
// TIMECAPS tc;
// if (timeGetDevCaps(&tc, sizeof(TIMECAPS))== TIMERR_NOERROR)
// {
// wmTimerRes = std::min(std::max(tc.wPeriodMin, (UINT)1), tc.wPeriodMax);
// timeBeginPeriod (wmTimerRes);
// }
// else
// {
// wmTimerRes = 5;
// timeBeginPeriod (wmTimerRes);
// }
//
// g_thread_init (NULL);
// hAppInst=hThisInstance;
// OpenConsole(); // Init debug console
//
// int ret = _main();
//
// timeEndPeriod (wmTimerRes);
//
// CloseConsole();
//
// return ret;
//}
int WINAPI WinMain (HINSTANCE hThisInstance,
HINSTANCE hPrevInstance,
LPSTR lpszArgument,
int nFunsterStil)
{
TIMECAPS tc;
if (timeGetDevCaps(&tc, sizeof(TIMECAPS))== TIMERR_NOERROR)
{
wmTimerRes = std::min(std::max(tc.wPeriodMin, (UINT)1), tc.wPeriodMax);
timeBeginPeriod (wmTimerRes);
}
else
{
wmTimerRes = 5;
timeBeginPeriod (wmTimerRes);
}
g_thread_init (NULL);
hAppInst=hThisInstance;
OpenConsole(); // Init debug console
int ret = _main();
timeEndPeriod (wmTimerRes);
CloseConsole();
return ret;
}
void UpdateWndRects(HWND hwnd)
{