moved timers id for Windows port in common.h :)

desmume/src/common.h

@@ -34,6 +34,19 @@ extern u8	gba_header_data_0x04[156];
 	#define _WINSOCKAPI_
 	#include <windows.h>
 
+	#define IDT_VIEW_DISASM7						50001
+	#define IDT_VIEW_DISASM9                		50002
+	#define IDT_VIEW_MEM7                   		50003
+	#define IDT_VIEW_MEM9                   		50004
+	#define IDT_VIEW_IOREG                  		50005
+	#define IDT_VIEW_PAL                    		50006
+	#define IDT_VIEW_TILE                   		50007
+	#define IDT_VIEW_MAP                    		50008
+	#define IDT_VIEW_OAM                    		50009
+	#define IDT_VIEW_MATRIX                 		50010
+	#define IDT_VIEW_LIGHTS                 		50011
+	#define IDM_EXEC								50112
+
 	#define CLASSNAME "DeSmuME"
 
 	extern HINSTANCE hAppInst;

desmume/src/windows/DeSmuME_2008.vcproj

@@ -1056,10 +1056,6 @@
 					RelativePath=".\palView.h"
 					>
 				</File>
-				<File
-					RelativePath=".\res_timer_ids.h"
-					>
-				</File>
 				<File
 					RelativePath=".\resource.h"
 					>

desmume/src/windows/IORegView.cpp

@@ -23,7 +23,6 @@
 #include <commctrl.h>
 #include "debug.h"
 #include "resource.h"
-#include "res_timer_ids.h"
 #include "../MMU.h"
 #include "../armcpu.h"
 

desmume/src/windows/disView.cpp

@@ -29,7 +29,6 @@
 #include "disView.h"
 #include <commctrl.h>
 #include "resource.h"
-#include "res_timer_ids.h"
 
 typedef struct
 {

desmume/src/windows/lightView.cpp

@@ -22,7 +22,6 @@
 #include "colorctrl.h"
 #include "gfx3d.h"
 #include "resource.h"
-#include "res_timer_ids.h"
 #include "debug.h"
 
 // Convert B5G5R5 color format into R8G8B8 color format

desmume/src/windows/main.cpp

@@ -44,7 +44,6 @@
 #include "../addons.h"
 #endif
 #include "resource.h"
-#include "res_timer_ids.h"
 #include "memView.h"
 #include "disView.h"
 #include "ginfo.h"

desmume/src/windows/mapView.cpp

@@ -21,7 +21,6 @@
 
 #include "mapView.h"
 #include "resource.h"
-#include "res_timer_ids.h"
 
 #include <commctrl.h>
 #include "../MMU.h"

desmume/src/windows/matrixView.cpp

@@ -21,7 +21,6 @@
 #include <commctrl.h>
 #include "debug.h"
 #include "resource.h"
-#include "res_timer_ids.h"
 #include "gfx3d.h"
 
 typedef struct

desmume/src/windows/memView.cpp

@@ -25,7 +25,6 @@
 #include "../MMU.h"
 #include "debug.h"
 #include "resource.h"
-#include "res_timer_ids.h"
 
 typedef struct
 {

desmume/src/windows/oamView.cpp

@@ -23,7 +23,6 @@
 #include <commctrl.h>
 #include "debug.h"
 #include "resource.h"
-#include "res_timer_ids.h"
 #include "../MMU.h"
 #include "../GPU.h"
 #include "../NDSSystem.h"

desmume/src/windows/palView.cpp

@@ -23,7 +23,6 @@
 #include <commctrl.h>
 #include "debug.h"
 #include "resource.h"
-#include "res_timer_ids.h"
 #include "../MMU.h"
 
 typedef struct

desmume/src/windows/tileView.cpp

@@ -22,7 +22,6 @@
 #include "tileView.h"
 #include "commctrl.h"
 #include "resource.h"
-#include "res_timer_ids.h"
 #include "debug.h"
 #include "../MMU.h"