MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-08 04:28:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation of libiconv and sdl

Browse Source
This commit is contained in:
Jeremy Soller 2019-08-29 09:42:29 -06:00
parent a17a02c79c
commit 6eb28fa429
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes/libiconv/recipe.sh
View File

@ -13,7 +13,13 @@ function recipe_update {
function recipe_build { function recipe_build {
export LDFLAGS="--static" export LDFLAGS="--static"
./configure --build=${BUILD} --host=${HOST} --prefix='/' --disable-shared --enable-static ./configure \
--build="${BUILD}" \
--host="${HOST}" \
--prefix='/' \
--disable-shared \
--enable-static \
ac_cv_have_decl_program_invocation_name=no
make -j"$(nproc)" make -j"$(nproc)"
skip=1 skip=1
} }

4
recipes/sdl/redox.patch
View File

@ -380,7 +380,7 @@ diff -ruwN source/src/thread/pthread/SDL_systhread.c source-new/src/thread/pthre
diff -ruwN source/src/video/orbital/SDL_orbitalevents.c source-new/src/video/orbital/SDL_orbitalevents.c diff -ruwN source/src/video/orbital/SDL_orbitalevents.c source-new/src/video/orbital/SDL_orbitalevents.c
--- source/src/video/orbital/SDL_orbitalevents.c 1969-12-31 17:00:00.000000000 -0700 --- source/src/video/orbital/SDL_orbitalevents.c 1969-12-31 17:00:00.000000000 -0700
+++ source-new/src/video/orbital/SDL_orbitalevents.c 2019-08-12 14:51:38.427129083 -0600 +++ source-new/src/video/orbital/SDL_orbitalevents.c 2019-08-12 14:51:38.427129083 -0600
@@ -0,0 +1,242 @@ @@ -0,0 +1,240 @@
+/* +/*
+ SDL - Simple DirectMedia Layer + SDL - Simple DirectMedia Layer
+ Copyright (C) 1997-2012 Sam Lantinga + Copyright (C) 1997-2012 Sam Lantinga
@ -462,8 +462,6 @@ diff -ruwN source/src/video/orbital/SDL_orbitalevents.c source-new/src/video/orb
+ void* event_iter = orb_window_events(this->hidden->window); + void* event_iter = orb_window_events(this->hidden->window);
+ OrbEventOption oeo = orb_events_next(event_iter); + OrbEventOption oeo = orb_events_next(event_iter);
+ while (oeo.tag != OrbEventOption_None) { + while (oeo.tag != OrbEventOption_None) {
+ found_event = true;
+
+ switch (oeo.tag) { + switch (oeo.tag) {
+ case OrbEventOption_Key: + case OrbEventOption_Key:
+ keysym.unicode = oeo.key.character; + keysym.unicode = oeo.key.character;