1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
From 815ed9402c0da91ee607bc61414c77d350f4a009 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 6 Nov 2016 17:57:18 +0100
Subject: [PATCH 07/10] Remove copy_scripts target
Executing .bat scripts on Linux is a no-go
---
BUILD.gn | 17 ---------------
src/angle.gyp | 61 ------------------------------------------------------
src/libGLESv2.gypi | 7 -------
3 files changed, 85 deletions(-)
diff --git a/BUILD.gn b/BUILD.gn
index 4232008..f3ecf89 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -60,17 +60,6 @@ config("extra_warnings") {
}
}
-if (is_win) {
- copy("copy_compiler_dll") {
- sources = [
- "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll",
- ]
- outputs = [
- "$root_out_dir/d3dcompiler_47.dll",
- ]
- }
-}
-
angle_undefine_configs = [ "//build/config/compiler:default_include_dirs" ]
# Holds the shared includes so we only need to list them once.
@@ -396,12 +385,6 @@ static_library("libANGLE") {
":libANGLE_config",
":internal_config",
]
-
- if (is_win) {
- data_deps = [
- ":copy_compiler_dll",
- ]
- }
}
config("shared_library_public_config") {
diff --git a/src/angle.gyp b/src/angle.gyp
index e4e8ba9..7a4061d 100644
--- a/src/angle.gyp
+++ b/src/angle.gyp
@@ -169,27 +169,6 @@
],
},
},
-
- {
- 'target_name': 'copy_scripts',
- 'type': 'none',
- 'includes': [ '../gyp/common_defines.gypi', ],
- 'hard_dependency': 1,
- 'copies':
- [
- {
- 'destination': '<(angle_gen_path)',
- 'files': [ 'copy_compiler_dll.bat', '<(angle_id_script_base)' ],
- },
- ],
- 'conditions':
- [
- ['angle_build_winrt==1',
- {
- 'type' : 'shared_library',
- }],
- ],
- },
],
'conditions':
[
@@ -201,7 +180,6 @@
'target_name': 'commit_id',
'type': 'none',
'includes': [ '../gyp/common_defines.gypi', ],
- 'dependencies': [ 'copy_scripts', ],
'hard_dependency': 1,
'actions':
[
@@ -267,44 +245,5 @@
}
]
}],
- ['OS=="win"',
- {
- 'targets':
- [
- {
- 'target_name': 'copy_compiler_dll',
- 'type': 'none',
- 'dependencies': [ 'copy_scripts', ],
- 'includes': [ '../gyp/common_defines.gypi', ],
- 'conditions':
- [
- ['angle_build_winrt==0',
- {
- 'actions':
- [
- {
- 'action_name': 'copy_dll',
- 'message': 'Copying D3D Compiler DLL...',
- 'msvs_cygwin_shell': 0,
- 'inputs': [ 'copy_compiler_dll.bat' ],
- 'outputs': [ '<(PRODUCT_DIR)/d3dcompiler_47.dll' ],
- 'action':
- [
- "<(angle_gen_path)/copy_compiler_dll.bat",
- "$(PlatformName)",
- "<(windows_sdk_path)",
- "<(PRODUCT_DIR)"
- ],
- },
- ], #actions
- }],
- ['angle_build_winrt==1',
- {
- 'type' : 'shared_library',
- }],
- ]
- },
- ], # targets
- }],
] # conditions
}
diff --git a/src/libGLESv2.gypi b/src/libGLESv2.gypi
index cd69e44..506147e 100644
--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -1035,13 +1035,6 @@
'ANGLE_ENABLE_NULL',
],
}],
- ['angle_build_winrt==0 and OS=="win"',
- {
- 'dependencies':
- [
- 'copy_compiler_dll'
- ],
- }],
['angle_build_winrt==1',
{
'msvs_requires_importlibrary' : 'true',
--
2.10.2
|