-
Notifications
You must be signed in to change notification settings - Fork 5
/
angle-Remove-copy_scripts-target.patch
68 lines (62 loc) · 1.7 KB
/
angle-Remove-copy_scripts-target.patch
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
From 1ea025fac01f94d61d254309418ef470c36cbd4c Mon Sep 17 00:00:00 2001
From: Martchus <[email protected]>
Date: Sun, 6 Nov 2016 17:57:18 +0100
Subject: [PATCH 7/8] 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 3ade282..8842d96 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" ]
static_library("translator") {
@@ -421,12 +410,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/libGLESv2.gypi b/src/libGLESv2.gypi
index 1267cc2..56c3e99 100644
--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -1020,13 +1020,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