wait #4941 @1.5

diff --git a/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll b/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll
deleted file mode 100644 (file)
index c7f0bc6..0000000
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 (file)
index 0000000..4d335be
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 (file)
index 0000000..faa1b7d
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 93b44f4554f1a98c9ce0f40122a93a6246af47fa..fb46ab8feac153884f47d8916e935a5ea378e9d1 100644 (file)
--- 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;\r
     protected $appName;\r
     protected $buildPath;\r
-    protected $nwplatform = 'windows-x32';\r
-    protected $nwversion = '0.49.2';\r
+    protected $nwplatform = 'windows-x64';\r
+    protected $nwversion = '0.55.0';\r
     protected $appversion = '';\r
     protected $node_platform = 'win';\r
     protected $exenameMaxlength = 30;\r
@@ -70,7 +70,7 @@ class wsPackagerWinEXEHTML extends wsPackager
 \r
     function replaceFFMpeg()\r
     {\r
-        copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/ffmpeg.dll', $this->getFinalPackageDir() . '/ffmpeg.dll');\r
+        copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/' . $this->nwplatform . '-ffmpeg.dll', $this->getFinalPackageDir() . '/ffmpeg.dll');\r
     }\r
 \r
     function makeJSON()\r