From 8e879ba88acbf2bebd1baef73d4aeb0053b4dc4b Mon Sep 17 00:00:00 2001 From: rylek Date: Mon, 26 Mar 2012 23:40:44 +0000 Subject: [PATCH] .ide: minor fixes related to BRC compilation under VC 2010 git-svn-id: svn://ultimatepp.org/upp/trunk@4721 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Builders/MscBuilder.icpp | 4 ++-- uppsrc/ide/Core/Core.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/uppsrc/ide/Builders/MscBuilder.icpp b/uppsrc/ide/Builders/MscBuilder.icpp index dcf556ead..000449b80 100644 --- a/uppsrc/ide/Builders/MscBuilder.icpp +++ b/uppsrc/ide/Builders/MscBuilder.icpp @@ -300,8 +300,8 @@ bool MscBuilder::BuildPackage(const String& package, Vector& 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)); } diff --git a/uppsrc/ide/Core/Core.cpp b/uppsrc/ide/Core/Core.cpp index 8fe0cbeff..21aa88673 100644 --- a/uppsrc/ide/Core/Core.cpp +++ b/uppsrc/ide/Core/Core.cpp @@ -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"; }