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

.ide: minor fixes related to BRC compilation under VC 2010

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4721 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
rylek 2012-03-26 23:40:44 +00:00
parent c7f32f7d49
commit 8e879ba88a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/ide/Builders/MscBuilder.icpp
View file

@ -300,8 +300,8 @@ bool MscBuilder::BuildPackage(const String& package, Vector<String>& linkfile, S
SaveFile(tmpfile, fo);
int slot = AllocSlot();
StringBuffer cmdline;
cmdline << cc << " -Tc " << PdbPch(package, slot, false)
<< " " << GetHostPathQ(tmpfile) << " -Fo" << GetHostPath(objfile);
cmdline << cc << PdbPch(package, slot, false)
<< " -Tc " << GetHostPathQ(tmpfile) << " -Fo" << GetHostPathQ(objfile);
if(slot < 0 || !Run(String(cmdline), slot, GetHostPath(objfile), 1))
throw Exc(NFormat("Error compiling binary object '%s'.", objfile));
}

8
uppsrc/ide/Core/Core.cpp
View file

@ -425,7 +425,7 @@ String BrcToC(CParser& binscript, String basedir)
for(int i = 0; i < blockref.GetCount(); i++)
if(blockref[i]) {
BinObjInfo::Block& b = *blockref[i];
fo << "static char " << ident << "_" << i << "[] = {\n";
fo << "static unsigned char " << ident << "_" << i << "[] = {\n";
String data = ::LoadFile(b.file);
if(data.IsVoid())
throw Exc(NFormat("Error reading file '%s'", b.file));
@ -448,7 +448,7 @@ String BrcToC(CParser& binscript, String basedir)
for(int i = 0; i < blockref.GetCount(); i++)
fo << '\t' << (blockref[i] ? blockref[i]->length : -1) << ",\n";
fo << "};\n\n"
"char *" << ident << "[] = {\n";
"unsigned char *" << ident << "[] = {\n";
for(int i = 0; i < blockref.GetCount(); i++)
if(blockref[i])
fo << '\t' << ident << '_' << i << ",\n";
@ -464,7 +464,7 @@ String BrcToC(CParser& binscript, String basedir)
}
else {
BinObjInfo::Block& b = belem[0];
fo << "static char " << ident << "_[] = {\n";
fo << "static unsigned char " << ident << "_[] = {\n";
String data = ::LoadFile(b.file);
if(data.IsVoid())
throw Exc(NFormat("Error reading file '%s'", b.file));
@ -479,7 +479,7 @@ String BrcToC(CParser& binscript, String basedir)
data.Cat('\0');
WriteByteArray(fo, data);
fo << "\n};\n\n"
"char *" << ident << " = " << ident << "_;\n\n"
<< "unsigned char *" << ident << " = " << ident << "_;\n\n"
// fo << AsCString(data, 70) << ";\n\n"
"int " << ident << "_length = " << b_length << ";\n\n";
}