diff --git a/Makefile b/Makefile index 7bcc4ce..a769769 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/golded.mak b/golded.mak index 41133ee..6fb939b 100644 --- a/golded.mak +++ b/golded.mak @@ -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) $< diff --git a/golded3/Makefile b/golded3/Makefile index b11ea7c..6ba1397 100644 --- a/golded3/Makefile +++ b/golded3/Makefile @@ -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 diff --git a/golded3/geglob.cpp b/golded3/geglob.cpp index a8995af..12a445a 100644 --- a/golded3/geglob.cpp +++ b/golded3/geglob.cpp @@ -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) { // ------------------------------------------------------------------ - diff --git a/golded3/golded3.all b/golded3/golded3.all index 67bd058..262ceb6 100644 --- a/golded3/golded3.all +++ b/golded3/golded3.all @@ -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 diff --git a/goldlib/gall/geall.h b/goldlib/gall/geall.h index f29dde2..82168ce 100644 --- a/goldlib/gall/geall.h +++ b/goldlib/gall/geall.h @@ -962,4 +962,4 @@ const uint TO_ALL = 16; // ------------------------------------------------------------------ -#endif \ No newline at end of file +#endif diff --git a/goldlib/gall/gfile.cpp b/goldlib/gall/gfile.cpp index d39cb9d..403d78b 100644 --- a/goldlib/gall/gfile.cpp +++ b/goldlib/gall/gfile.cpp @@ -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; diff --git a/goldlib/gall/gfile.h b/goldlib/gall/gfile.h index 6c094ea..b5bfc0e 100644 --- a/goldlib/gall/gfile.h +++ b/goldlib/gall/gfile.h @@ -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); diff --git a/goldlib/gall/glog.cpp b/goldlib/gall/glog.cpp index 274e4e9..370a57e 100644 --- a/goldlib/gall/glog.cpp +++ b/goldlib/gall/glog.cpp @@ -195,4 +195,9 @@ void glog::store() { } +// ------------------------------------------------------------------ + +glog LOG; + + // ------------------------------------------------------------------ diff --git a/goldlib/glibc/glibc.all b/goldlib/glibc/glibc.all index 793c16c..35aff42 100644 --- a/goldlib/glibc/glibc.all +++ b/goldlib/glibc/glibc.all @@ -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 diff --git a/goldlib/smblib/smblib.all b/goldlib/smblib/smblib.all index a0cef10..a909d28 100644 --- a/goldlib/smblib/smblib.all +++ b/goldlib/smblib/smblib.all @@ -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 diff --git a/goldlib/uulib/uulib.all b/goldlib/uulib/uulib.all index 88fb3a8..4bbbd4a 100644 --- a/goldlib/uulib/uulib.all +++ b/goldlib/uulib/uulib.all @@ -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 diff --git a/goldlib/uulib/uulib.cpp b/goldlib/uulib/uulib.cpp index f2e58b4..00291e5 100644 --- a/goldlib/uulib/uulib.cpp +++ b/goldlib/uulib/uulib.cpp @@ -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)); } /* @@ -1115,7 +1115,7 @@ UUInfoFile (uulist *thefile, void *opaque, int (*func)(void *, char *)) return UURET_OK; } - + int UUEXPORT UURenameFile (uulist *thefile, char *newname) { @@ -1239,4 +1239,3 @@ UUCleanUp (void) return UURET_OK; } -