libretro/libretro-chailove
1
0
Fork 0
mirror of https://github.com/libretro/libretro-chailove.git synced 2024-11-23 08:00:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #416 from phcoder/mixer

Browse Source 
Update mixer to thread-safe version
This commit is contained in:
Rob Loach 2022-05-07 09:29:09 -04:00 committed by GitHub
commit a473d2e24b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.common
View File

@ -42,6 +42,7 @@ ifneq ($(STATIC_LINKING), 1)
$(CORE_DIR)/vendor/libretro-common/formats/wav/rwav.c \
$(CORE_DIR)/vendor/libretro-common/lists/string_list.c \
$(CORE_DIR)/vendor/libretro-common/memmap/memalign.c \
$(CORE_DIR)/vendor/libretro-common/rthreads/rthreads.c \
$(CORE_DIR)/vendor/libretro-common/streams/file_stream.c \
$(CORE_DIR)/vendor/libretro-common/string/stdstring.c \
$(CORE_DIR)/vendor/libretro-common/vfs/vfs_implementation.c \

7
Makefile.libretro
View File

@ -61,6 +61,7 @@ ifneq ($(findstring SunOS,$(shell uname -a)),)
else
SHARED := -shared -Wl,--version-script=link.T -Wl,-no-undefined
endif
LDFLAGS += -lpthread
else ifeq ($(platform), linux-portable)
TARGET := $(TARGET_NAME)_libretro.so
@ -354,7 +355,7 @@ else ifeq ($(platform), gcw0)
AR = /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar
fpic := -fPIC
SHARED := -shared -Wl,--version-script=link.T -Wl,-no-undefined
PLATFORM_DEFINES += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
PLATFORM_DEFINES += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float -DDINGUX_BETA=1
EXTERNAL_ZLIB = 1
# RS90
else ifeq ($(platform), rs90)
@ -376,7 +377,8 @@ else ifeq ($(platform), retrofw)
AR = /opt/retrofw-toolchain/usr/bin/mipsel-linux-ar
fpic := -fPIC
SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
CFLAGS += -ffast-math -march=mips32 -mtune=mips32 -mhard-float
FLAGS += -ffast-math -march=mips32 -mtune=mips32 -mhard-float
PLATFORM_DEFINES += -DDINGUX_BETA=1
LIBS = -lm
# MIYOO
@ -684,6 +686,7 @@ ifeq ($(platform), psp1)
INCFLAGS += -I$(shell psp-config --pspsdk-path)/include
endif
FLAGS += -DHAVE_THREADS=1
ifneq (,$(findstring msvc,$(platform)))
OBJOUT = -Fo

2
jni/Android.mk
View File

@ -4,7 +4,7 @@ CORE_DIR = $(LOCAL_PATH)/..
include $(CORE_DIR)/Makefile.common
COREFLAGS := -D__LIBRETRO__ -DANDROID $(FLAGS)
COREFLAGS := -D__LIBRETRO__ -DANDROID -DHAVE_THREADS=1 $(FLAGS)
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")

2
vendor/libretro-common vendored

@ -1 +1 @@
Subproject commit ce2652be5d3ce8c0530504b4b7903c9059b9a3fd
Subproject commit 69c83f835aa54e0c622930fd468b44bbac0150fd