Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(478)

Unified Diff: libraries/SDL/nacl.patch

Issue 37213005: Update scummvm to 1.6.0, also make it a packaged app. (Closed) Base URL: https://naclports.googlecode.com/svn/trunk/src
Patch Set: fix ARM build, remove "whole archive" Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « examples/games/scummvm/scummvm-1.6.0.sha1 ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libraries/SDL/nacl.patch
diff --git a/libraries/SDL/nacl.patch b/libraries/SDL/nacl.patch
index 2e1c87977d20842e1fa48752e7e6f727910f2aef..0841cf3bf48eb137eed44f23a094b31638191322 100644
--- a/libraries/SDL/nacl.patch
+++ b/libraries/SDL/nacl.patch
@@ -50,7 +50,7 @@ index 5ecc18b..7693a2a 100755
;;
-nto*)
diff --git a/configure.in b/configure.in
-index a7e9b18..ca1de7e 100644
+index a7e9b18..8788acd 100644
--- a/configure.in
+++ b/configure.in
@@ -885,6 +885,48 @@ CheckVisibilityHidden()
@@ -66,7 +66,7 @@ index a7e9b18..ca1de7e 100644
+ if test x$enable_video = xyes -a x$enable_naclvideo = xyes; then
+ AC_DEFINE(SDL_VIDEO_DRIVER_NACL)
+ SOURCES="$SOURCES $srcdir/src/video/nacl/*.cc"
-+ SDL_LIBS="-Wl,--start-group -lSDLmain $SDL_LIBS -lppapi -lppapi_cpp -lppapi_gles2 -Wl,--end-group -lstdc++"
++ SDL_LIBS="-Wl,--start-group -lSDLmain -lnacl_io $SDL_LIBS -lppapi -lppapi_cpp -lppapi_gles2 -Wl,--end-group -lstdc++"
Sam Clegg 2013/10/26 01:20:52 I'm afraid you can't do this just yet because ther
+ fi
+
+ AC_ARG_ENABLE(naclaudio,
« no previous file with comments | « examples/games/scummvm/scummvm-1.6.0.sha1 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698