mirror of
https://github.com/ekeeke/Genesis-Plus-GX.git
synced 2024-09-10 16:53:15 +02:00
Merge branch 'master' of github.com:ekeeke/Genesis-Plus-GX
This commit is contained in:
commit
375c43c275
@ -61,11 +61,16 @@ else ifeq ($(platform), xenon)
|
||||
CC = xenon-gcc$(EXE_EXT)
|
||||
AR = xenon-ar$(EXE_EXT)
|
||||
PLATFORM_DEFINES := -D__LIBXENON__ -DALT_RENDER
|
||||
else ifeq ($(platform), ngc)
|
||||
TARGET := libretro_ngc.a
|
||||
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
|
||||
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
|
||||
PLATFORM_DEFINES := -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -DALT_RENDER
|
||||
else ifeq ($(platform), wii)
|
||||
TARGET := libretro_wii.a
|
||||
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
|
||||
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
|
||||
PLATFORM_DEFINES := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -DALT_RENDER
|
||||
PLATFORM_DEFINES := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DALT_RENDER
|
||||
else
|
||||
TARGET := retro.dll
|
||||
CC = gcc
|
||||
@ -182,15 +187,20 @@ else ifeq ($(platform), psl1ght)
|
||||
$(AR) rcs $@ $(LIBRETRO_OBJ)
|
||||
else ifeq ($(platform), xenon)
|
||||
$(AR) rcs $@ $(LIBRETRO_OBJ)
|
||||
else ifeq ($(platform), ngc)
|
||||
$(AR) rcs $@ $(LIBRETRO_OBJ)
|
||||
else ifeq ($(platform), wii)
|
||||
$(AR) rcs $@ $(LIBRETRO_OBJ)
|
||||
else
|
||||
$(CC) -o $(TARGET) $(fpic) $(LIBRETRO_OBJ) $(LIBRETRO_LIBS) $(SHARED)
|
||||
endif
|
||||
|
||||
clean-objs:
|
||||
rm -f $(LIBRETRO_OBJ)
|
||||
|
||||
clean:
|
||||
rm -f $(LIBRETRO_OBJ)
|
||||
rm -f $(TARGET)
|
||||
|
||||
.PHONY: clean
|
||||
.PHONY: clean clean-objs
|
||||
|
||||
|
@ -2,10 +2,10 @@ LOCAL_PATH := $(call my-dir)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
GENPLUS_SRC_DIR := ../src
|
||||
LIBRETRO_DIR := ../libretro
|
||||
GENPLUS_SRC_DIR := ../../source
|
||||
LIBRETRO_DIR := ../
|
||||
|
||||
LOCAL_MODULE := libretro
|
||||
LOCAL_MODULE := retro
|
||||
LOCAL_SRC_FILES := $(GENPLUS_SRC_DIR)/genesis.c \
|
||||
$(GENPLUS_SRC_DIR)/vdp_ctrl.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/xe_a1p.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/md_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)/z80/z80.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_PATH)/$(GENPLUS_SRC_DIR)/sound \
|
||||
$(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/svp \
|
||||
$(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)/$(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)
|
||||
|
@ -699,7 +699,7 @@ void retro_get_system_info(struct retro_system_info *info)
|
||||
{
|
||||
info->library_name = "Genesis Plus GX";
|
||||
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->need_fullpath = true;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user