diff -ruN --exclude='*.org' --exclude=povray.ini --exclude=conf.h --exclude=povray.exe ../povray-3.50b/src/Makefile.in ./src/Makefile.in --- ../povray-3.50b/src/Makefile.in 2002-08-08 21:51:22.000000000 +0900 +++ ./src/Makefile.in 2002-08-18 11:06:06.000000000 +0900 @@ -92,15 +92,15 @@ DEFS = -DPREFIX=\"$(prefix)\" -DPOV_LIB_DIR=\"@datadir@/povray-3.5\" -DCOMPILER_VER=\".Linux.$(CC)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DUSE_IO_RESTRICTIONS=\"$(ac_use_io_restrictions)\" NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi ` LDADD = @X_LIBS@ -CXXFLAGS = $(NOMULTICHAR) -O3 -LDFLAGS = @X_CFLAGS@ +CXXFLAGS = $(NOMULTICHAR) -O3 @X_CFLAGS@ +LDFLAGS = @X_LIBS@ EXTRA_DIST = xpovicon.xbm xpovmask.xbm xpovicon.xpm mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = conf.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ @X_CFLAGS@ LIBS = @LIBS@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ diff -ruN --exclude='*.org' --exclude=povray.ini --exclude=conf.h --exclude=povray.exe ../povray-3.50b/src/optout.h ./src/optout.h --- ../povray-3.50b/src/optout.h 2002-08-08 22:00:48.000000000 +0900 +++ ./src/optout.h 2002-08-10 02:57:22.000000000 +0900 @@ -46,8 +46,9 @@ #define OFFICIAL_VERSION_NUMBER 350 #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:" -#error You must complete the following DISTRIBUTION_MESSAGE macro -#define DISTRIBUTION_MESSAGE_2 " FILL IN NAME HERE........................." +/*#error You must complete the following DISTRIBUTION_MESSAGE macro*/ +/*#define DISTRIBUTION_MESSAGE_2 " FILL IN NAME HERE........................."*/ +#define DISTRIBUTION_MESSAGE_2 " CYGWIN_NT-5.1 SUSANOO 1.3.12(0.54/3/2) 2002-07-06 02:16 i686 unknown" #define DISTRIBUTION_MESSAGE_3 " The POV-Ray Team(tm) is not responsible for supporting this version." /* Number of help pages (numbered 0 to MAX_HELP_PAGE). */ diff -ruN --exclude='*.org' --exclude=povray.ini --exclude=conf.h --exclude=povray.exe ../povray-3.50b/src/unix.cpp ./src/unix.cpp --- ../povray-3.50b/src/unix.cpp 2002-08-07 22:14:40.000000000 +0900 +++ ./src/unix.cpp 2002-08-18 10:44:08.000000000 +0900 @@ -99,7 +99,61 @@ #include #include #include -#include /* For basename(). This one may be a bit dodgy... */ +/*#include */ /* For basename(). This one may be a bit dodgy... */ +#ifndef MAXPATHLEN +# define MAXPATHLEN 256 +#endif + +char *dirname(char *path) +{ + char tmp[MAXPATHLEN+1], *ptr; + static char ret[MAXPATHLEN+1]; + + if (path == NULL) + return "."; + if (strlen(path) == 0) + return "."; + if (strcmp(path,"/") == 0) + return "/"; + if (strcmp(path,".") == 0 || strcmp(path,"./") == 0) + return "."; + if (strcmp(path,"..") == 0 || strcmp(path,"../") == 0) + return "."; + strncpy(tmp, path, MAXPATHLEN); + tmp[MAXPATHLEN] = '\0'; + if (tmp[strlen(tmp)-1] == '/') + tmp[strlen(tmp)-1] = '\0'; + if ((ptr=strrchr(tmp, '/')) == NULL) + return "."; + *ptr = '\0'; + strcpy(ret, tmp); + if (strcmp(ret, "") == 0) + return "/"; + return ret; +} +char *basename(char *path) +{ + char tmp[MAXPATHLEN+1], *ptr; + static char ret[MAXPATHLEN+1]; + + if (path == NULL) + return "."; + if (strlen(path) == 0) + return ""; + if (strcmp(path,"/") == 0) + return "/"; + strncpy(tmp, path, MAXPATHLEN); + tmp[MAXPATHLEN] = '\0'; + if (tmp[strlen(tmp)-1] == '/') + tmp[strlen(tmp)-1] = '\0'; + if ((ptr=strrchr(tmp, '/')) == NULL) { + strcpy(ret, tmp); + return ret; + } + ptr++; + strcpy(ret, ptr); + return ret; +} /* if X libs are present... */