[libretro] restored Makefile.common

This commit is contained in:
EkeEke 2014-11-29 19:15:09 +01:00
parent b5a30b82c2
commit f0fd2d8fc1
3 changed files with 31 additions and 52 deletions

View File

@ -182,30 +182,12 @@ else
CFLAGS += -O3 -DNDEBUG
endif
CORE_DIR := ./core
GENPLUS_SRC_DIR := $(CORE_DIR) \
$(CORE_DIR)/sound \
$(CORE_DIR)/input_hw \
$(CORE_DIR)/cart_hw \
$(CORE_DIR)/cart_hw/svp \
$(CORE_DIR)/cd_hw \
$(CORE_DIR)/m68k \
$(CORE_DIR)/z80 \
$(CORE_DIR)/ntsc
TREMOR_SRC_DIR := $(CORE_DIR)/tremor
LIBRETRO_DIR := ./libretro
CORE_DIR := .
INCFLAGS := $(foreach dir,$(GENPLUS_SRC_DIR),-I$(dir)) \
-I$(TREMOR_SRC_DIR) \
-I$(LIBRETRO_DIR)
TREMOR_SRC_DIR := $(CORE_DIR)/core/tremor
LIBRETRO_DIR := $(CORE_DIR)/libretro
SOURCES_C := $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c)) \
$(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c)) \
$(LIBRETRO_DIR)/libretro.c
ifeq ($(WANT_CRC32), 1)
SOURCES_C += $(LIBRETRO_DIR)/scrc32.c
endif
include $(LIBRETRO_DIR)/Makefile.common
OBJECTS := $(SOURCES_C:.c=.o)

19
libretro/Makefile.common Normal file
View File

@ -0,0 +1,19 @@
GENPLUS_SRC_DIR := $(CORE_DIR)/core \
$(CORE_DIR)/core/z80 \
$(CORE_DIR)/core/m68k \
$(CORE_DIR)/core/ntsc \
$(CORE_DIR)/core/sound \
$(CORE_DIR)/core/input_hw \
$(CORE_DIR)/core/cd_hw \
$(CORE_DIR)/core/cart_hw \
$(CORE_DIR)/core/cart_hw/svp
SOURCES_C = $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c)) \
$(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c)) \
$(LIBRETRO_DIR)/libretro.c
ifeq ($(WANT_CRC32), 1)
SOURCES_C += $(LIBRETRO_DIR)/scrc32.c
endif
INCFLAGS += $(foreach dir,$(GENPLUS_SRC_DIR),-I$(dir)) -I$(LIBRETRO_DIR)

View File

@ -4,17 +4,9 @@ include $(CLEAR_VARS)
WANT_CRC32 := 1
CORE_DIR := ../../core
GENPLUS_SRC_DIR := $(CORE_DIR) \
$(CORE_DIR)/sound \
$(CORE_DIR)/input_hw \
$(CORE_DIR)/cart_hw \
$(CORE_DIR)/cart_hw/svp \
$(CORE_DIR)/cd_hw \
$(CORE_DIR)/m68k \
$(CORE_DIR)/z80 \
$(CORE_DIR)/ntsc
TREMOR_SRC_DIR := $(CORE_DIR)/tremor
CORE_DIR := ../..
TREMOR_SRC_DIR := $(CORE_DIR)/core/tremor
LIBRETRO_DIR := ..
LOCAL_MODULE := retro
@ -24,25 +16,11 @@ LOCAL_CFLAGS += -DANDROID_ARM
LOCAL_ARM_MODE := arm
endif
SOURCES_C := $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c)) \
$(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c)) \
$(LIBRETRO_DIR)/libretro.c
ifeq ($(WANT_CRC32), 1)
SOURCES_C += $(LIBRETRO_DIR)/scrc32.c
endif
include $(LIBRETRO_DIR)/Makefile.common
LOCAL_SRC_FILES := $(SOURCES_C)
LOCAL_C_INCLUDES = $(CORE_DIR) \
$(LOCAL_PATH)/$(CORE_DIR)/sound \
$(LOCAL_PATH)/$(CORE_DIR)/input_hw \
$(LOCAL_PATH)/$(CORE_DIR)/cd_hw \
$(LOCAL_PATH)/$(CORE_DIR)/cart_hw \
$(LOCAL_PATH)/$(CORE_DIR)/cart_hw/svp \
$(LOCAL_PATH)/$(CORE_DIR)/m68k \
$(LOCAL_PATH)/$(CORE_DIR)/z80 \
$(LOCAL_PATH)/$(CORE_DIR)/ntsc \
LOCAL_C_INCLUDES = $(foreach dir,$(GENPLUS_SRC_DIR),$(LOCAL_PATH)/$(dir)) \
$(LOCAL_PATH)/$(TREMOR_SRC_DIR) \
$(LOCAL_PATH)/$(LIBRETRO_DIR)