From f93da8556847412bd022cb8cc115fbce0befd0e1 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 28 Oct 2015 13:04:11 +0000 Subject: [PATCH] uppbox: Win32 install improvements git-svn-id: svn://ultimatepp.org/upp/trunk@9101 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppbox/MakeInstall5/Main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/uppbox/MakeInstall5/Main.cpp b/uppbox/MakeInstall5/Main.cpp index 520652c96..607ea5eca 100644 --- a/uppbox/MakeInstall5/Main.cpp +++ b/uppbox/MakeInstall5/Main.cpp @@ -94,7 +94,6 @@ CONSOLE_APP_MAIN CopyFolder(bin, upptmp, false); CopyFolder(bin + "/win32", upptmp + "/bin"); - CopyFolder(upp + "/uppbox/win32-files", upptmp); CopyFolders(uppsrc, ass, uppsrc + "/packages"); CopyFolders(uppsrc, ass, uppsrc + "/packages1", false); @@ -110,6 +109,9 @@ CONSOLE_APP_MAIN SaveFile("license.chk", "1"); - Syx("7z a u:/upload/upp-win32-" + Filter(version, FilterVersion) + ".7z" + Syx("7z a u:/upload/upp-mingw-" + Filter(version, FilterVersion) + ".7z" + " " + upptmp + " -r -mx -m0fb=255 -mf=off"); + DeleteFolderDeep(upptmp + "/bin/tdm64"); + Syx("7z a u:/upload/upp-win-" + Filter(version, FilterVersion) + ".7z" " " + upptmp + " -r -mx -m0fb=255 -mf=off"); }