mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-09-10 12:02:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename mkxp-threads to mkxp-polyfill

Browse source
This commit is contained in:
刘皓 2025-04-02 13:06:17 -04:00
parent e68e029f89
commit 8457ac1598
No known key found for this signature in database
GPG key ID: 7901753DB465B711
10 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binding-sandbox/sandbox.cpp
View file

@ -25,7 +25,7 @@
#include <wasm-rt.h>
#include "wasi.h"
#include <mkxp-retro-ruby.h>
#include "mkxp-threads.h"
#include "mkxp-polyfill.h"
#include "sandbox.h"
#define MJIT_ENABLED 0

2
meson.build
View file

@ -626,7 +626,7 @@ if is_libretro
],
sources: global_sources + [
'src/core.cpp',
'src/mkxp-threads.cpp',
'src/mkxp-polyfill.cpp',
'src/sharedstate.cpp',
'src/stb_image.cpp',
'src/audio/alstream.cpp',

4
src/mkxp-threads.cpp → src/mkxp-polyfill.cpp
View file

@ -1,5 +1,5 @@
/*
** mkxp-threads.cpp
** mkxp-polyfill.cpp
**
** This file is part of mkxp.
**
@ -19,7 +19,7 @@
** along with mkxp. If not, see <http://www.gnu.org/licenses/>.
*/
#include "mkxp-threads.h"
#include "mkxp-polyfill.h"
#include <cassert>
#if defined(MKXPZ_NO_SEMAPHORE_H) && !defined(MKXPZ_NO_PTHREAD_H)

8
src/mkxp-threads.h → src/mkxp-polyfill.h
View file

@ -1,5 +1,5 @@
/*
** mkxp-threads.h
** mkxp-polyfill.h
**
** This file is part of mkxp.
**
@ -19,8 +19,8 @@
** along with mkxp. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MKXPZ_THREADS_H
#define MKXPZ_THREADS_H
#ifndef MKXPZ_POLYFILL_H
#define MKXPZ_POLYFILL_H
#include <math.h>
#include <tgmath.h>
@ -392,4 +392,4 @@ namespace std {
# endif
#endif
#endif // MKXPZ_THREADS_H
#endif // MKXPZ_POLYFILL_H

2
src/util/sigslot/signal.hpp
View file

@ -1,7 +1,7 @@
#pragma once
#include <atomic>
#include <memory>
#include "mkxp-threads.h"
#include "mkxp-polyfill.h"
#include <type_traits>
#include <utility>
#include <thread>

2
subprojects/openal-soft.wrap
View file

@ -2,4 +2,4 @@
url = https://github.com/kcat/openal-soft
revision = 1.24.2
depth = 1
diff_files = openal-soft-android-log.patch, openal-soft-atomic.patch, openal-soft-buildtype.patch, openal-soft-c11.patch, openal-soft-constexpr.patch, openal-soft-emscripten-pthread.patch, openal-soft-emscripten-setschedparam.patch, openal-soft-emscripten-symbol-conflict.patch, openal-soft-event-thread.patch, openal-soft-filesystem.patch, openal-soft-flockfile.patch, openal-soft-int32.patch, openal-soft-mkxp-threads.patch, openal-soft-null.patch, openal-soft-pic.patch, openal-soft-ps3.patch
diff_files = openal-soft-android-log.patch, openal-soft-atomic.patch, openal-soft-buildtype.patch, openal-soft-c11.patch, openal-soft-constexpr.patch, openal-soft-emscripten-pthread.patch, openal-soft-emscripten-setschedparam.patch, openal-soft-emscripten-symbol-conflict.patch, openal-soft-event-thread.patch, openal-soft-filesystem.patch, openal-soft-flockfile.patch, openal-soft-int32.patch, openal-soft-mkxp-polyfill.patch, openal-soft-null.patch, openal-soft-pic.patch, openal-soft-ps3.patch

4
subprojects/packagefiles/openal-soft-int32.patch
View file

@ -1,5 +1,5 @@
# Fixes compilation errors when using the devkitARM toolchain toolchain to compile OpenAL Soft.
# For some reason, there's no implicit casting between `int` and `int32_t` and between `unsigned int` and `uint32_t` in devkitARM or Vita SDK even though they're the same size, so we have to do this whole song and dance to appease the compiler.
# Fixes compilation errors when using the devkitARM toolchain to compile OpenAL Soft.
# For some reason, there's no implicit casting between `int` and `int32_t` and between `unsigned int` and `uint32_t` in devkitARM even though they're the same size, so we have to do this whole song and dance to appease the compiler.
--- a/alc/alu.cpp
+++ b/alc/alu.cpp

70
subprojects/packagefiles/openal-soft-mkxp-threads.patch → subprojects/packagefiles/openal-soft-mkxp-polyfill.patch
View file

@ -1,4 +1,4 @@
# This patch makes OpenAL Soft use mkxp-threads.cpp instead of POSIX threads and `std::mutex` for portability reasons.
# This patch makes OpenAL Soft use mkxp-polyfill.cpp instead of POSIX threads and `std::mutex` for portability reasons.
--- a/al/auxeffectslot.cpp
+++ b/al/auxeffectslot.cpp
@ -7,7 +7,7 @@
#include <iterator>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <numeric>
#include <stdexcept>
#include <tuple>
@ -18,7 +18,7 @@
#include <limits>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <numeric>
#include <optional>
#include <stdexcept>
@ -29,7 +29,7 @@
#include <cstring>
#include <deque>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <optional>
#include <stdexcept>
#include <string>
@ -40,7 +40,7 @@
#include <iterator>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <numeric>
#include <string>
#include <type_traits>
@ -51,7 +51,7 @@
#include <exception>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <new>
#include <optional>
#include <string>
@ -62,7 +62,7 @@
#include <iterator>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <numeric>
#include <unordered_map>
#include <vector>
@ -73,7 +73,7 @@
#include <algorithm>
#include <cmath>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include "AL/al.h"
#include "AL/alc.h"
@ -84,7 +84,7 @@
#include <limits>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <numeric>
#include <optional>
#include <stdexcept>
@ -95,7 +95,7 @@
#include <cmath>
#include <deque>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <optional>
#include <stdexcept>
#include <string>
@ -106,7 +106,7 @@
#include <limits>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <new>
#include <optional>
#include <stdexcept>
@ -135,7 +135,7 @@
#include <istream>
#include <limits>
-#include <string>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <string_view>
#include <utility>
#include <vector>
@ -146,7 +146,7 @@
#include <exception>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <string>
#include <string_view>
#include <thread>
@ -157,7 +157,7 @@
#include <cstring>
#include <memory.h>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <thread>
#include <vector>
@ -168,7 +168,7 @@
#include <cstdlib>
#include <cstring>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <new>
#include <thread>
#include <functional>
@ -179,7 +179,7 @@
#include <deque>
#include <future>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <string>
#include <string_view>
#include <thread>
@ -190,7 +190,7 @@
#include <iterator>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <optional>
#include <string_view>
#include <thread>
@ -201,7 +201,7 @@
#include <cstring>
#include <limits>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <optional>
#include <string>
#include <string_view>
@ -212,7 +212,7 @@
#include <cstring>
#include <future>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <string>
#include <string_view>
#include <thread>
@ -223,7 +223,7 @@
#include <deque>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <string>
#include <string_view>
#include <unordered_map>
@ -234,7 +234,7 @@
#include <atomic>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <optional>
#include <string>
#include <unordered_map>
@ -245,7 +245,7 @@
#include <bitset>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <optional>
#include <string_view>
@ -256,7 +256,7 @@
#include <stdexcept>
-#include <string>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
namespace {
@ -321,7 +321,7 @@
#endif
#elif !defined(_WIN32)
-#include <semaphore.h>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#endif
namespace al {
@ -352,7 +352,7 @@
-#ifdef HAVE_PTHREAD_NP_H
-#include <pthread_np.h>
-#endif
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
+
+
+
@ -491,7 +491,7 @@
#include <algorithm>
#include <cassert>
-#include <cmath>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <cstddef>
#include <cstdint>
#include <iterator>
@ -502,7 +502,7 @@
#if HAVE_DYNLOAD
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <type_traits>
#include "logging.h"
@ -513,7 +513,7 @@
#if HAVE_DYNLOAD
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#define DBUS_FUNCTIONS(MAGIC) \
MAGIC(dbus_error_init) \
@ -524,7 +524,7 @@
#include <cstring>
#include <limits>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <optional>
#include <string>
#include <string_view>
@ -535,7 +535,7 @@
#include <iterator>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <numeric>
#include <optional>
#include <tuple>
@ -546,7 +546,7 @@
#include <cstdio>
#include <cstring>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <optional>
#include <string>
#include <string_view>
@ -557,7 +557,7 @@
#include <algorithm>
-#include <cmath>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <cstddef>
#include <functional>
#include <iterator>
@ -568,7 +568,7 @@
#include <future>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <ratio>
#include <string>
#include <string_view>
@ -579,7 +579,7 @@
#include <cstring>
#include <cstdio>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <optional>
#include <string_view>
#include <tuple>
@ -590,7 +590,7 @@
#include <cstdio>
#include <memory>
-#include <mutex>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include <string>
#include <utility>
#include <vector>

4
subprojects/packagefiles/physfs-mkxp-threads.patch → subprojects/packagefiles/physfs-mkxp-polyfill.patch
View file

@ -1,4 +1,4 @@
# This patch makes PhysFS use mkxp-threads.cpp instead of POSIX threads for portability reasons.
# This patch makes PhysFS use mkxp-polyfill.cpp instead of POSIX threads for portability reasons.
--- a/src/physfs_platform_posix.c
+++ b/src/physfs_platform_posix.c
@ -7,7 +7,7 @@
#include <errno.h>
#include <fcntl.h>
-#include <pthread.h>
+#include "../../src/mkxp-threads.h"
+#include "../../src/mkxp-polyfill.h"
#include "physfs_internal.h"

2
subprojects/physfs.wrap
View file

@ -2,4 +2,4 @@
url = https://github.com/icculus/physfs
revision = release-3.2.0
depth = 1
diff_files = physfs-darwin.patch, physfs-dir.patch, physfs-lstat.patch, physfs-mkxp-threads.patch, physfs-unknown-platform.patch
diff_files = physfs-darwin.patch, physfs-dir.patch, physfs-lstat.patch, physfs-mkxp-polyfill.patch, physfs-unknown-platform.patch