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

Win32: make disassembler available in non-dev+ builds. 

NDS: remove the Win32-specific include. The "autoupd asm" 
thing is just crap anyway, and we should avoid platform-
specific code in the core.
This commit is contained in:
luigi__ 2009-08-01 11:45:13 +00:00
parent 71158e5081
commit ea35450d02
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/NDSSystem.cpp
View File

@ -43,10 +43,6 @@
#include "Disassembler.h"
#include "readwrite.h"
#ifdef _WIN32
#include "./windows/disView.h"
#endif
#include "path.h"
PathInfo path;

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

@ -987,7 +987,7 @@ void CheckMessages()
}
}
}
int fps;
DWORD WINAPI run()
{
u32 cycles = 0;
@ -1002,13 +1002,13 @@ DWORD WINAPI run()
u64 diffticks=0;
u32 framecount=0;
u64 onesecondticks=0;
//int fps=0;
int fps=0;
int fpsframecount=0;
u64 fpsticks=0;
HWND hwnd = MainWindow->getHWnd();
InitSpeedThrottle();
fps=0;
osd->setRotate(video.rotation);
if (DirectDrawCreateEx(NULL, (LPVOID*)&lpDDraw, IID_IDirectDraw7, NULL) != DD_OK)
@ -2950,6 +2950,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
HudClickRelease(&Hud);
return 0;
#if 0
case WM_INITMENU: {
HMENU menu = (HMENU)wParam;
//last minute modification of menu before display
@ -2958,6 +2959,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
#endif
break;
}
#endif
case WM_COMMAND:
if(HIWORD(wParam) == 0 || HIWORD(wParam) == 1)