diff --git a/Dist/ILMerge.exe b/Dist/ILMerge.exe new file mode 100644 index 0000000000..9667425b39 Binary files /dev/null and b/Dist/ILMerge.exe differ diff --git a/Dist/RunILMerge.bat b/Dist/RunILMerge.bat new file mode 100644 index 0000000000..aa1d2e17d4 --- /dev/null +++ b/Dist/RunILMerge.bat @@ -0,0 +1,2 @@ +@echo please copy "C:\Windows\Microsoft.NET\Framework\v3.0\WPF\PresentationUI.dll" to this directory. Dunno why. +ilmerge /v4 /target:WinExe /out:..\output\EmuHawk.merged.exe ..\output\EmuHawk.exe ..\output\BizHawk.Client.Common.dll ..\output\BizHawk.Common.dll ..\output\BizHawk.Emulation.Common.dll ..\output\BizHawk.Emulation.Cores.dll ..\output\BizHawk.Emulation.DiscSystem.dll "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\PresentationFramework.dll" PresentationUI.dll \ No newline at end of file