forked from nwjs/nw.js
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathffmpeg.patch
More file actions
40 lines (38 loc) · 1.18 KB
/
ffmpeg.patch
File metadata and controls
40 lines (38 loc) · 1.18 KB
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
diff --git a/BUILD.gn b/BUILD.gn
index 1f11a9731d..abe12dc294 100755
--- BUILD.gn
+++ BUILD.gn
@@ -264,7 +264,7 @@ target(link_target_type, "ffmpeg_internal") {
# Windows builds can't compile without EBP because we can't omit frame
# pointers like we do on posix.
if (current_cpu == "x86") {
- if (using_sanitizer || is_win || use_lld) {
+ if (true) {
defines += [ "HAVE_EBP_AVAILABLE=0" ]
} else {
defines += [ "HAVE_EBP_AVAILABLE=1" ]
@@ -422,6 +422,12 @@ if (is_component_ffmpeg) {
# So we can append below and assume they're defined.
ldflags = []
+ if (is_mac) {
+ ldflags += [
+ "-Wl,-install_name,@loader_path/libffmpeg.dylib"
+ ]
+ }
+
if (is_fuchsia || (is_posix && !is_mac)) {
# Fixes warnings PIC relocation when building as component.
ldflags += [
@@ -434,12 +440,10 @@ if (is_component_ffmpeg) {
deps += [ ":ffmpeg_generate_def" ]
sources = [
"$target_gen_dir/ffmpeg.def",
+ "../../content/nw/src/ffmpeg.rc",
]
}
- if (is_mac && !is_component_build) {
- ldflags += [ "-Wl,-install_name,@rpath/libffmpeg.dylib" ]
- }
}
} else {
source_set("ffmpeg") {