native_client_sdk/src/build_tools/make_rules.py - Issue 11417098: Added libjpeg and zlib to SDK

Side by Side Diff: native_client_sdk/src/build_tools/make_rules.py

Issue 11417098: Added libjpeg and zlib to SDK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log

« native_client_sdk/src/build_tools/build_sdk.py ('K') | « native_client_sdk/src/build_tools/library.mk ('k') | native_client_sdk/src/libraries/libjpeg/library.dsc » ('j') | native_client_sdk/src/libraries/libjpeg/library.dsc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 #!/usr/bin/env python	1 #!/usr/bin/env python

2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.	2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

3 # Use of this source code is governed by a BSD-style license that can be	3 # Use of this source code is governed by a BSD-style license that can be

4 # found in the LICENSE file.	4 # found in the LICENSE file.

5	5

6 import os	6 import os

7	7

8 # pylint: disable=C0301	8 # pylint: disable=C0301

9 # This file contains lines longer than 80	9 # This file contains lines longer than 80

10	10

(...skipping 27 matching lines...) Expand all Loading...
38 PNACL_CXX?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++ -c	38 PNACL_CXX?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++ -c

39 PNACL_LINK?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++	39 PNACL_LINK?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++

40 PNACL_LIB?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-ar r	40 PNACL_LIB?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-ar r

41 PNACL_DUMP?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/objdump	41 PNACL_DUMP?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/objdump

42 PNACL_CCFLAGS?=-MMD -pthread $(NACL_WARNINGS) -idirafter $(NACL_SDK_ROOT)/includ e	42 PNACL_CCFLAGS?=-MMD -pthread $(NACL_WARNINGS) -idirafter $(NACL_SDK_ROOT)/includ e

43 PNACL_LDFLAGS?=-pthread	43 PNACL_LDFLAGS?=-pthread

44 TRANSLATE:=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-translate	44 TRANSLATE:=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-translate

45 """	45 """

46	46

47 LINUX_DEFAULTS = """	47 LINUX_DEFAULTS = """

48 LINUX_WARNINGS?=-Wno-long-long -Wall -Wswitch-enum -Werror	48 LINUX_WARNINGS?=-Wno-long-long

49 LINUX_CC?=gcc -c	49 LINUX_CC?=gcc -c

50 LINUX_CXX?=g++ -c	50 LINUX_CXX?=g++ -c

51 LINUX_LINK?=g++	51 LINUX_LINK?=g++

52 LINUX_LIB?=ar r	52 LINUX_LIB?=ar r

53 LINUX_CCFLAGS=-MMD -pthread $(LINUX_WARNINGS) -I$(NACL_SDK_ROOT)/include -I$(NAC L_SDK_ROOT)/include/linux	53 LINUX_CCFLAGS=-MMD -pthread $(LINUX_WARNINGS) -I$(NACL_SDK_ROOT)/include -I$(NAC L_SDK_ROOT)/include/linux

54 """	54 """

55	55

56 WIN_DEFAULTS = """	56 WIN_DEFAULTS = """

57 WIN_CC?=cl.exe /nologo /WX	57 WIN_CC?=cl.exe /nologo /WX

58 WIN_CXX?=cl.exe /nologo /EHsc /WX	58 WIN_CXX?=cl.exe /nologo /EHsc /WX

(...skipping 438 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
497 replace['<ARCH>'] = arch['<ARCH>']	497 replace['<ARCH>'] = arch['<ARCH>']

498 for dll in dlls:	498 for dll in dlls:

499 replace['<proj>'] = dll	499 replace['<proj>'] = dll

500 nmf_targets.append(Replace(dll_target, replace))	500 nmf_targets.append(Replace(dll_target, replace))

501 replace['<proj>'] = main	501 replace['<proj>'] = main

502 nmf_targets.append(Replace(target, replace))	502 nmf_targets.append(Replace(target, replace))

503	503

504 replace['<NMF_TARGETS>'] = ' '.join(nmf_targets)	504 replace['<NMF_TARGETS>'] = ' '.join(nmf_targets)

505 rules = Replace(BUILD_RULES[tc]['NMF'], replace)	505 rules = Replace(BUILD_RULES[tc]['NMF'], replace)

506 return '\nALL_TARGETS+=%s/%s/%s.nmf' % (tc, cfg, main) + rules + '\n'	506 return '\nALL_TARGETS+=%s/%s/%s.nmf' % (tc, cfg, main) + rules + '\n'

OLD	NEW