native_client_sdk/src/examples/input_events/Makefile - Issue 11882012: Convert all project to use common.mk

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: native_client_sdk/src/examples/input_events/Makefile

Issue 11882012: Convert all project to use common.mk (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge Created 7 years, 11 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 | « native_client_sdk/src/examples/hello_world_stdio/example.dsc ('k') | native_client_sdk/src/examples/input_events/example.dsc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: native_client_sdk/src/examples/input_events/Makefile

diff --git a/native_client_sdk/src/examples/hello_world/Makefile b/native_client_sdk/src/examples/input_events/Makefile

similarity index 77%

copy from native_client_sdk/src/examples/hello_world/Makefile

copy to native_client_sdk/src/examples/input_events/Makefile

index 1c20829676e5e2d81f4676b999e2b66282d645e1..53c2de30ec28e8e11e5d58b94c912662c74d1fd5 100644

--- a/native_client_sdk/src/examples/hello_world/Makefile

+++ b/native_client_sdk/src/examples/input_events/Makefile

@@ -14,9 +14,19 @@

# By default we will build a Debug configuration using the GCC newlib toolcahin

# to override this, specify TOOLCHAIN=newlib|glibc or CONFIG=Debug|Release on

-# the make command-line or in this file prior to including common.mk

+# the make command-line or in this file prior to including common.mk. The

+# toolchain we use by default will be the first valid one listed

+VALID_TOOLCHAINS:=newlib glibc pnacl linux win

+# Get pepper directory for toolchain and includes.

+# If NACL_SDK_ROOT is not set, then assume it can be found relative to

+# to this Makefile.

-include common.mk

+NACL_SDK_ROOT?=$(abspath $(CURDIR)/../..)

+include $(NACL_SDK_ROOT)/tools/common.mk

@@ -25,12 +35,12 @@ include common.mk

# The base name of the final NEXE, also the name of the NMF file containing

# the mapping between architecture and actual NEXE.

-TARGET=hello_world

+TARGET=input_events

# List of sources to compile

-SOURCES=hello_world.c

+SOURCES=custom_events.cc input_events.cc

@@ -47,7 +57,7 @@ SOURCES=hello_world.c

# dependencies.

DEPS=

-LIBS=$(DEPS) ppapi pthread

+LIBS=$(DEPS) ppapi_cpp ppapi pthread

@@ -63,7 +73,7 @@ $(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src))))

# Use the link macro for this target on the list of sources.

-$(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS)))

+$(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS)))

# Specify the NMF to be created with no additional arugments.