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

ide, umk: Makefile generation improvements

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14297 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-04-12 09:57:39 +00:00
parent a3b2958c6a
commit ff2a2b443b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -305,7 +305,7 @@ void MakeBuild::SaveMakeFile(const String& fn, bool exporting)
inclist << " -I" << includes[i];
inclist << " -I./";
inclist << " -I" << uppout; // build_info.h is created there
inclist << " -I$(UPPOUT)"; // build_info.h is created there
makefile << "\n"
"UPPOUT = " << (exporting ? "_out/" : GetMakePath(AdjustMakePath(host->GetHostPath(AppendFileName(uppout, ""))), win32)) << "\n"
@ -346,7 +346,7 @@ void MakeBuild::SaveMakeFile(const String& fn, bool exporting)
output = "./" + wspc[0];
StringStream ss;
String svn_info;
String build_info = '\"' + uppout + "/build_info.h\"";
String build_info = "\"$(UPPOUT)/build_info.h\"";
if(makefile_svn_revision) {
Vector<String> bi = SvnInfo(wspc[i]);
for(int i = 0; i < bi.GetCount(); i++)
@ -391,8 +391,8 @@ void MakeBuild::SaveMakeFile(const String& fn, bool exporting)
<< rules
<< ".PHONY: clean\n"
<< "clean:\n"
<< "\tif [ -d \"$(UPPOUT)\" ]; then rm -rf \"$(UPPOUT)\" ; fi\n"
<< "\tif [ -f build_info.h ]; then rm -f build_info.h ; fi\n";
<< "\tif [ \"$(UPPOUT)\" != \"\" -a \"$(UPPOUT)\" != \"/\" -a -d \"$(UPPOUT)\" ] ; then rm -fr \"$(UPPOUT)\" ; fi\n"
;
bool sv = ::SaveFile(fn, makefile);
if(!exporting) {