Skip to content

Commit 43417bd

Browse files
committed
LIBRETRO: enable mpeg2 dep games
1 parent 8041c9a commit 43417bd

2 files changed

Lines changed: 50 additions & 2 deletions

File tree

backends/platform/libretro/Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ else
136136
DEFINES += -DUSE_IMGUI
137137
endif
138138

139-
USE_MPEG2 ?= 0
139+
USE_MPEG2 ?= 1
140140
UNAVAILABLE_DEPS += $(call check_deps_availability, $(USE_MPEG2), component_mpeg2)
141141
ifneq ($(USE_MPEG2),1)
142142
USE_MPEG2=

backends/platform/libretro/dependencies.mk

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DEPS_SUBMODULES := libretro-deps libretro-common
77

88
DEPS_FOLDER_libretro-deps := libretro-deps
99
DEPS_URL_libretro-deps := https://github.com/libretro/libretro-deps
10-
DEPS_COMMIT_libretro-deps := f39fbf0707b02486f1cce42ab9bca019b2fb7a7d
10+
DEPS_COMMIT_libretro-deps := a2a865e74f58035c416a0c63be5772fdcf35b071
1111

1212
DEPS_FOLDER_libretro-common := libretro-common
1313
DEPS_URL_libretro-common := https://github.com/libretro/libretro-common
@@ -580,6 +580,54 @@ OBJS_DEPS += $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fribidi/fribidi-arabic.o
580580
endif
581581
endif
582582

583+
######################################################################
584+
# libmpeg2 settings
585+
######################################################################
586+
587+
ifeq ($(USE_MPEG2), 1)
588+
DEFINES += -DUSE_MPEG2
589+
this_lib_subpath :=
590+
this_lib_header := mpeg2dec/mpeg2.h
591+
this_lib_flags := -lmpeg2
592+
include $(ROOT_PATH)/sharedlib_test.mk
593+
ifneq ($(this_lib_available), yes)
594+
INCLUDES += \
595+
-I$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/include \
596+
-I$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/include/mpeg2dec \
597+
-I$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2
598+
OBJS_DEPS += \
599+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/alloc.o \
600+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/header.o \
601+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/decode.o \
602+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/slice.o \
603+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/motion_comp.o \
604+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/idct.o \
605+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/cpu_accel.o \
606+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/cpu_state.o
607+
608+
# --- Optional accelerations --------------
609+
# x86/x64 -> MMX
610+
ifneq ($(findstring x86,$(platform))$(findstring x64,$(platform)),)
611+
OBJS_DEPS += \
612+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/motion_comp_mmx.o \
613+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/idct_mmx.o
614+
endif
615+
616+
# PowerPC (PS3/PSL1GHT) -> AltiVec/VMX
617+
ifneq ($(findstring ps3,$(platform))$(findstring psl1ght,$(platform)),)
618+
OBJS_DEPS += \
619+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/motion_comp_altivec.o \
620+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/idct_altivec.o
621+
endif
622+
623+
# ARM families (rpi*, libnx, ios/tvos, vita, ctr, miyoo/miyoomini)
624+
ifneq ($(findstring rpi,$(platform))$(findstring armv7,$(platform))$(findstring armv8,$(platform))$(findstring libnx,$(platform))$(findstring ios,$(platform))$(findstring tvos,$(platform))$(findstring vita,$(platform))$(findstring ctr,$(platform))$(findstring miyoo,$(platform))$(findstring miyoomini,$(platform)),)
625+
OBJS_DEPS += \
626+
$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libmpeg2/libmpeg2/motion_comp_arm.o
627+
endif
628+
endif
629+
endif
630+
583631
######################################################################
584632
# libcurl settings
585633
######################################################################

0 commit comments

Comments
 (0)