diff options
-rw-r--r-- | Makefile.common | 1 | ||||
-rw-r--r-- | common.h | 2 | ||||
-rw-r--r-- | gba_memory.h (renamed from memory.h) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index 259e4c3..39dd9e9 100644 --- a/Makefile.common +++ b/Makefile.common @@ -22,6 +22,7 @@ ifeq ($(CPU_ARCH), x86_32) SOURCES_ASM += $(CORE_DIR)/x86/x86_stub.S endif ifeq ($(CPU_ARCH), arm) +SOURCES_C += $(CORE_DIR)/arm/warm.c SOURCES_ASM += $(CORE_DIR)/arm/arm_stub.S \ $(CORE_DIR)/arm/video_blend.S endif @@ -224,7 +224,7 @@ typedef u32 fixed8_24; #include "SDL.h" #endif #include "cpu.h" -#include "memory.h" +#include "gba_memory.h" #include "video.h" #include "input.h" #include "sound.h" |