Added the ILMerge tool

sysprogs · sysprogs · commit 920e1f422f2f · 2020-01-08T09:22:46.000-08:00
diff --git a/DebugPackages/ESP8266DebugPackage/_merge.bat b/DebugPackages/ESP8266DebugPackage/_merge.bat
@@ -1 +1 @@
-ilmerge bin\Release\ESPxxDebugPackage.dll bin\Release\OpenOCDPackage2.dll /out:bin\ESPxxDebugPackage.dll /targetplatform:2.0
+..\..\ilmerge bin\Release\ESPxxDebugPackage.dll bin\Release\OpenOCDPackage2.dll /out:bin\ESPxxDebugPackage.dll /targetplatform:2.0
diff --git a/ExtraDeviceSupport/Renesas/RenesasToolchainManager/RenesasToolchainManager.csproj b/ExtraDeviceSupport/Renesas/RenesasToolchainManager/RenesasToolchainManager.csproj
@@ -105,5 +105,5 @@
     <EmbeddedResource Include="..\..\..\DebugPackages\RenesasDebugPackage\bin\$(Configuration)\RenesasDebugPackage.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\BSPEngine.targets" />
+  <Import Project="..\..\..\BSPEngine.targets" />
 </Project>
diff --git a/ExtraDeviceSupport/Renesas/RenesasToolchainManager/_merge.bat b/ExtraDeviceSupport/Renesas/RenesasToolchainManager/_merge.bat
@@ -0,0 +1 @@
+..\..\..\ilmerge bin\Release\RenesasToolchainManager.exe bin\Release\BSPEngine.dll /out:bin\RenesasToolchainManager.exe
diff --git a/ILMerge.exe b/ILMerge.exe

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ilmerge bin\Release\ESPxxDebugPackage.dll bin\Release\OpenOCDPackage2.dll /out:bin\ESPxxDebugPackage.dll /targetplatform:2.0`
	`1`	`+..\..\ilmerge bin\Release\ESPxxDebugPackage.dll bin\Release\OpenOCDPackage2.dll /out:bin\ESPxxDebugPackage.dll /targetplatform:2.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+..\..\..\ilmerge bin\Release\RenesasToolchainManager.exe bin\Release\BSPEngine.dll /out:bin\RenesasToolchainManager.exe`