From bffe3357b81ce04c92af808d2f81d54d5680a61c Mon Sep 17 00:00:00 2001 From: Joe Wreschnig Date: Mon, 8 Sep 2014 02:08:15 +0200 Subject: [PATCH] Include D3D compiler DLLs in Windows binaries. --- BUGS.org | 3 ++- rules/node-webkit.mk | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/BUGS.org b/BUGS.org index b754638..dcde463 100644 --- a/BUGS.org +++ b/BUGS.org @@ -6,7 +6,8 @@ ** DONE Close buttons don't scroll off the top of the dialog Actually, they still do in most browsers, but as position: sticky support rolls out, they will work correctly. +** DONE Include DLLs necessary for broader Windows support * Pending -** TODO Detect WebGL failure on Windows and offer DX redistributable ** TODO Fix version number in OS X About dialog +** TODO Detect WebGL failure on Windows and offer DX redistributable diff --git a/rules/node-webkit.mk b/rules/node-webkit.mk index 8aa0d0b..79d8178 100644 --- a/rules/node-webkit.mk +++ b/rules/node-webkit.mk @@ -23,6 +23,7 @@ $(node-webkit-pattern): node-webkit-version ?= 0.10.2 node-webkit-prefix ?= node-webkit/ +node-webkit-directx = $(addprefix $(node-webkit-prefix),d3dcompiler_43.dll d3dcompiler_46.dll) node-webkit = $(node-webkit-prefix)node-webkit-v$(firstword $(value node-webkit-version-$1) $(node-webkit-version))-$1 @@ -82,10 +83,17 @@ define node-webkit-package-win $(RM) $(@D)/icon.ico mv $(@:.zip=)/credits.html $(@:.zip=)/node-webkit\ credits.html cp -a $< $(@:.zip=)/package.nw + cp -a $(node-webkit-directx) $(@:.zip=) mv $(@:.zip=)/nw.exe $(@:.zip=)/`echo $(notdir $1) | sed -E 's/-[^-]+$$/.exe/'` cd $(@D) && $(ZIP) -r $(@F) $(@F:.zip=) $(RM) -r $(@:.zip=) endef -%-win-ia32.zip: %.nw $(call node-webkit,win-ia32.zip) +%-win-ia32.zip: %.nw $(call node-webkit,win-ia32.zip) $(node-webkit-directx) $(call node-webkit-package-win,$<,$(word 2,$^)) + +$(node-webkit-directx): + wget -O $@ 'https://github.com/cefsharp/cef-binary/raw/1e51255cf77d267899bf7834768b8774affaad2d/cef_binary_3.y.z_windows32/Release/'$(notdir $@) + +$(node-webkit-prefix)dxwebsetup.exe: + wget -O $@ http://download.microsoft.com/download/1/7/1/1718CCC4-6315-4D8E-9543-8E28A4E18C4C/dxwebsetup.exe -- 2.30.2