From 22f957eb5ccb6096d93a8bbbff1b052f68ef9f2c Mon Sep 17 00:00:00 2001 From: Allan Amstadt Date: Thu, 9 Jul 2020 22:19:32 +0200 Subject: [PATCH] Fixed macos build --- .gitignore | 6 +----- build.js | 8 ++++---- package-lock.json | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 19ca57c..1a8e458 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,5 @@ -/build/.gclient -/build/.gclient_entries -/build/depot_tools/ -/build/src/ .DS_Store /releases /node_modules /build -.idea/ \ No newline at end of file +.idea/ diff --git a/build.js b/build.js index efbb91b..4f74033 100755 --- a/build.js +++ b/build.js @@ -141,11 +141,11 @@ ${platform === 'arm' ? 'target_cpu=["arm"]' : ''} await execAsync('gclient', 'sync', '--with_branch_heads'); if (program.arch === 'ia32') { - await execAsync('gn', 'gen', 'out/Default', '--args="is_debug=false is_component_ffmpeg=true is_official_build=true target_cpu=\\"x86\\" ffmpeg_branding=\\"Chrome\\""'); + await execAsync('gn', 'gen', 'out/Default', '--args="is_debug=false enable_nacl=false is_component_ffmpeg=true proprietary_codecs=true is_official_build=true target_cpu=\\"x86\\" ffmpeg_branding=\\"Chrome\\""'); } else if (program.arch === 'x64') { - await execAsync('gn', 'gen', 'out/Default', '--args="is_debug=false is_component_ffmpeg=true is_official_build=true target_cpu=\\"x64\\" ffmpeg_branding=\\"Chrome\\""'); - }else if (program.arch === 'arm') { - await execAsync('gn', 'gen', 'out/Default', '--args="is_debug=false is_component_ffmpeg=true is_official_build=true target_cpu=\\"arm\\" ffmpeg_branding=\\"Chrome\\""'); + await execAsync('gn', 'gen', 'out/Default', '--args="is_debug=false enable_nacl=false is_component_ffmpeg=true proprietary_codecs=true is_official_build=true target_cpu=\\"x64\\" ffmpeg_branding=\\"Chrome\\""'); + } else if (program.arch === 'arm') { + await execAsync('gn', 'gen', 'out/Default', '--args="is_debug=false enable_nacl=false is_component_ffmpeg=true proprietary_codecs=true is_official_build=true target_cpu=\\"arm\\" ffmpeg_branding=\\"Chrome\\""'); } await execAsync('autoninja', '-C', 'out/Default', libName); const zipFile = new yazl.ZipFile(); diff --git a/package-lock.json b/package-lock.json index 80f63ca..47cd95c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nwjs-ffmpeg-prebuilt", - "version": "0.0.3", + "version": "0.0.4", "lockfileVersion": 1, "requires": true, "dependencies": {