Moved the timer IDs to an external include because, if they're located in resource.h, Resedit will blow them up when saving.

This commit is contained in:
luigi__ 2009-02-03 21:53:37 +00:00
parent 107ede7375
commit 6a769e0bc0
13 changed files with 2464 additions and 4233 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="shift_jis"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Version="9,00"
Name="DeSmuME_VS2008"
ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
RootNamespace="DeSmuME"
@ -981,10 +981,6 @@
RelativePath="..\instruction_tabdef.inc"
>
</File>
<File
RelativePath="..\shaders.h"
>
</File>
<File
RelativePath="..\thumb_tabdef.inc"
>
@ -1060,6 +1056,10 @@
RelativePath=".\palView.h"
>
</File>
<File
RelativePath=".\res_timer_ids.h"
>
</File>
<File
RelativePath=".\resource.h"
>
@ -1224,6 +1224,10 @@
RelativePath="..\saves.h"
>
</File>
<File
RelativePath="..\shaders.h"
>
</File>
<File
RelativePath="..\softrender.h"
>

View File

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

View File

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

View File

@ -22,6 +22,7 @@
#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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -0,0 +1,12 @@
#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

File diff suppressed because it is too large Load Diff

View File

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