bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cygwin build.

Browse Source
This commit is contained in:
Ianos Gnatiuc 2006-05-14 01:19:58 +00:00
parent 40cd10db65
commit 866e5c2657
13 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ include Config.def
.PHONY: all clean distclean dirs sourcelists deps docs
LIBS=gall gcfg gmb3 glibc uulib smblib msgidlib
LIBS=gall gcfg gmb3 glibc uulib smblib
ifneq ($(findstring GCFG_NO_MYSPELL, $(CPPFLAGS)), GCFG_NO_MYSPELL)
LIBS+=hunspell
endif

12
golded.mak
View File

@ -392,7 +392,7 @@ GOLDNODE_OBJS=$(OBJ_DIR)\goldnode.obj
ALL_OBJS=$(LNK_OBJS) $(GOLDED_OBJS) $(RDDT_OBJS) $(GOLDNODE_OBJS)
CPP_FLAGS=/nologo /c /J /W3 /Gi /EHac /FD /Igolded3 /Igoldlib\gall /Igoldlib\gcfg /Igoldlib\glibc /Igoldlib\gmb3 /Igoldlib\msgidlib /Igoldlib\smblib /Igoldlib\uulib /Igoldlib\hunspell /DWIN32 /D_CONSOLE /DHAVE_CONFIG_H /Fo$(OBJ_DIR)\\ /Fd$(OBJ_DIR)\\
CPP_FLAGS=/nologo /c /J /W3 /Gi /EHac /FD /Igolded3 /Igoldlib\gall /Igoldlib\gcfg /Igoldlib\glibc /Igoldlib\gmb3 /Igoldlib\smblib /Igoldlib\uulib /Igoldlib\hunspell /DWIN32 /D_CONSOLE /DHAVE_CONFIG_H /Fo$(OBJ_DIR)\\ /Fd$(OBJ_DIR)\\
RSC_FLAGS=/igolded3 /fo$(OBJ_DIR)\gedcyg.res
LNK_FLAGS=advapi32.lib winmm.lib user32.lib /nologo /subsystem:console /machine:I386
@ -487,11 +487,6 @@ $(ALL_OBJS):
$(CPP_PROJ) $<
<<
{goldlib\msgidlib}.cpp{$(OBJ_DIR)}.obj:
$(CPP) @<<
$(CPP_PROJ) $<
<<
{goldlib\smblib}.cpp{$(OBJ_DIR)}.obj:
$(CPP) @<<
$(CPP_PROJ) $<
@ -546,11 +541,6 @@ $(ALL_OBJS):
$(CPP_PROJ) $<
<<
{goldlib\msgidlib}.c{$(OBJ_DIR)}.obj:
$(CPP) @<<
$(CPP_PROJ) $<
<<
{goldlib\smblib}.c{$(OBJ_DIR)}.obj:
$(CPP) @<<
$(CPP_PROJ) $<

4
golded3/Makefile
View File

@ -13,11 +13,11 @@ TOP=..
include $(TOP)/Config.def
SHORTTARGET=ged
TARGET=golded3
GLIBS=gmb3 gall gcfg uulib smblib msgidlib
GLIBS=gmb3 gall gcfg uulib smblib
ifneq ($(findstring GCFG_NO_MYSPELL, $(CPPFLAGS)), GCFG_NO_MYSPELL)
GLIBS+=hunspell
endif
INCS=-I. -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/goldlib/gmb3 -I$(TOP)/goldlib/uulib -I$(TOP)/goldlib/smblib -I$(TOP)/goldlib/msgidlib
INCS=-I. -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/goldlib/gmb3 -I$(TOP)/goldlib/uulib -I$(TOP)/goldlib/smblib
ifeq ($(findstring EMX, $(PATH)), EMX)
STDLIBS=-los2me -lstdcpp

3
golded3/geglob.cpp
View File

@ -31,8 +31,6 @@
// ------------------------------------------------------------------
// Various global data
glog LOG;
gareafile* AFILE = NULL;
CfgGed* CFG = NULL;
LangGed* LNG = NULL;
@ -309,4 +307,3 @@ int PlayMacro(gkey key, int type) {
// ------------------------------------------------------------------

1
golded3/golded3.all
View File

@ -63,7 +63,6 @@ gemlst cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be sun
gemnus cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be sun
gemrks cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be sun
gemsgs cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be sun
gemsgid cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be sun
genode cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be sun
geplay cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be sun
gepost cpp all ovl bcd bco bcx djg emx lnx rsx wcn wco wcx cyg be sun

2
goldlib/gall/gfile.cpp
View File

@ -210,7 +210,7 @@ int gfile::Read(void* __ptr, size_t __len)
// ------------------------------------------------------------------
int gfile::Write(void* __ptr, size_t __len)
int gfile::Write(const void* __ptr, size_t __len)
{
int _ret = g_write(fh, __ptr, unsigned(__len));
status = (_ret == -1) ? errno : 0;

2
goldlib/gall/gfile.h
View File

@ -95,7 +95,7 @@ public:
int Close ();
int Read (void* __ptr, size_t __len);
int Write (void* __ptr, size_t __len);
int Write (const void* __ptr, size_t __len);
long Tell ();
long Lseek (long __offset, int __direction);

5
goldlib/gall/glog.cpp
View File

@ -195,4 +195,9 @@ void glog::store() {
}
// ------------------------------------------------------------------
glog LOG;
// ------------------------------------------------------------------

2
goldlib/glibc/glibc.all
View File

@ -1,4 +1,4 @@
regex c all emx cyg
regex cpp all emx cyg
fnmatch c all
glob c all
dummy c all nov bcd bco bcx wcn wco wcx lnx djg rsx be sun

4
goldlib/smblib/smblib.all
View File

@ -1,2 +1,2 @@
lzh c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
smblib c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
lzh cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
smblib cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun

16
goldlib/uulib/uulib.all
View File

@ -1,8 +1,8 @@
fptools c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uucheck c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uuencode c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uulib c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uunconc c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uuscan c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uustring c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uuutil c all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
fptools cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uucheck cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uuencode cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uulib cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uunconc cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uuscan cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uustring cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun
uuutil cpp all ovl bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be sun

11
goldlib/uulib/uulib.cpp
View File

@ -903,11 +903,11 @@ UUDecodeFile (uulist *thefile, char *destname)
if (destname)
strcpy (uugen_fnbuffer, destname);
else {
sprintf (uugen_fnbuffer, "%s%s",
(uusavepath)?uusavepath:"",
UUFNameFilter ((thefile->filename)?
thefile->filename:"unknown.xxx"));
else
{
char unknownfn[] = "unknown.xxx";
sprintf(uugen_fnbuffer, "%s%s", (uusavepath) ? uusavepath : "",
UUFNameFilter(thefile->filename ? thefile->filename : unknownfn));
}
/*
@ -1239,4 +1239,3 @@ UUCleanUp (void)
return UURET_OK;
}