github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-13 06:13:00 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

umk: Fixed possible name collision for output binary

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14301 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-04-13 14:37:59 +00:00
parent 168f0078b0
commit d88fc629cd
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/ide/Builders/MakeFile.cpp
View file

@ -344,6 +344,8 @@ void MakeBuild::SaveMakeFile(const String& fn, bool exporting)
output = wspc[i] + ".out";
else
output = "./" + wspc[0];
while(DirectoryExists(output))
output << ".out";
StringStream ss;
String svn_info;
String build_info = "\"$(UPPOUT)/build_info.h\"";

2
uppsrc/umk/umake.cpp
View file

@ -163,6 +163,7 @@ CONSOLE_APP_MAIN
bool deletedir = true;
int exporting = 0;
String mkf;
for(int i = 3; i < arg.GetCount(); i++)
if(arg[i][0] == '+' || arg[i][0] == '>')
ide.mainconfigparam = Filter(~arg[i] + 1, CommaSpace);
@ -230,6 +231,7 @@ CONSOLE_APP_MAIN
ide.debug.target = ide.release.target = NormalizePath(arg[i]);
PutVerbose("Target override: " << ide.debug.target);
}
if(clean)
ide.Clean();
if(exporting) {