Fix build script

diff --git a/BuildArc.cmd b/BuildArc.cmd
index ffaa2cd..ae951f6 100644 (file)
--- a/BuildArc.cmd
+++ b/BuildArc.cmd
@@ -60,7 +60,7 @@ copy Build\Manual\htmlhelp\WinMerge_ja.chm "%DISTDIR%\2.14-x64-zip-version\WinMe
 rem Excecutables
 copy Build\MergeUnicodeRelease\WinMergeU.exe "%DISTDIR%\2.14-zip-version\WinMerge\"
 copy Build\X64\MergeUnicodeRelease\WinMergeU.exe "%DISTDIR%\2.14-x64-zip-version\WinMerge\"
-copy Plugins\WinMerge32BitPluginProxy\Release\WinMerge32BitPluginProxy.exe "%DISTDIR%\2.14-x64-zip-version\WinMerge\
+copy Plugins\WinMerge32BitPluginProxy\Release\WinMerge32BitPluginProxy.exe "%DISTDIR%\2.14-x64-zip-version\WinMerge\"
 
 rem ShellExtension
 copy "Build\ShellExtensionUnicode Release mindependency\ShellExtensionU.dll" "%DISTDIR%\2.14-zip-version\WinMerge\"
@@ -123,12 +123,14 @@ copy Externals\WinIMerge\GPL.txt "%DISTDIR%\2.14-zip-version\WinMerge\WinIMerge\
 copy Externals\WinIMerge\freeimage-license-gplv2.txt "%DISTDIR%\2.14-zip-version\WinMerge\WinIMerge\"
 rem copy Externals\WinIMerge\Build\Release\WinIMerge.exe "%DISTDIR%\2.14-zip-version\WinMerge\WinIMerge\"
 copy Externals\WinIMerge\Build\Release\WinIMergeLib.dll "%DISTDIR%\2.14-zip-version\WinMerge\WinIMerge\"
-copy "%VS140COMNTOOLS%\..\..\VC\redist\x86\Microsoft.VC140.OpenMP\vcomp140.dll" "%DISTDIR%\2.14-zip-version\WinMerge\
+copy "%VS120COMNTOOLS%\..\..\VC\redist\x86\Microsoft.VC120.OpenMP\vcomp120.dll" "%DISTDIR%\2.14-zip-version\WinMerge\"
+copy "%VS140COMNTOOLS%\..\..\VC\redist\x86\Microsoft.VC140.OpenMP\vcomp140.dll" "%DISTDIR%\2.14-zip-version\WinMerge\"
 copy Externals\WinIMerge\GPL.txt "%DISTDIR%\2.14-x64-zip-version\WinMerge\WinIMerge\"
 copy Externals\WinIMerge\freeimage-license-gplv2.txt "%DISTDIR%\2.14-x64-zip-version\WinMerge\WinIMerge\"
 rem copy Externals\WinIMerge\Build\x64\Release\WinIMerge.exe "%DISTDIR%\2.14-x64-zip-version\WinMerge\WinIMerge\"
 copy Externals\WinIMerge\Build\x64\Release\WinIMergeLib.dll "%DISTDIR%\2.14-x64-zip-version\WinMerge\WinIMerge\"
-copy "%VS140COMNTOOLS%\..\..\VC\redist\x64\Microsoft.VC140.OpenMP\vcomp140.dll" "%DISTDIR%\2.14-x64-zip-version\WinMerge\
+copy "%VS120COMNTOOLS%\..\..\VC\redist\x64\Microsoft.VC120.OpenMP\vcomp120.dll" "%DISTDIR%\2.14-x64-zip-version\WinMerge\"
+copy "%VS140COMNTOOLS%\..\..\VC\redist\x64\Microsoft.VC140.OpenMP\vcomp140.dll" "%DISTDIR%\2.14-x64-zip-version\WinMerge\"
 
 rem Patch
 xcopy /s/y "C:\Program Files\WinMerge\GnuWin32" "%DISTDIR%\2.14-zip-version\WinMerge\GnuWin32\"

diff --git a/Externals/freeimage b/Externals/freeimage
new file mode 160000 (submodule)
index 0000000..23daa91
--- /dev/null
+++ b/Externals/freeimage
@@ -0,0 +1 @@
+Subproject commit 23daa91828b87eed53f0833e69a083461161219c

diff --git a/Externals/frhed b/Externals/frhed
new file mode 160000 (submodule)
index 0000000..43fbdca
--- /dev/null
+++ b/Externals/frhed
@@ -0,0 +1 @@
+Subproject commit 43fbdcab35ad9a1c84292452206081f6cb77fe2d

diff --git a/Externals/patch b/Externals/patch
new file mode 160000 (submodule)
index 0000000..b0a7238
--- /dev/null
+++ b/Externals/patch
@@ -0,0 +1 @@
+Subproject commit b0a7238b3786944b5e7c44a6cedf661c6efff5eb

diff --git a/Externals/sevenzip b/Externals/sevenzip
new file mode 160000 (submodule)
index 0000000..39183f2
--- /dev/null
+++ b/Externals/sevenzip
@@ -0,0 +1 @@
+Subproject commit 39183f27c6359af46e4c511710569fc08b6c187c

diff --git a/Externals/winimerge b/Externals/winimerge
new file mode 160000 (submodule)
index 0000000..d588b67
--- /dev/null
+++ b/Externals/winimerge
@@ -0,0 +1 @@
+Subproject commit d588b6726a7f40f7aba6eed21886945f75887449