lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix arm target compile errors.

This commit is contained in:
aliaspider 2014-12-10 01:03:14 +01:00
parent 9f97113292
commit afff31b508
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.common
View File

@ -22,6 +22,7 @@ ifeq ($(CPU_ARCH), x86_32)
SOURCES_ASM += $(CORE_DIR)/x86/x86_stub.S SOURCES_ASM += $(CORE_DIR)/x86/x86_stub.S
endif endif
ifeq ($(CPU_ARCH), arm) ifeq ($(CPU_ARCH), arm)
SOURCES_C += $(CORE_DIR)/arm/warm.c
SOURCES_ASM += $(CORE_DIR)/arm/arm_stub.S \ SOURCES_ASM += $(CORE_DIR)/arm/arm_stub.S \
$(CORE_DIR)/arm/video_blend.S $(CORE_DIR)/arm/video_blend.S
endif endif

2
common.h
View File

@ -224,7 +224,7 @@ typedef u32 fixed8_24;
#include "SDL.h" #include "SDL.h"
#endif #endif
#include "cpu.h" #include "cpu.h"
#include "memory.h" #include "gba_memory.h"
#include "video.h" #include "video.h"
#include "input.h" #include "input.h"
#include "sound.h" #include "sound.h"

0
memory.h → gba_memory.h
View File