diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile index 4467d31e483..34e0c4bd967 100644 --- a/backends/platform/libretro/Makefile +++ b/backends/platform/libretro/Makefile @@ -156,7 +156,7 @@ else ifeq ($(platform), wiiu) CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT) AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) rcs AR_ALONE = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) - DEFINES += -DGEKKO -mwup -mcpu=750 -meabi -mhard-float -D__POWERPC__ -D__ppc__ -DRETRO_IS_BIG_ENDIAN=1 -DRETRO_IS_LITTLE_ENDIAN=0 + DEFINES += -DGEKKO -mwup -mcpu=750 -meabi -mhard-float -D__POWERPC__ -D__ppc__ -DRETRO_IS_BIG_ENDIAN=1 -DRETRO_IS_LITTLE_ENDIAN=0 -DWORDS_BIGENDIAN=1 DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int DEFINES += -DHAVE_STRTOUL -DWIIU CXXFLAGS := -fpermissive diff --git a/backends/platform/libretro/dependencies.mk b/backends/platform/libretro/dependencies.mk index 7b075fd82a0..5cda950a8e5 100644 --- a/backends/platform/libretro/dependencies.mk +++ b/backends/platform/libretro/dependencies.mk @@ -7,7 +7,7 @@ DEPS_SUBMODULES := libretro-deps libretro-common DEPS_FOLDER_libretro-deps := libretro-deps DEPS_URL_libretro-deps := https://github.com/libretro/libretro-deps -DEPS_COMMIT_libretro-deps := e362764d603eb4fa84560f2d009fef091f6d1447 +DEPS_COMMIT_libretro-deps := c8638d7d317c397c19aa4551038bf648a467ffe6 DEPS_FOLDER_libretro-common := libretro-common DEPS_URL_libretro-common := https://github.com/libretro/libretro-common @@ -61,7 +61,7 @@ OBJS_DEPS += $(DEPS_PATH)/$(DEPS_FOLDER_libretro-common)/encodings/encoding_utf. endif ###################################################################### -# fluidsynth settings +# fluidsynth\fluidlite settings ###################################################################### ifeq ($(USE_FLUIDSYNTH), 1) @@ -72,26 +72,27 @@ this_lib_flags := -lfluidsynth include $(ROOT_PATH)/sharedlib_test.mk ifneq ($(this_lib_available), yes) DEFINES += -DUSE_FLUIDLITE -INCLUDES += -I$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/include \ - -I$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src \ +INCLUDES += -I$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/include \ + -I$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src \ -I$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libvorbis/include \ -I$(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/libogg/include -OBJS_DEPS += $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_chan.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_chorus.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_conv.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_defsfont.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_dsp_float.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_gen.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_hash.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_list.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_mod.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_ramsfont.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_rev.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_settings.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_synth.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_sys.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_tuning.o \ - $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidsynth/src/fluid_voice.o +OBJS_DEPS += $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_chan.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_chorus.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_conv.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_defsfont.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_dsp_float.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_gen.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_hash.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_list.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_mod.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_ramsfont.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_rev.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_settings.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_synth.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_sys.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_tuning.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_voice.o \ + $(DEPS_PATH)/$(DEPS_FOLDER_libretro-deps)/fluidlite/src/fluid_init.o endif endif