From 7dc0772317e4f6ed9605eef32e5137171cbed5e3 Mon Sep 17 00:00:00 2001 From: cyberwarriorx Date: Tue, 3 Oct 2006 20:29:42 +0000 Subject: [PATCH] -Fixed a few more issues in the main emulator code that needed to be done before we can officially start compiling them as C code. --- desmume/src/Makefile.am | 4 ++-- desmume/src/arm_instructions.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am index 566624534..ff8b6a5f7 100644 --- a/desmume/src/Makefile.am +++ b/desmume/src/Makefile.am @@ -1,13 +1,13 @@ SUBDIRS = . $(UI_DIR) noinst_LIBRARIES = libdesmume.a libdesmume_a_SOURCES = \ - armcpu.cpp armcpu.hpp \ + armcpu.cpp armcpu.hpp \ arm_instructions.cpp arm_instructions.hpp \ bios.cpp bios.hpp cp15.cpp cp15.hpp \ Disassembler.c Disassembler.h \ FIFO.c FIFO.h \ debug.c debug.h \ - MMU.cpp MMU.hpp NDSSystem.cpp NDSSystem.hpp \ + MMU.cpp MMU.hpp NDSSystem.cpp NDSSystem.hpp \ thumb_instructions.cpp thumb_instructions.hpp \ arm7/fw.c arm7/fw.h \ arm7/spi.c arm7/spi.h \ diff --git a/desmume/src/arm_instructions.h b/desmume/src/arm_instructions.h index a04aa16ef..cc56e40c6 100644 --- a/desmume/src/arm_instructions.h +++ b/desmume/src/arm_instructions.h @@ -23,8 +23,7 @@ #define ARMINSTRUCTION_H #include "types.h" - -typedef struct armcpu_t armcpu_t; +#include "armcpu.h" extern u32 (*FASTCALL arm_instructions_set[4096])(armcpu_t * cpu);