Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(3496)

Side by Side Diff: tests/build_tests.gyp

Issue 13971043: Fix a couple errors in the gyp build scripts. (Closed) Base URL: https://code.google.com/p/angleproject/@master
Patch Set: Defer component build fix for later. Created 11 years, 6 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
« include/GLSLANG/ShaderLang.h ('K') | « src/build_angle.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The ANGLE Project Authors. All rights reserved. 1 # Copyright (c) 2012 The ANGLE Project 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'gtest', 8 'target_name': 'gtest',
9 'type': 'static_library', 9 'type': 'static_library',
10 'include_dirs': [ 10 'include_dirs': [
(...skipping 22 matching lines...) Expand all
33 'dependencies': [ 33 'dependencies': [
34 '../src/build_angle.gyp:preprocessor', 34 '../src/build_angle.gyp:preprocessor',
35 'gtest', 35 'gtest',
36 'gmock', 36 'gmock',
37 ], 37 ],
38 'variables': { 38 'variables': {
39 'ANGLE_DIR': '..', 39 'ANGLE_DIR': '..',
40 }, 40 },
41 'includes': [ 41 'includes': [
42 'preprocessor_tests/preprocessor_tests.gypi', 42 'preprocessor_tests/preprocessor_tests.gypi',
43 ] 43 ],
44 'include_dirs': [ 44 'include_dirs': [
45 '../src/compiler/preprocessor', 45 '../src/compiler/preprocessor',
46 '../third_party/googletest/include', 46 '../third_party/googletest/include',
47 '../third_party/googlemock/include', 47 '../third_party/googlemock/include',
48 ], 48 ],
49 'sources': [ 49 'sources': [
50 '../third_party/googlemock/src/gmock_main.cc', 50 '../third_party/googlemock/src/gmock_main.cc',
51 ], 51 ],
52 }, 52 },
53 { 53 {
54 'target_name': 'compiler_tests', 54 'target_name': 'compiler_tests',
55 'type': 'executable', 55 'type': 'executable',
56 'dependencies':· 56 'dependencies': [
57 '../src/build_angle.gyp:translator_common', 57 '../src/build_angle.gyp:translator_static',
58 '../src/build_angle.gyp:translator_glsl',
59 'gtest', 58 'gtest',
60 'gmock', 59 'gmock',
61 ], 60 ],
62 'variables': { 61 'variables': {
63 'ANGLE_DIR': '..', 62 'ANGLE_DIR': '..',
64 }, 63 },
65 'includes': [ 64 'includes': [
66 'compiler_tests/compiler_tests.gypi', 65 'compiler_tests/compiler_tests.gypi',
67 ] 66 ],
68 'include_dirs': [ 67 'include_dirs': [
69 '../include', 68 '../include',
70 '../src', 69 '../src',
71 '../third_party/googletest/include', 70 '../third_party/googletest/include',
72 '../third_party/googlemock/include', 71 '../third_party/googlemock/include',
73 ], 72 ],
74 'sources': [ 73 'sources': [
75 'compiler_tests/compiler_test_main.cpp', 74 'compiler_tests/compiler_test_main.cpp',
76 ], 75 ],
77 }, 76 },
78 ], 77 ],
79 } 78 }
80 79
81 # Local Variables: 80 # Local Variables:
82 # tab-width:2 81 # tab-width:2
83 # indent-tabs-mode:nil 82 # indent-tabs-mode:nil
84 # End: 83 # End:
85 # vim: set expandtab tabstop=2 shiftwidth=2: 84 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« include/GLSLANG/ShaderLang.h ('K') | « src/build_angle.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b