Fixed macos build

This commit is contained in:
Allan Amstadt 2020-07-09 22:19:32 +02:00
parent 80095e4f78
commit 22f957eb5c
3 changed files with 6 additions and 10 deletions

6
.gitignore vendored
View File

@ -1,9 +1,5 @@
/build/.gclient
/build/.gclient_entries
/build/depot_tools/
/build/src/
.DS_Store
/releases
/node_modules
/build
.idea/
.idea/

View File

@ -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();

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "nwjs-ffmpeg-prebuilt",
"version": "0.0.3",
"version": "0.0.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {