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

ide: bm macros replaced by <build_info.h> header

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8030 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-01-10 10:31:02 +00:00
parent b393e9041b
commit bda7dbdc0c
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CodeEditor/EditorBar.cpp
View file

@ -505,8 +505,8 @@ void EditorBar::Annotations(int width)
EditorBar::EditorBar()
{
LineNumbers(false);
editor = NULL;
LineNumbers(false);
bingenabled = true;
hilite_if_endif = true;
line_numbers = false;

22
uppsrc/ide/Builders/CppBuilder.cpp
View file

@ -451,6 +451,7 @@ String CppBuilder::Includes(const char *sep, const String& package, const Packag
String cc;
for(int i = 0; i < include.GetCount(); i++)
cc << sep << GetHostPathQ(include[i]);
cc << sep << GetHostPathQ(outdir);
return cc;
}
@ -459,6 +460,7 @@ String CppBuilder::IncludesShort(const char *sep, const String& package, const P
String cc;
for(int i = 0; i < include.GetCount(); i++)
cc << sep << GetHostPathShortQ(include[i]);
cc << sep << GetHostPathShortQ(outdir);
return cc;
}
@ -467,16 +469,22 @@ String CppBuilder::DefinesTargetTime(const char *sep, const String& package, con
String cc;
for(int i = 0; i < config.GetCount(); i++)
cc << sep << "flag" << config[i];
Time t = GetSysTime();
cc << sep << "bmYEAR=" << (int)t.year;
cc << sep << "bmMONTH=" << (int)t.month;
cc << sep << "bmDAY=" << (int)t.day;
cc << sep << "bmHOUR=" << (int)t.hour;
cc << sep << "bmMINUTE=" << (int)t.minute;
cc << sep << "bmSECOND=" << (int)t.second;
if(main_conf)
cc << sep << "MAIN_CONF";
targettime = GetFileTime(target);
FileOut info(AppendFileName(outdir, "build_info.h"));
Time t = GetSysTime();
info << "#define bmYEAR " << (int)t.year << "\r\n";
info << "#define bmMONTH " << (int)t.month << "\r\n";
info << "#define bmDAY " << (int)t.day << "\r\n";
info << "#define bmHOUR " << (int)t.hour << "\r\n";
info << "#define bmMINUTE " << (int)t.minute << "\r\n";
info << "#define bmSECOND " << (int)t.second << "\r\n";
info << Format("#define bmTIME Time(%d, %d, %d, %d, %d, %d)\r\n",
(int)t.year, (int)t.month, (int)t.day, (int)t.hour, (int)t.minute, (int)t.second);
info << "#define bmMACHINE " << AsCString(GetComputerName()) << "\r\n";
info << "#define bmUSER " << AsCString(GetUserName()) << "\r\n";
return cc;
}