From e33a56cd83d1009a6770a1f84bd4af8b9f746868 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 10 Dec 2014 18:53:06 +0100 Subject: [PATCH] PC_BUILD can go now --- Makefile | 2 +- cpu_threaded.c | 6 +++--- jni/Android.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ea34738..30fcf36 100644 --- a/Makefile +++ b/Makefile @@ -216,7 +216,7 @@ include Makefile.common OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.S=.o) -DEFINES := -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -DPC_BUILD -Wall -Werror=implicit-function-declaration +DEFINES := -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -Wall -Werror=implicit-function-declaration ifeq ($(HAVE_DYNAREC), 1) DEFINES += -DHAVE_DYNAREC diff --git a/cpu_threaded.c b/cpu_threaded.c index 36a188a..c90bb76 100644 --- a/cpu_threaded.c +++ b/cpu_threaded.c @@ -3618,7 +3618,7 @@ void flush_translation_cache_ram(void) flush_ram_count, reg[REG_PC], iwram_code_min, iwram_code_max, ewram_code_min, ewram_code_max); */ -#ifndef PC_BUILD +#if defined(ARM_ARCH) || defined(MIPS_ARCH) invalidate_icache_region(ram_translation_cache, (ram_translation_ptr - ram_translation_cache) + 0x100); #endif @@ -3675,7 +3675,7 @@ void flush_translation_cache_ram(void) void flush_translation_cache_rom(void) { -#ifndef PC_BUILD +#if defined(ARM_ARCH) || defined(MIPS_ARCH) invalidate_icache_region(rom_translation_cache, rom_translation_ptr - rom_translation_cache + 0x100); #endif @@ -3689,7 +3689,7 @@ void flush_translation_cache_rom(void) void flush_translation_cache_bios(void) { -#ifndef PC_BUILD +#if defined(ARM_ARCH) || defined(MIPS_ARCH) invalidate_icache_region(bios_translation_cache, bios_translation_ptr - bios_translation_cache + 0x100); #endif diff --git a/jni/Android.mk b/jni/Android.mk index 2b2e0d1..f16ff1e 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -31,6 +31,6 @@ SOURCES_ASM := include $(CORE_DIR)/Makefile.common LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM) -LOCAL_CFLAGS += -O2 -DHAVE_MMAP -DNDEBUG -DPC_BUILD -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS) +LOCAL_CFLAGS += -O2 -DHAVE_MMAP -DNDEBUG -DINLINE=inline -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 $(INCFLAGS) include $(BUILD_SHARED_LIBRARY)