Makefile - Issue 37213005: Update scummvm to 1.6.0, also make it a packaged app.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Makefile

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:

Index: Makefile

diff --git a/Makefile b/Makefile

index 591c7f22c178787bfcde4e2c234d50ede1bc5d13..1e12f6db190f966fe676560ede92df0ec2f6046c 100644

--- a/Makefile

+++ b/Makefile

@@ -276,8 +276,8 @@ $(SENT)/examples/tools/python_ppapi: libraries/python libraries/libtar

$(SENT)/examples/tools/lua_ppapi: libraries/lua libraries/libtar

$(SENT)/examples/tools/ruby_ppapi: \

libraries/ruby libraries/libtar libraries/glibc-compat

-$(SENT)/examples/games/scummvm: \

- libraries/nacl-mounts libraries/SDL libraries/libvorbis

+$(SENT)/examples/games/scummvm: libraries/SDL libraries/libvorbis \

+ libraries/libtar

$(SENT)/examples/systems/bochs: \

libraries/nacl-mounts libraries/SDL

$(SENT)/examples/systems/dosbox: \

« no previous file with comments | « no previous file | examples/games/scummvm/hosted_app/manifest.json » ('j') | libraries/SDL/nacl.patch » ('J')