Merge branch 'master' of https://github.com/ClnViewer/Code-Blocks-Android-NDK

Author: ClnViewer

CB-Template/autoinstall/src/CodeBlocks/templates/wizard/ndk_android/exec/android-elf-cleaner32.exe

@@ -38,7 +38,7 @@
 				<ExtraCommands>
 					<Add after="upx.exe -9 ..\cbp2ndk\bin\Release\android-elf-cleaner.exe" />
 					<Add after="C:\__Bin\7Zip\7z a -mx9 -tzip ..\docs\android-elf-cleaner.zip ..\cbp2ndk\bin\Release\android-elf-cleaner.exe" />
-					<Add after="cmd.exe /C copy ..\cbp2ndk\bin\Release\android-elf-cleaner.exe ..\CB-Template\CodeBlocks\templates\wizard\ndk_android\exec\android-elf-cleaner32.exe" />
+					<Add after="cmd.exe /C copy ..\cbp2ndk\bin\Release\android-elf-cleaner.exe ..\CB-Template\autoinstall\src\CodeBlocks\templates\wizard\ndk_android\exec\android-elf-cleaner32.exe" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>

CB-Template/autoinstall/src/CodeBlocks/templates/wizard/ndk_android/exec/cbp2ndk32.exe

@@ -56,7 +56,7 @@
 					<Add after="upx.exe -9 bin\Release\cbp2ndk.exe" />
 					<Add after="C:\__Bin\7Zip\7z a -mx9 -tzip ..\docs\cbp2ndk.zip bin\Release\cbp2ndk.exe" />
 					<Add after="cmd.exe /C copy dist\Test.cbp bin\Release\Test.cbp" />
-					<Add after="cmd.exe /C copy bin\Release\cbp2ndk.exe ..\CB-Template\CodeBlocks\templates\wizard\ndk_android\exec\cbp2ndk32.exe" />
+					<Add after="cmd.exe /C copy bin\Release\cbp2ndk.exe ..\CB-Template\autoinstall\src\CodeBlocks\templates\wizard\ndk_android\exec\cbp2ndk32.exe" />
 					<Add after="cmd.exe /C C:\__Bin\InnoSetup6\Compil32.exe /cc ..\CB-Template\autoinstall\autoinstall.iss" />
 					<Mode after="always" />
 				</ExtraCommands>

android-elf-cleaner/android-elf-cleaner.cbp

@@ -29,7 +29,7 @@
 
 MKFDATA RCDATA "../../CB-Template/Makefile"
 APPDATA RCDATA "../../CB-Template/Application.mk"
-MKFDATACBTEMPLATE RCDATA "../../CB-Template/CodeBlocks/templates/wizard/ndk_android/files/Makefile"
+MKFDATACBTEMPLATE RCDATA "../../CB-Template/autoinstall/src/CodeBlocks/templates/wizard/ndk_android/files/Makefile"
 
 LANGUAGE 0x19, 0x01
 1 VERSIONINFO