From: vincent@cubedesigners.com Date: Thu, 2 Dec 2021 14:38:48 +0000 (+0000) Subject: wait #4941 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ea6b642813e3a09e92dfc91c46341221c3d2e2bb;p=cubeextranet.git wait #4941 @1.5 --- diff --git a/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll b/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll deleted file mode 100644 index c7f0bc666..000000000 Binary files a/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll and /dev/null differ diff --git a/fluidbook/compile/_exehtml/_ffmpeg/windows-x32-ffmpeg.dll b/fluidbook/compile/_exehtml/_ffmpeg/windows-x32-ffmpeg.dll new file mode 100644 index 000000000..4d335bea9 Binary files /dev/null and b/fluidbook/compile/_exehtml/_ffmpeg/windows-x32-ffmpeg.dll differ diff --git a/fluidbook/compile/_exehtml/_ffmpeg/windows-x64-ffmpeg.dll b/fluidbook/compile/_exehtml/_ffmpeg/windows-x64-ffmpeg.dll new file mode 100644 index 000000000..faa1b7db3 Binary files /dev/null and b/fluidbook/compile/_exehtml/_ffmpeg/windows-x64-ffmpeg.dll differ diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php index 93b44f455..fb46ab8fe 100644 --- a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php +++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php @@ -5,8 +5,8 @@ class wsPackagerWinEXEHTML extends wsPackager protected $exeName; protected $appName; protected $buildPath; - protected $nwplatform = 'windows-x32'; - protected $nwversion = '0.49.2'; + protected $nwplatform = 'windows-x64'; + protected $nwversion = '0.55.0'; protected $appversion = ''; protected $node_platform = 'win'; protected $exenameMaxlength = 30; @@ -70,7 +70,7 @@ class wsPackagerWinEXEHTML extends wsPackager function replaceFFMpeg() { - copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/ffmpeg.dll', $this->getFinalPackageDir() . '/ffmpeg.dll'); + copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/' . $this->nwplatform . '-ffmpeg.dll', $this->getFinalPackageDir() . '/ffmpeg.dll'); } function makeJSON()