From 657cb79faceda6aa6c679eacfe7841182f75a1ac Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 26 Dec 2014 16:53:06 +0000
Subject: [PATCH] uppbox: Win32 installation changes

git-svn-id: svn://ultimatepp.org/upp/trunk@8010 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppbox/MakeInstall4/Main.cpp     | 2 +-
 uppbox/WinInstaller2/Install.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/uppbox/MakeInstall4/Main.cpp b/uppbox/MakeInstall4/Main.cpp
index 5e08ddeb9..9a1714856 100644
--- a/uppbox/MakeInstall4/Main.cpp
+++ b/uppbox/MakeInstall4/Main.cpp
@@ -80,7 +80,7 @@ int FilterVersion(int c) { return c == ':' ? '_' : c; }
 void Make(String pkg, String exe, String method = "MSC9")
 {
 	Syx("c:/theide/umk " + ass + " " + pkg + " c:/theide/" + method + ".bm -ar " + upptmp + "/" + exe);
-	FileDelete(upptmp + "/" + exe + ".map");
+	FileDelete(upptmp + "/" + ForceExt(exe, ".map"));
 }
 
 CONSOLE_APP_MAIN
diff --git a/uppbox/WinInstaller2/Install.cpp b/uppbox/WinInstaller2/Install.cpp
index fe4ed0a9d..99ce2d948 100644
--- a/uppbox/WinInstaller2/Install.cpp
+++ b/uppbox/WinInstaller2/Install.cpp
@@ -70,7 +70,6 @@ BOOL CALLBACK Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				SetWinRegString("\"" + exe + "\" \"%1\"", "", "TheIDE.upp\\shell\\open\\command\\", HKEY_CLASSES_ROOT);
 			}
 			pi.Destroy();
-			RDUMP(AppendFileName(h, IsWow64() ? "theide64.exe" : "theide32.exe"));
 			FileMove(AppendFileName(h, IsWow64() ? "theide64.exe" : "theide32.exe"), exe);
 			EndDialog(hwnd, 0);
 			WinExec(exe, SW_SHOWNORMAL);