Fixed mingw build and some warnings.

This commit is contained in:
Ianos Gnatiuc 2007-01-14 00:52:46 +00:00
parent ad0c7c4edf
commit 7a7919d549
5 changed files with 38 additions and 9 deletions

View File

@ -1078,7 +1078,7 @@ char* MapPath(char* map, bool reverse)
std::vector< std::pair<std::string, std::string> >::iterator i = CFG->mappath.begin();
std::vector< std::pair<std::string, std::string> >::iterator end = CFG->mappath.end();
for (i; i != end; i++)
for (; i != end; i++)
{
const char* p = reverse ? i->second.c_str() : i->first.c_str();
const char* q = reverse ? i->first.c_str() : i->second.c_str();
@ -1139,4 +1139,3 @@ const char* AreaCfg::setautoid(const char* _echoid) {
// ------------------------------------------------------------------

View File

@ -471,7 +471,7 @@ int InstallFinish()
aa.setpath(buf);
aa.attr = CFG->attribsnet;
AL.AddNewArea(&aa);
fp.Printf("AREADEF %s \"%s\" 0 Net %s %s\n", aa.desc, aa.echoid, aa.basetype, buf);
fp.Printf("AREADEF %s \"%s\" 0 Net %s %s\n", aa.desc, aa.echoid, aa.basetype.c_str(), buf);
if (EnterString("Please enter the path *and* filename of your areas.bbs file:", buf, sizeof(buf)))
return -1;
fp.Printf("AREAFILE AreasBBS %s\n", buf);

View File

@ -664,7 +664,7 @@ void ExternUtilMenu(GMsg* msg)
for (; it != end; it++)
{
char buf[100];
sprintf(buf, " %02d %.59s%s ", it->utilno, it->cmdline, (it->cmdline.length() > 59) ? ">" : "" );
sprintf(buf, " %02d %.59s%s ", it->utilno, it->cmdline.c_str(), (it->cmdline.length() > 59) ? ">" : "" );
Listi.push_back(buf);
}

View File

@ -1,8 +1,23 @@
# -*- makefile -*-
ifeq ($(TERM),cygwin)
MINGW=true
else
ifeq ($(OSTYPE),msys)
MINGW=true
endif
endif
TOP=../..
TARGET=gcfg
INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg
ifdef MINGW
INCS+=-I$(TOP)/goldlib/glibc
else
ifeq ($(findstring EMX, $(PATH)), EMX)
INCS+=-I$(TOP)/goldlib/glibc
endif
endif
include $(TOP)/GNUmakef.inc
include $(TOP)/GNUmakef.lib

View File

@ -1,8 +1,23 @@
# -*- makefile -*-
ifeq ($(TERM),cygwin)
MINGW=true
else
ifeq ($(OSTYPE),msys)
MINGW=true
endif
endif
TOP=../..
TARGET=gmb3
INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/goldlib/gmb3 -I$(TOP)/goldlib/smblib
ifdef MINGW
INCS+=-I$(TOP)/goldlib/glibc
else
ifeq ($(findstring EMX, $(PATH)), EMX)
INCS+=-I$(TOP)/goldlib/glibc
endif
endif
include $(TOP)/GNUmakef.inc
ifeq ($(PLATFORM),emx)