From: Steven Abadie <steven@alephobjects.com>
Date: Thu, 6 Nov 2014 23:38:53 +0000 (-0700)
Subject: Fix for windows package.
X-Git-Tag: 14.09-1.18~68
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1fadaff5ce3ed755d514f6381f1ce2b4f4a79c1a;p=cura.git

Fix for windows package.

Fixed the Windows builds by adding two packages that were needed to run Cura Engine. This should be put into Cura Engine but this is working for now. Close #39
---

diff --git a/package.sh b/package.sh
index 6923acc4..dbd88dbe 100755
--- a/package.sh
+++ b/package.sh
@@ -340,6 +340,8 @@ if [ $BUILD_TARGET = "win32" ]; then
 	#mv ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe ${TARGET_DIR}/Cura/
 	#mv ffmpeg-20120927-git-13f0cd6-win32-static/licenses ${TARGET_DIR}/Cura/ffmpeg-licenses/
 	mv Win32/EjectMedia.exe ${TARGET_DIR}/Cura/
+	mv scripts/win32/libgcc_s_dw2-1.dll ${TARGET_DIR}
+	mv scripts/win32/libstdc++-6.dll ${TARGET_DIR}
 	
 	rm -rf Power/
 	rm -rf \$_OUTDIR
diff --git a/scripts/win32/nsisPlugins/libgcc_s_dw2-1.dll b/scripts/win32/nsisPlugins/libgcc_s_dw2-1.dll
new file mode 100644
index 00000000..99a76cf3
Binary files /dev/null and b/scripts/win32/nsisPlugins/libgcc_s_dw2-1.dll differ
diff --git a/scripts/win32/nsisPlugins/libstdc++-6.dll b/scripts/win32/nsisPlugins/libstdc++-6.dll
new file mode 100644
index 00000000..8e17b4c0
Binary files /dev/null and b/scripts/win32/nsisPlugins/libstdc++-6.dll differ