Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
From 99af3281ee11ff947a82c561c2a275627ccea90c Mon Sep 17 00:00:00 2001
From: Charlie Birks <charlie@daft.games>
Date: Sat, 22 Jan 2022 12:27:43 +0000
Subject: [PATCH] timer: Fix Emscripten declaration-after-statement error

---
src/timer/unix/SDL_systimer.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/timer/unix/SDL_systimer.c b/src/timer/unix/SDL_systimer.c
index 57fdab09c..2cf26764c 100644
--- a/src/timer/unix/SDL_systimer.c
+++ b/src/timer/unix/SDL_systimer.c
@@ -187,13 +187,6 @@ SDL_GetPerformanceFrequency(void)
void
SDL_Delay(Uint32 ms)
{
-#ifdef __EMSCRIPTEN__
- if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) {
- /* pseudo-synchronous pause, used directly or through e.g. SDL_WaitEvent */
- emscripten_sleep(ms);
- return;
- }
-#endif
int was_error;

#if HAVE_NANOSLEEP
@@ -203,6 +196,14 @@ SDL_Delay(Uint32 ms)
Uint64 then, now, elapsed;
#endif

+#ifdef __EMSCRIPTEN__
+ if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) {
+ /* pseudo-synchronous pause, used directly or through e.g. SDL_WaitEvent */
+ emscripten_sleep(ms);
+ return;
+ }
+#endif
+
/* Set the timeout interval */
#if HAVE_NANOSLEEP
elapsed.tv_sec = ms / 1000;
--
2.35.1

3 changes: 2 additions & 1 deletion ports/sdl2/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ vcpkg_from_github(
0004-Define-crt-macros.patch
0005-Fix-uwp-joystick.patch
0006-Update-SDL_sysurl.cpp.patch
0007-timer-Fix-Emscripten-declaration-after-statement-err.patch
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libsdl-org/SDL@99af328

This has been applied upstream.

)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC)
Expand Down Expand Up @@ -98,4 +99,4 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ")
endif()

vcpkg_fixup_pkgconfig()
vcpkg_fixup_pkgconfig()
1 change: 1 addition & 0 deletions ports/sdl2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "sdl2",
"version": "2.0.20",
"port-version": 1,
"description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
"homepage": "https://www.libsdl.org/download-2.0.php",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6326,7 +6326,7 @@
},
"sdl2": {
"baseline": "2.0.20",
"port-version": 0
"port-version": 1
},
"sdl2-gfx": {
"baseline": "1.0.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sdl2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9900463f2847ed86e25bac1688c527ae3486a024",
"version": "2.0.20",
"port-version": 1
},
{
"git-tree": "d5865b5fb9c52f255629f4c015f37df9ca788a33",
"version": "2.0.20",
Expand Down