From ea35450d0289cd280d26b819fe90ec08e73e580e Mon Sep 17 00:00:00 2001
From: luigi__ <luigi__@users.sf.net>
Date: Sat, 1 Aug 2009 11:45:13 +0000
Subject: [PATCH] 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.

---
 desmume/src/NDSSystem.cpp    | 4 ----
 desmume/src/windows/main.cpp | 8 +++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp
index 4ee48a8a3..267dbdcb6 100644
--- a/desmume/src/NDSSystem.cpp
+++ b/desmume/src/NDSSystem.cpp
@@ -43,10 +43,6 @@
 #include "Disassembler.h"
 #include "readwrite.h"
 
-#ifdef _WIN32
-#include "./windows/disView.h"
-#endif
-
 #include "path.h"
 
 PathInfo path;
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index fa3705744..1f0c96eae 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -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)