| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # GNU Makefile based on shared rules provided by the Native Client SDK. | 5 # GNU Makefile based on shared rules provided by the Native Client SDK. |
| 6 # See README.Makefiles for more details. | 6 # See README.Makefiles for more details. |
| 7 | 7 |
| 8 VALID_TOOLCHAINS := newlib glibc pnacl | 8 VALID_TOOLCHAINS := newlib glibc pnacl linux |
| 9 | 9 |
| 10 NACL_SDK_ROOT ?= $(abspath $(CURDIR)/../../..) | 10 NACL_SDK_ROOT ?= $(abspath $(CURDIR)/../../..) |
| 11 |
| 11 include $(NACL_SDK_ROOT)/tools/common.mk | 12 include $(NACL_SDK_ROOT)/tools/common.mk |
| 12 | 13 |
| 13 TARGET = life | 14 TARGET = touch_drawing_plugin |
| 14 LIBS = $(DEPS) ppapi_simple nacl_io sdk_util ppapi_cpp ppapi pthread | 15 LIBS = ppapi_cpp ppapi pthread ppapi_cpp_private |
| 15 | 16 |
| 16 CFLAGS = -Wall -I.. | 17 CFLAGS = -Wall |
| 17 SOURCES = life.c | 18 SOURCES = touch_drawing_plugin.cc |
| 18 | 19 |
| 19 # Build rules generated by macros from common.mk: | 20 # Build rules generated by macros from common.mk: |
| 20 | 21 |
| 21 $(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src),$(CFLAGS)))) | 22 $(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src),$(CFLAGS)))) |
| 22 | 23 |
| 23 # The PNaCl workflow uses both an unstripped and finalized/stripped binary. | 24 # The PNaCl workflow uses both an unstripped and finalized/stripped binary. |
| 24 # On NaCl, only produce a stripped binary for Release configs (not Debug). | 25 # On NaCl, only produce a stripped binary for Release configs (not Debug). |
| 25 ifneq (,$(or $(findstring pnacl,$(TOOLCHAIN)),$(findstring Release,$(CONFIG)))) | 26 ifneq (,$(or $(findstring pnacl,$(TOOLCHAIN)),$(findstring Release,$(CONFIG)))) |
| 26 $(eval $(call LINK_RULE,$(TARGET)_unstripped,$(SOURCES),$(LIBS),$(DEPS))) | 27 $(eval $(call LINK_RULE,$(TARGET)_unstripped,$(SOURCES),$(LIBS),$(DEPS))) |
| 27 $(eval $(call STRIP_RULE,$(TARGET),$(TARGET)_unstripped)) | 28 $(eval $(call STRIP_RULE,$(TARGET),$(TARGET)_unstripped)) |
| 28 else | 29 else |
| 29 $(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS))) | 30 $(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS))) |
| 30 endif | 31 endif |
| 31 | 32 |
| 32 $(eval $(call NMF_RULE,$(TARGET),)) | 33 $(eval $(call NMF_RULE,$(TARGET),)) |
| OLD | NEW |