The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-09-17 11:54:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from libretro/master

Browse Source 
Android version compiles as a dynamic library and links now
This commit is contained in:
ekeeke 2012-09-11 13:20:37 -07:00
commit 2bfc7cb8d9
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libretro/jni/Android.mk
View File

@ -2,10 +2,10 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
GENPLUS_SRC_DIR := ../src GENPLUS_SRC_DIR := ../../source
LIBRETRO_DIR := ../libretro LIBRETRO_DIR := ../
LOCAL_MODULE := libretro LOCAL_MODULE := retro
LOCAL_SRC_FILES := $(GENPLUS_SRC_DIR)/genesis.c \ LOCAL_SRC_FILES := $(GENPLUS_SRC_DIR)/genesis.c \
$(GENPLUS_SRC_DIR)/vdp_ctrl.c \ $(GENPLUS_SRC_DIR)/vdp_ctrl.c \
$(GENPLUS_SRC_DIR)/vdp_render.c \ $(GENPLUS_SRC_DIR)/vdp_render.c \
@ -26,6 +26,12 @@ LOCAL_SRC_FILES := $(GENPLUS_SRC_DIR)/genesis.c \
$(GENPLUS_SRC_DIR)/input_hw/teamplayer.c \ $(GENPLUS_SRC_DIR)/input_hw/teamplayer.c \
$(GENPLUS_SRC_DIR)/input_hw/xe_a1p.c \ $(GENPLUS_SRC_DIR)/input_hw/xe_a1p.c \
$(GENPLUS_SRC_DIR)/input_hw/terebi_oekaki.c \ $(GENPLUS_SRC_DIR)/input_hw/terebi_oekaki.c \
$(GENPLUS_SRC_DIR)/cd_hw/cd_cart.c \
$(GENPLUS_SRC_DIR)/cd_hw/cdc.c \
$(GENPLUS_SRC_DIR)/cd_hw/cdd.c \
$(GENPLUS_SRC_DIR)/cd_hw/gfx.c \
$(GENPLUS_SRC_DIR)/cd_hw/pcm.c \
$(GENPLUS_SRC_DIR)/cd_hw/scd.c \
$(GENPLUS_SRC_DIR)/cart_hw/areplay.c \ $(GENPLUS_SRC_DIR)/cart_hw/areplay.c \
$(GENPLUS_SRC_DIR)/cart_hw/md_cart.c \ $(GENPLUS_SRC_DIR)/cart_hw/md_cart.c \
$(GENPLUS_SRC_DIR)/cart_hw/sms_cart.c \ $(GENPLUS_SRC_DIR)/cart_hw/sms_cart.c \
@ -46,11 +52,14 @@ LOCAL_SRC_FILES := $(GENPLUS_SRC_DIR)/genesis.c \
$(GENPLUS_SRC_DIR)/sound/blip.c \ $(GENPLUS_SRC_DIR)/sound/blip.c \
$(GENPLUS_SRC_DIR)/z80/z80.c \ $(GENPLUS_SRC_DIR)/z80/z80.c \
$(GENPLUS_SRC_DIR)/m68k/m68kcpu.c \ $(GENPLUS_SRC_DIR)/m68k/m68kcpu.c \
$(LIBRETRO_DIR)/libretro.c $(GENPLUS_SRC_DIR)/m68k/s68kcpu.c \
$(LIBRETRO_DIR)/libretro.c \
$(LIBRETRO_DIR)/scrc32.c
LOCAL_C_INCLUDES = $(LOCAL_PATH)/$(GENPLUS_SRC_DIR) \ LOCAL_C_INCLUDES = $(LOCAL_PATH)/$(GENPLUS_SRC_DIR) \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/sound \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/sound \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/input_hw \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/input_hw \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/cd_hw \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/cart_hw \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/cart_hw \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/cart_hw/svp \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/cart_hw/svp \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/m68k \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/m68k \
@ -58,5 +67,6 @@ LOCAL_C_INCLUDES = $(LOCAL_PATH)/$(GENPLUS_SRC_DIR) \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/ntsc \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/ntsc \
$(LOCAL_PATH)/$(LIBRETRO_DIR) $(LOCAL_PATH)/$(LIBRETRO_DIR)
LOCAL_CFLAGS = -DINLINE=inline -DUSE_15BPP_RENDERING -DLSB_FIRST -D__LIBRETRO__ LOCAL_CFLAGS = -DINLINE="static inline" -DUSE_15BPP_RENDERING -DLSB_FIRST -D__LIBRETRO__
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
libretro/libretro.c
View File

@ -699,7 +699,7 @@ void retro_get_system_info(struct retro_system_info *info)
{ {
info->library_name = "Genesis Plus GX"; info->library_name = "Genesis Plus GX";
info->library_version = "v1.7.0"; info->library_version = "v1.7.0";
info->valid_extensions = "md|smd|bin|cue|gen|zip|MD|SMD|bin|CUE|GEN|ZIP|sms|SMS|gg|GG|sg|SG"; info->valid_extensions = "md|smd|bin|cue|gen|zip|MD|SMD|bin|iso|ISO|CUE|GEN|ZIP|sms|SMS|gg|GG|sg|SG";
info->block_extract = false; info->block_extract = false;
info->need_fullpath = true; info->need_fullpath = true;
} }