Skip to content

Commit

Permalink
Build ffmpeg57 wrapper only if required
Browse files Browse the repository at this point in the history
See: #38
  • Loading branch information
Kagami committed Sep 8, 2018
1 parent df9f87a commit e618cdf
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
19 changes: 14 additions & 5 deletions binding.gyp
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"variables": {
"prev_ffmpeg%": "0",
},
"targets": [
{
"target_name": "boram",
Expand Down Expand Up @@ -49,11 +52,6 @@
"libraries": ["-l:libavformat.so.58"],
"ldflags": ["-static-libstdc++"],
},
{
"target_name": "ffmpeg57",
"libraries": ["-l:libavformat.so.57"],
"ldflags": ["-static-libstdc++"],
},
{
"target_name": "checklib",
"type": "executable",
Expand All @@ -62,6 +60,17 @@
"ldflags": ["-static-libstdc++"],
},
],
"conditions": [
["prev_ffmpeg==1", {
"targets": [
{
"target_name": "ffmpeg57",
"libraries": ["-l:libavformat.so.57"],
"ldflags": ["-static-libstdc++"],
},
],
}],
],
}],
],
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"mpv-win32": "cp -a \"${BORAM_WIN_PREBUILT_ROOT}/boram32.node\" dist/app/boram.dll",
"mpv-win64": "cp -a \"${BORAM_WIN_PREBUILT_ROOT}/boram64.node\" dist/app/boram.dll",
"mpv-mac64": "cp -a \"${BORAM_MAC_PREBUILT_ROOT}/boram.node\" dist/app/libboram.dylib",
"mpv-lin64": "node-gyp rebuild && strip build/Release/boram.node -o dist/app/libboram.so && strip build/Release/checklib -o dist/app/checklib",
"mpv-lin64": "node-gyp rebuild --prev_ffmpeg=1 && strip build/Release/boram.node -o dist/app/libboram.so && strip build/Release/checklib -o dist/app/checklib",
"pack-win32": "electron-packager dist/app --no-prune --platform=win32 --arch=ia32 --out=dist --icon=src/index/icon.ico --app-copyright='Copyright (c) 2016-2018 T-ara Industries' --win32metadata.CompanyName='T-ara Industries' --win32metadata.FileDescription='Cross-platform WebM converter' --win32metadata.OriginalFilename=boram.exe --win32metadata.ProductName=boram && cd dist && rm *win-x86/LICENSE* && cp -a ../licenses *win-x86 && 7z a -m0=lzma2 -mx=9 $(echo *win-x86).7z *win-x86",
"pack-win64": "electron-packager dist/app --no-prune --platform=win32 --arch=x64 --out=dist --icon=src/index/icon.ico --app-copyright='Copyright (c) 2016-2018 T-ara Industries' --win32metadata.CompanyName='T-ara Industries' --win32metadata.FileDescription='Cross-platform WebM converter' --win32metadata.OriginalFilename=boram.exe --win32metadata.ProductName=boram && cd dist && rm *win-x64/LICENSE* && cp -a ../licenses *win-x64 && 7z a -m0=lzma2 -mx=9 $(echo *win-x64).7z *win-x64",
"pack-mac64": "electron-packager dist/app --no-prune --platform=darwin --arch=x64 --out=dist --icon=src/index/icon.icns --app-copyright='Copyright (c) 2016-2018 T-ara Industries' --app-category-type=public.app-category.video && cd dist/*darwin-x64 && mv boram.app boram-v${npm_package_version}.app && 7z a -tzip -mx=9 $(echo ../*darwin-x64).zip *.app",
Expand Down

0 comments on commit e618cdf

Please sign in to comment.