Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Memory needs to be uniquely named for Android

Browse Source
This commit is contained in:
twinaphex 2017-06-08 11:03:24 +02:00 committed by radius
parent b02aeab022
commit a7db98c22e
5 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/gb.h
View File

@ -14,7 +14,7 @@
#include "display.h" #include "display.h"
#include "joypad.h" #include "joypad.h"
#include "mbc.h" #include "mbc.h"
#include "memory.h" #include "gbmemory.h"
#include "printer.h" #include "printer.h"
#include "timing.h" #include "timing.h"
#include "z80_cpu.h" #include "z80_cpu.h"

0
Core/memory.c → Core/gbmemory.c
View File

0
Core/memory.h → Core/gbmemory.h
View File

2
Makefile.common
View File

@ -3,7 +3,7 @@ INCFLAGS := -I$(CORE_DIR) \
SOURCES_C := $(CORE_DIR)/Core/gb.c \ SOURCES_C := $(CORE_DIR)/Core/gb.c \
$(CORE_DIR)/Core/apu.c \ $(CORE_DIR)/Core/apu.c \
$(CORE_DIR)/Core/memory.c \ $(CORE_DIR)/Core/gbmemory.c \
$(CORE_DIR)/Core/mbc.c \ $(CORE_DIR)/Core/mbc.c \
$(CORE_DIR)/Core/timing.c \ $(CORE_DIR)/Core/timing.c \
$(CORE_DIR)/Core/display.c \ $(CORE_DIR)/Core/display.c \

2
libretro/jni/Android.mk
View File

@ -24,7 +24,7 @@ CORE_DIR := ../..
include ../../Makefile.common include ../../Makefile.common
LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C) LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C)
LOCAL_CXXFLAGS += -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DNDEBUG -D_USE_MATH_DEFINES LOCAL_CXXFLAGS += -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DNDEBUG -D_USE_MATH_DEFINES -DGB_INTERNAL
LOCAL_C_INCLUDES = $(INCFLAGS) LOCAL_C_INCLUDES = $(INCFLAGS)