nacltoons/Makefile - Issue 14851014: [nacltoons] Move nacl-specific build to proj.nacl

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: nacltoons/Makefile

Issue 14851014: [nacltoons] Move nacl-specific build to proj.nacl (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: Created 7 years, 7 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: nacltoons/Makefile

diff --git a/nacltoons/Makefile b/nacltoons/Makefile

index 5e892e88bb66775464145451ffbebc0edfeee7b7..e0c00dc5b7cb498a00b1e93e4e4ab661277b1fac 100644

--- a/nacltoons/Makefile

+++ b/nacltoons/Makefile

@@ -27,7 +27,7 @@ TOOLCHAIN ?= newlib

all: cocos2dx

@echo '@@@BUILD_STEP build game@@@'

- TOOLCHAIN=$(TOOLCHAIN) NACL_ARCH=$(NACL_ARCH) CONFIG=$(CONFIG) $(MAKE) -f game.mk

+ TOOLCHAIN=$(TOOLCHAIN) NACL_ARCH=$(NACL_ARCH) CONFIG=$(CONFIG) $(MAKE) -C proj.nacl

cocos2dx : build/build-cocos2dx.sh

USE_BOX2D=1 NACL_ARCH=$(NACL_ARCH) build/build-cocos2dx.sh

@@ -54,7 +54,7 @@ publish: all

CHROME_ARGS += --no-first-run --user-data-dir=$(OUT_DIR)/user-data-dir

run: publish

- NACL_ARCH=$(NACL_ARCH) CHROME_ARGS="$(CHROME_ARGS)" $(MAKE) -f game.mk RUN

+ NACL_ARCH=$(NACL_ARCH) CHROME_ARGS="$(CHROME_ARGS)" $(MAKE) -C proj.nacl RUN

run-app: publish

$(CHROME_PATH) $(CHROME_ARGS) --load-extension=$(PUBLISH_DIR) chrome://newtab

« no previous file with comments | « no previous file | nacltoons/game.mk » ('j') | no next file with comments »