From 57f9f0b4e421d72d2f7d2eea073d2bb40be47fb8 Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 26 Dec 2014 15:07:27 +0000 Subject: [PATCH] uppbox: WinInstaller2 git-svn-id: svn://ultimatepp.org/upp/trunk@8009 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppbox/MakeInstall4/Main.cpp | 1 + uppbox/WinInstaller2/Install.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/uppbox/MakeInstall4/Main.cpp b/uppbox/MakeInstall4/Main.cpp index 8d8a42b51..5e08ddeb9 100644 --- a/uppbox/MakeInstall4/Main.cpp +++ b/uppbox/MakeInstall4/Main.cpp @@ -80,6 +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"); } CONSOLE_APP_MAIN diff --git a/uppbox/WinInstaller2/Install.cpp b/uppbox/WinInstaller2/Install.cpp index 99ce2d948..fe4ed0a9d 100644 --- a/uppbox/WinInstaller2/Install.cpp +++ b/uppbox/WinInstaller2/Install.cpp @@ -70,6 +70,7 @@ 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);