merge from libretro master github/master
authornotaz <notasas@gmail.com>
Sun, 27 Oct 2024 19:52:25 +0000 (21:52 +0200)
committernotaz <notasas@gmail.com>
Sun, 27 Oct 2024 19:59:41 +0000 (21:59 +0200)
commit79c4d4343ef401c5d5489972c7a7e434f441578a
treedb5d5fa2962cb2821976b5258baa4dff09d2d71b
parentbd701916cca181f9eb7b6e9306ea59a319eab29a
merge from libretro

got tired of all the conflicts
14 files changed:
.gitmodules
Makefile
Makefile.libretro
deps/mman [new submodule]
include/mman/sys/mman.h [new file with mode: 0644]
jni/Android.mk
plugins/dfsound/out.c
plugins/dfxvideo/gpulib_if.c
plugins/gpu-gles/gpulib_if.c
plugins/gpu_neon/psx_gpu_if.c
plugins/gpulib/gpu.c
plugins/gpulib/gpu.h
plugins/gpulib/gpulib_thread_if.c [new file with mode: 0644]
plugins/gpulib/gpulib_thread_if.h [new file with mode: 0644]