gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-03 13:21:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changes from Christley. See Sep 25 ChangeLog entry.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1873 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mccallum 1996-10-25 23:54:08 +00:00
parent 9d4d75db0d
commit 7fa5497672
15 changed files with 85 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Admin/example.patch
View file

@ -245,11 +245,10 @@ diff -c libobjects/src/Foundation/objc-load.h:1.6 libobjects/src/Foundation/objc
*** libobjects/src/Foundation/objc-load.h:1.6 Fri Aug 4 13:57:18 1995 *** libobjects/src/Foundation/objc-load.h:1.6 Fri Aug 4 13:57:18 1995
--- libobjects/src/Foundation/objc-load.h Fri Aug 4 13:57:19 1995 --- libobjects/src/Foundation/objc-load.h Fri Aug 4 13:57:19 1995
*************** ***************
*** 3,16 **** *** 3,15 ****
Copyright (C) 1993, Adam Fedor. Copyright (C) 1993, Adam Fedor.
! $Id$
*/ */
#ifndef __objc_load_h_INCLUDE #ifndef __objc_load_h_INCLUDE
@ -260,11 +259,10 @@ diff -c libobjects/src/Foundation/objc-load.h:1.6 libobjects/src/Foundation/objc
extern char *objc_executable_location(); extern char *objc_executable_location();
--- 3,16 ---- --- 3,15 ----
Copyright (C) 1993, Adam Fedor. Copyright (C) 1993, Adam Fedor.
! $Id$
*/ */
#ifndef __objc_load_h_INCLUDE #ifndef __objc_load_h_INCLUDE

48
Headers/gnustep/base/config-win32.h
View file

@ -1,28 +1,50 @@
/* WIN32 extra config stuff */ /* WIN32 extra config stuff */
#define STDC_HEADERS 1
#define HAVE_STRING_H 1
#define HAVE_MEMORY_H 1
#define HAVE_VSPRINTF 1
#define NeXT_cc 0
#define NeXT_runtime 0
// Define OBJC_BOOL so that Win32 does not typedef BOOL differently
#ifndef OBJC_BOOL
#define OBJC_BOOL
#endif
// //
// WIN32 // WIN32
// //
#ifdef WIN32 #ifdef __WIN32__
# include <windows.h> # include <windows.h>
# ifndef vm_page_size # ifndef vm_page_size
# define vm_page_size 4096 # define vm_page_size 4096
# endif # endif
# define popen _popen # define popen _popen
#endif
#include <sys/types.h>
/* WIN32 does not define a gettimeofday() */
int gettimeofday(struct timeval *tvp, struct timezone *tzp);
/* WIN32 does not define a times structure */
#ifndef _TIMES_DEFINED
//typedef long time_t;
struct tms {
time_t tms_utime; /* user time */
time_t tms_stime; /* system time */
time_t tms_cutime; /* user time of children */
time_t tms_cstime; /* system time of children */
};
#define _TIMES_DEFINED
#endif
int times(struct tms *atms);
#define CLOCKS_PER_SEC 1000
#define CLK_TCK CLOCKS_PER_SEC
#define BITSPERBYTE 8 #define BITSPERBYTE 8
/* WIN32 extra config stuff */ #endif /* __WIN32__ */
//
// WIN32
//
#ifdef WIN32
# include <windows.h>
# ifndef vm_page_size
# define vm_page_size 4096
# endif
# define popen _popen
#endif

1
Headers/gnustep/base/objc-load.h
View file

@ -3,7 +3,6 @@
Copyright (C) 1993, Adam Fedor. Copyright (C) 1993, Adam Fedor.
$Id$
*/ */
#ifndef __objc_load_h_INCLUDE #ifndef __objc_load_h_INCLUDE

5
Source/Makefile.in
View file

@ -670,9 +670,10 @@ clean: mostlyclean
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile
rm -f dynamic-load.h rm -f dynamic-load.h
maintainer-clean: distclean rm -f include/preface.h include/config.h
rm -f TAGS include/preface.h include/config.h
rm -f o_*_bas.m o_*_cbs.m include/o_*_bas.h include/o_*_cbs.h rm -f o_*_bas.m o_*_cbs.m include/o_*_bas.h include/o_*_cbs.h
maintainer-clean: distclean
rm -f TAGS
copy-dist: $(DIST_FILES) copy-dist: $(DIST_FILES)
mkdir ../snap/src mkdir ../snap/src

154
Source/Makefile.sed.nt
View file

@ -2,8 +2,8 @@ s/@configure_input@/ Generated from Makefile.in by configure.bat/
s/@srcdir@/./ s/@srcdir@/./
s/@prefix@/$(MB_DEV)/ s/@prefix@/$(MB_DEV)/
s/@exec_prefix@/$(prefix)/ s/@exec_prefix@/$(prefix)/
s/libdir = $(exec_prefix)\/lib/libdir = $(MB_DEV)\/$(MB_LIB)/ s/libdir = $(exec_prefix)\/lib/libdir = $(exec_prefix)\\$(MB_LIB)/
s/includedir = $(prefix)\/include/includedir = $(MB_DEV)\/$(MB_H)\/$(MB_OS)/ s/includedir = $(prefix)\/include/includedir = $(prefix)\\$(MB_H)\\$(MB_OS)/
s/CC = @CC@ -pipe/CC = gcc -fgnu-runtime/ s/CC = @CC@ -pipe/CC = gcc -fgnu-runtime/
s/@RANLIB@/touch/ s/@RANLIB@/touch/
s/@INSTALL@/cp/ s/@INSTALL@/cp/
@ -19,20 +19,23 @@ s/LEXFLAGS =/LEXFLAGS = -L/
s/EXEEXT =/EXEEXT = .exe/ s/EXEEXT =/EXEEXT = .exe/
s/OEXT = .o/OEXT = .obj/ s/OEXT = .o/OEXT = .obj/
s/LIBEXT = .a/LIBEXT = .lib/ s/LIBEXT = .a/LIBEXT = .lib/
s/@DEFS@/-DSTDC_HEADERS=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_TIMES=1 -DHAVE_VSPRINTF=1 -Dvm_page_size=4096 -D__MS_WIN32__\ s/@DEFS@/-D__MS_WIN32__\
\ \
##################################################################\ ##################################################################\
#\ #\
# NT specifics\ # NT specifics\
#\ #\
WIN32_GCC_INCLUDE = \ WIN32_GCC_INCLUDE = \
INIT_FILE = init_gnustep_base_runtime\ INIT_FILE = gnustep_base_init_runtime\
INIT_FILE_OBJ = $(INIT_FILE)$(OEXT)/ INIT_FILE_OBJ = $(INIT_FILE)$(OEXT)/
s/@DYNAMIC_LINKER@/null/ s/@DYNAMIC_LINKER@/null/
s/@NEXT_INCLUDES@// s/@NEXT_INCLUDES@//
s/@HEADERS_INSTALL@/$(GNU_HEADERS) $(NEXTSTEP_HEADERS) $(GNUSTEP_HEADERS)/ s/@HEADERS_INSTALL@/$(GNU_HEADERS) $(NEXTSTEP_HEADERS) $(GNUSTEP_HEADERS)/
s/@OBJS_INSTALL@/$(GNU_OBJS) $(NEXTSTEP_OBJS) $(GNUSTEP_OBJS)/ s/@OBJS_INSTALL@/$(GNU_OBJS) $(NEXTSTEP_OBJS) $(GNUSTEP_OBJS)/
s/@LIBOBJECTS_SO@// s/@LIBOBJECTS_SO@//
/lex.pl.m: proplist.l proplist.tab.h/,/proplist.l > $@/c\
lex.pl.m: proplist.l proplist.tab.h\
touch lex.pl.m
/lib$(LIBRARY_NAME)$(LIBEXT):/,/$(RANLIB) lib$(LIBRARY_NAME)$(LIBEXT)/c\ /lib$(LIBRARY_NAME)$(LIBEXT):/,/$(RANLIB) lib$(LIBRARY_NAME)$(LIBEXT)/c\
lib$(LIBRARY_NAME)$(LIBEXT): $(HEADERS_INSTALL) $(OBJS_INSTALL) $(INIT_FILE_OBJ)\ lib$(LIBRARY_NAME)$(LIBEXT): $(HEADERS_INSTALL) $(OBJS_INSTALL) $(INIT_FILE_OBJ)\
$(AR) $(ARFLAGS) $(AROUT)lib1$(LIBEXT) $(GNU_OBJS)\ $(AR) $(ARFLAGS) $(AROUT)lib1$(LIBEXT) $(GNU_OBJS)\
@ -80,9 +83,9 @@ GNUSTEP_OBJS = \\\
$(NSVALUE_OFILES) $(NSNUMBER_OFILES) $(NSVALUE_OFILES) $(NSNUMBER_OFILES)
/installdirs:/,/$(includedir)\/Foundation/c\ /installdirs:/,/$(includedir)\/Foundation/c\
installdirs:\ installdirs:\
IF NOT EXIST $(MB_DEV)\\$(MB_H)\\$(MB_OS)\\gnustep mkdir $(MB_DEV)\\$(MB_H)\\$(MB_OS)\\gnustep\ IF NOT EXIST $(includedir)\\gnustep mkdir $(includedir)\\gnustep\
IF NOT EXIST $(MB_DEV)\\$(MB_H)\\$(MB_OS)\\gnustep\\base mkdir $(MB_DEV)\\$(MB_H)\\$(MB_OS)\\gnustep\\base\ IF NOT EXIST $(includedir)\\gnustep\\base mkdir $(includedir)\\gnustep\\base\
IF NOT EXIST $(MB_DEV)\\$(MB_H)\\$(MB_OS)\\objc mkdir $(MB_DEV)\\$(MB_H)\\$(MB_OS)\\objc IF NOT EXIST $(includedir)\\objc mkdir $(includedir)\\objc
/install: installdirs all/,/cd $(includedir)\/objc; rm -f README/c\ /install: installdirs all/,/cd $(includedir)\/objc; rm -f README/c\
$(INIT_FILE_OBJ): $(OBJS_INSTALL)\ $(INIT_FILE_OBJ): $(OBJS_INSTALL)\
nm $(GNU_OBJS) | grep " __GLOBAL_" > tmpinit.c\ nm $(GNU_OBJS) | grep " __GLOBAL_" > tmpinit.c\
@ -92,30 +95,40 @@ $(INIT_FILE_OBJ): $(OBJS_INSTALL)\
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) $(INIT_FILE).c\ $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) $(INIT_FILE).c\
rm tmpinit.c\ rm tmpinit.c\
\ \
uninstall:\
rm -f $(libdir)\/lib$(LIBRARY_NAME)$(LIBEXT)\
rm -f $(libdir)\/lib$(LIBRARY_NAME)-dll$(LIBEXT)\
rm -f $(prefix)\/$(MB_BIN)\/lib$(LIBRARY_NAME).dll\
rm -rf $(includedir)\/gnustep/base\
rm -rf $(includedir)\/Foundation\
for %i in ( ${NEXTSTEP_HEADERS} ) do \\\
rm -f $(includedir)/%i\
\
lib$(LIBRARY_NAME)-dll$(LIBEXT): $(HEADERS_INSTALL) $(OBJS_INSTALL) $(INIT_LIB_OBJ) lib$(LIBRARY_NAME).def\ lib$(LIBRARY_NAME)-dll$(LIBEXT): $(HEADERS_INSTALL) $(OBJS_INSTALL) $(INIT_LIB_OBJ) lib$(LIBRARY_NAME).def\
lib -machine:i386 -def:lib$(LIBRARY_NAME).def \\\ lib -machine:i386 -def:lib$(LIBRARY_NAME).def \\\
lib$(LIBRARY_NAME)$(LIBEXT) \\\ lib$(LIBRARY_NAME)$(LIBEXT) \\\
-out:lib$(LIBRARY_NAME)-dll$(LIBEXT)\ -out:lib$(LIBRARY_NAME)-dll$(LIBEXT)\
\ \
lib$(LIBRARY_NAME).dll: $(HEADERS_INSTALL) $(OBJS_INSTALL) $(INIT_LIB_OBJ) lib$(LIBRARY_NAME)-dll$(LIBEXT) lib$(LIBRARY_NAME)-entry$(OEXT)\ lib$(LIBRARY_NAME).dll: $(HEADERS_INSTALL) $(OBJS_INSTALL) $(INIT_LIB_OBJ) lib$(LIBRARY_NAME)-dll$(LIBEXT) win32-entry$(OEXT)\
link -out:lib$(LIBRARY_NAME).dll $(DLLFLAGS) \\\ link -out:lib$(LIBRARY_NAME).dll $(DLLFLAGS) \\\
lib$(LIBRARY_NAME)-dll.exp \\\ lib$(LIBRARY_NAME)-dll.exp \\\
lib$(LIBRARY_NAME)$(LIBEXT) \\\ lib$(LIBRARY_NAME)$(LIBEXT) \\\
lib$(LIBRARY_NAME)-entry$(OEXT) libgcc.lib libobjc.lib \\\ win32-entry$(OEXT) libgcc.lib libobjc.lib \\\
libcmt.lib oldnames.lib user32.lib kernel32.lib wsock32.lib\ libcmt.lib oldnames.lib user32.lib kernel32.lib wsock32.lib \\\
advapi32.lib\
\ \
lib$(LIBRARY_NAME).def: lib$(LIBRARY_NAME)$(LIBEXT)\ lib$(LIBRARY_NAME).def: lib$(LIBRARY_NAME)$(LIBEXT)\
nm libgnustep-base.lib | grep "g e" | grep ".text" | gawk "{print $$6}" | gawk "{print substr($$1,2,length($$1)-1)}" > libgnustep-base.lst\ nm libgnustep-base.lib | grep "g e" | grep ".text" | gawk "{print $$6}" | gawk "{print substr($$1,2,length($$1)-1)}" > libgnustep-base.lst\
cat libgnustep-base.top libgnustep-base.lst > libgnustep-base.def\ cat win32-def.top libgnustep-base.lst > libgnustep-base.def\
rm libgnustep-base.lst\ rm libgnustep-base.lst\
\ \
lib$(LIBRARY_NAME)-entry$(OEXT): lib$(LIBRARY_NAME)-entry.c\ win32-entry$(OEXT): win32-entry.c\
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_CFLAGS) -o $*$(OEXT) $<\ $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_CFLAGS) -o $*$(OEXT) $<\
\ \
install: installdirs all\ install: installdirs all\
$(INSTALL_DATA) lib$(LIBRARY_NAME)$(LIBEXT) $(libdir)\ $(INSTALL_DATA) lib$(LIBRARY_NAME)$(LIBEXT) $(libdir)\
$(INSTALL_DATA) lib$(LIBRARY_NAME)-dll$(LIBEXT) $(libdir)\ $(INSTALL_DATA) lib$(LIBRARY_NAME)-dll$(LIBEXT) $(libdir)\
$(INSTALL_DATA) lib$(LIBRARY_NAME).dll $(MB_DEV)/$(MB_BIN)\ $(INSTALL_DATA) lib$(LIBRARY_NAME).dll $(prefix)/$(MB_BIN)\
$(INSTALL_DATA) $(srcdir)/gnustep/base/*.h $(includedir)/gnustep/base\ $(INSTALL_DATA) $(srcdir)/gnustep/base/*.h $(includedir)/gnustep/base\
$(INSTALL_DATA) $(srcdir)/objc/*.h $(includedir)/objc\ $(INSTALL_DATA) $(srcdir)/objc/*.h $(includedir)/objc\
$(INSTALL_DATA) include/config.h $(includedir)/gnustep/base/config.h\ $(INSTALL_DATA) include/config.h $(includedir)/gnustep/base/config.h\
@ -124,22 +137,22 @@ install: installdirs all\
for %i in ( ${NEXTSTEP_HEADERS} ) do \\\ for %i in ( ${NEXTSTEP_HEADERS} ) do \\\
rm -f $(includedir)/%i rm -f $(includedir)/%i
/gnustep\/base:/,/ln -s $(srcdir)\/include Foundation/c\ /gnustep\/base:/,/ln -s $(srcdir)\/include Foundation/c\
gnustep/base: FORCE\ gnustep/base: include\/preface.h\
-rm -rf gnustep\ -rm -rf gnustep\
-mkdir gnustep\ -mkdir gnustep\
-mkdir gnustep\\base\ -mkdir gnustep\\base\
cp include/* gnustep/base\ -cp -rf include/* gnustep/base\
# This deletion is necessary, because the CVS repository contains\ # This deletion is necessary, because the CVS repository contains\
# an emtpy `Foundation' directory that used to hold the OpenStep headers.\ # an emtpy `Foundation' directory that used to hold the OpenStep headers.\
Foundation: FORCE\ Foundation: FORCE\
-rm -rf Foundation\ -rm -rf Foundation\
-mkdir Foundation\ -mkdir Foundation\
cp include/* Foundation -cp -rf include/* Foundation
/clean: mostlyclean/,/rm -f dynamic-load.h/c\ /clean: mostlyclean/,/rm -f dynamic-load.h/c\
clean: mostlyclean\ clean: mostlyclean\
rm -f lib$(LIBRARY_NAME)$(LIBEXT) *${OEXT}\ rm -f lib$(LIBRARY_NAME)$(LIBEXT) lib$(LIBRARY_NAME).dll *${OEXT}\
rm -f $(NSVALUE_MFILES) $(NSNUMBER_MFILES)\ rm -f $(NSVALUE_MFILES) $(NSNUMBER_MFILES)\
rm -f init_gnustep_base_runtime.c\ rm -f gnustep_base_init_runtime.*\
rm -f libgnustep-base-dll.*\ rm -f libgnustep-base-dll.*\
rm -f libgnustep-base.def\ rm -f libgnustep-base.def\
distclean: clean\ distclean: clean\
@ -148,108 +161,3 @@ distclean: clean\
rm -rf gnustep\ rm -rf gnustep\
rm -rf Foundation\ rm -rf Foundation\
rm -f dynamic-load.h rm -f dynamic-load.h
s/@configure_input@/ Generated from Makefile.in by configure.bat/
s/@srcdir@/./
s/@prefix@/\/MB\/Headers/
s/@exec_prefix@/$(prefix)/
s/libdir = $(exec_prefix)\/lib/libdir = \/MB\/Libraries/
s/includedir = $(prefix)\/include/includedir = \/MB\/Headers/
s/@CC@/gcc -fgnu-runtime/
s/@RANLIB@/touch/
s/@INSTALL@/cp/
s/@INSTALL_PROGRAM@/$(INSTALL)/
s/@INSTALL_DATA@/$(INSTALL)/
s/AR = ar/AR = lib/
s/ARFLAGS = rc/ARFLAGS = /
s/AROUT =/AROUT = -out:/
s/@LN_S@/cp/
s/CFLAGS = -Wno-implicit -g -O/CFLAGS = -Wno-implicit -O/
s/LEXFLAGS =/LEXFLAGS = -L/
s/EXEEXT =/EXEEXT = .exe/
s/OEXT = .o/OEXT = .obj/
s/LIBEXT = .a/LIBEXT = .lib/
s/@DEFS@/-DSTDC_HEADERS=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_TIMES=1 -DHAVE_VSPRINTF=1 -Dvm_page_size=4096\
\
##################################################################\
#\
# NT specifics\
#\
WIN32_GCC_INCLUDE = \
INIT_FILE = init_libObjects\
INIT_FILE_OBJ = $(INIT_FILE)$(OEXT)/
s/@DYNAMIC_LINKER@/null/
s/@NEXT_INCLUDES@//
s/@HEADERS_INSTALL@/$(GNU_HEADERS) $(NEXTSTEP_HEADERS) $(GNUSTEP_HEADERS)/
s/@OBJS_INSTALL@/$(GNU_OBJS) $(NEXTSTEP_OBJS) $(GNUSTEP_OBJS)/
s/@LIBOBJECTS_SO@//
s/libobjects$(LIBEXT): objects\/stdobjects.h $(OBJS_INSTALL)/libobjects$(LIBEXT): objects\/stdobjects.h $(OBJS_INSTALL) $(INIT_FILE_OBJ)/
s/$(AR) $(ARFLAGS) $(AROUT)libobjects$(LIBEXT) $(OBJS_INSTALL)/$(AR) $(ARFLAGS) $(AROUT)libobjects$(LIBEXT) $(OBJS_INSTALL) $(INIT_FILE_OBJ)/
/NSVALUE_MFILES =/c\
NSVALUE_CLUSTER = 0 1 2 3 4 \
NSVALUE_OFILES = \\\
NSValue0$(OEXT) NSValue1$(OEXT) NSValue2$(OEXT) NSValue3$(OEXT) \\\
NSValue4$(OEXT) \
NSVALUE_MFILES = \\
/NSNUMBER_MFILES =/c\
NSNUMBER_CLUSTER = 0 1 2 3 4 5 6 7 8 9 10 11 12 \
NSNUMBER_OFILES = \\\
NSNumber0$(OEXT) NSNumber1$(OEXT) NSNumber2$(OEXT) \\\
NSNumber3$(OEXT) NSNumber4$(OEXT) NSNumber5$(OEXT) \\\
NSNumber6$(OEXT) NSNumber7$(OEXT) NSNumber8$(OEXT) \\\
NSNumber9$(OEXT) NSNumber10$(OEXT) NSNumber11$(OEXT) \\\
NSNumber12$(OEXT) \
NSNUMBER_MFILES = \\
/$(NSVALUE_MFILES) : NSCTemplateValue.m/,/cat $(srcdir)\/NSConcreteNumber/c\
# Compilation of class clusters \
$(NSVALUE_OFILES) : NSCTemplateValue.m \
for %i in ( ${NSVALUE_CLUSTER} ) do \\\
( cp NSCTemplateValue.m NSCTemplateValue%i.m & \\\
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) \\\
-DTYPE_ORDER=%i NSCTemplateValue%i.m \\\
-o NSValue%i$(OEXT) & \\\
rm -f NSCTemplateValue%i.m ) \
\
$(NSNUMBER_OFILES) : NSConcreteNumber.m \
for %i in ( ${NSNUMBER_CLUSTER} ) do \\\
( cp NSConcreteNumber.m NSConcreteNumber%i.m & \\\
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) \\\
-DTYPE_ORDER=%i -c NSConcreteNumber%i.m \\\
-o NSNumber%i$(OEXT) & \\\
rm -f NSConcreteNumber%i.m )
/GNUSTEP_OBJS =/,/$(NSNUMBER_MFILES:.m=/c\
GNUSTEP_OBJS = \\\
$(GNUSTEP_MFILES:.m=$(OEXT)) \\\
$(GNUSTEP_CFILES:.c=$(OEXT)) \\\
$(NSVALUE_OFILES) $(NSNUMBER_OFILES)
/installdirs:/,/$(includedir)\/Foundation/c\
installdirs:\
IF NOT EXIST \\MB\\Libraries mkdir \\MB\\Libraries\
IF NOT EXIST \\MB\\Headers\\Foundation mkdir \\MB\\Headers\\Foundation\
IF NOT EXIST \\MB\\Headers\\objects mkdir \\MB\\Headers\\objects\
IF NOT EXIST \\MB\\Headers\\objc mkdir \\MB\\Headers\\objc
/install: installdirs all/,/cd $(includedir)\/objc; rm -f README/c\
$(INIT_FILE_OBJ): $(OBJS_INSTALL)\
nm $(GNU_OBJS) | grep " __GLOBAL_" > tmpinit.c\
nm $(GNUSTEP_OBJS) | grep " __GLOBAL_" >> tmpinit.c\
nm $(NEXTSTEP_OBJS) | grep " __GLOBAL_" >> tmpinit.c\
collect tmpinit.c $(INIT_FILE)\
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) $(INIT_FILE).c\
rm tmpinit.c\
\
install: installdirs all\
$(INSTALL_DATA) libobjects$(LIBEXT) $(libdir)\
$(RANLIB) $(libdir)/libobjects$(LIBEXT); \
for %i in ( ${GNUSTEP_HEADERS} ) do \\\
$(INSTALL_DATA) $(srcdir)/%i $(includedir)/%i\
for %i in ( ${GNU_HEADERS} ) do \\\
$(INSTALL_DATA) $(srcdir)/%i $(includedir)/%i\
for %i in ( ${NEXTSTEP_HEADERS} ) do \\\
$(INSTALL_DATA) $(srcdir)/%i $(includedir)/%i\
$(INSTALL_DATA) objects/stdobjects.h $(includedir)/objects\
$(INSTALL_DATA) objects/config.h $(includedir)/objects\
$(INSTALL_DATA) $(srcdir)/objects/README $(includedir)/Foundation\
$(INSTALL_DATA) $(srcdir)/objects/README $(includedir)/objc
/for file in $(NEXTSTEP_HEADERS); do/,/done/c\
for %i in ( ${NEXTSTEP_HEADERS} ) do \\\
rm -f $(includedir)/%i

2
Source/NSUserDefaults.m
View file

@ -29,7 +29,9 @@
#include <libc.h> #include <libc.h>
/* If POSIX then: #include <unistd.h> */ /* If POSIX then: #include <unistd.h> */
#endif /* 0 */ #endif /* 0 */
#ifndef __WIN32__
#include <pwd.h> #include <pwd.h>
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <errno.h> #include <errno.h>

2
Source/NXStringTable.m
View file

@ -23,8 +23,6 @@
/* /*
StringTable - Hash table for strings in the NeXT StringTable style StringTable - Hash table for strings in the NeXT StringTable style
$Id$
TODO: Should I reject duplicate keys on readFromStream? TODO: Should I reject duplicate keys on readFromStream?
the real MAX_STRINGTABLE_LENGTH is in NXStringTable.l, even though the real MAX_STRINGTABLE_LENGTH is in NXStringTable.l, even though
it also appears in StringTable.h it also appears in StringTable.h

12
Source/Time.m
View file

@ -31,9 +31,7 @@
#endif #endif
#if HAVE_TIMES #if HAVE_TIMES
#ifndef __WIN32__
#include <sys/times.h> #include <sys/times.h>
#endif /* !__WIN32__ */
#endif /* HAVE_TIMES */ #endif /* HAVE_TIMES */
/* There are several places where I need to deal with tz more intelligently */ /* There are several places where I need to deal with tz more intelligently */
@ -172,6 +170,13 @@ id monthNames;
#endif #endif
return ((long)((end_tms.tms_utime - start_tms.tms_utime + return ((long)((end_tms.tms_utime - start_tms.tms_utime +
end_tms.tms_stime - start_tms.tms_stime) * 1000) / CLK_TCK); end_tms.tms_stime - start_tms.tms_stime) * 1000) / CLK_TCK);
#elif __WIN32__
DWORD start_tick, end_tick;
start_tick = GetTickCount();
(*aFunc)();
end_tick = GetTickCount();
return ((long)(end_tick - start_tick));
#else #else
struct rusage start_ru, end_ru; struct rusage start_ru, end_ru;
@ -190,6 +195,8 @@ id monthNames;
{ {
#if HAVE_TIMES #if HAVE_TIMES
struct tms start_tms, end_tms; struct tms start_tms, end_tms;
#elif __WIN32__
DWORD start_tick, end_tick;
#else #else
struct rusage start_ru, end_ru; struct rusage start_ru, end_ru;
#endif /* solaris */ #endif /* solaris */
@ -199,6 +206,7 @@ id monthNames;
times(&start_tms); times(&start_tms);
(*aFunc)(); (*aFunc)();
times(&end_tms); times(&end_tms);
#elif __WIN32__
#else #else
getrusage(RUSAGE_SELF, &start_ru); getrusage(RUSAGE_SELF, &start_ru);
(*aFunc)(); (*aFunc)();

1
Source/dld-load.h
View file

@ -12,7 +12,6 @@
to another module whose name is a super-string of the desired to another module whose name is a super-string of the desired
module name. module name.
$Id$
*/ */
#ifndef __dld_load_h_INCLUDE #ifndef __dld_load_h_INCLUDE

1
Source/hpux-load.h
View file

@ -3,7 +3,6 @@
Copyright (C) 1995, Adam Fedor. Copyright (C) 1995, Adam Fedor.
$Id$
*/ */
#ifndef __hpux_load_h_INCLUDE #ifndef __hpux_load_h_INCLUDE

1
Source/null-load.h
View file

@ -3,7 +3,6 @@
Copyright (C) 1995, Adam Fedor. Copyright (C) 1995, Adam Fedor.
$Id$
*/ */
#ifndef __null_load_h_INCLUDE #ifndef __null_load_h_INCLUDE

1
Source/objc/NXStringTable.h
View file

@ -23,7 +23,6 @@
/* /*
StringTable.h - Hash table for strings in the NeXT StringTable style StringTable.h - Hash table for strings in the NeXT StringTable style
$Id$
*/ */
#ifndef __NXStringTable_h_INCLUDE_GNU #ifndef __NXStringTable_h_INCLUDE_GNU

1
Source/simple-load.h
View file

@ -10,7 +10,6 @@
if there are undefined symbols. Later versions (e.g. 5.3) fix this if there are undefined symbols. Later versions (e.g. 5.3) fix this
with RTLD_GLOBAL. with RTLD_GLOBAL.
$Id$
*/ */
#ifndef __sunos_load_h_INCLUDE #ifndef __sunos_load_h_INCLUDE

2
Testing/Makefile.sed.nt
View file

@ -3,7 +3,7 @@ s/@CC@/gcc -fgnu-runtime -D__MS_WIN32__/
s/@DYNAMIC_BUNDLER_LINKER@// s/@DYNAMIC_BUNDLER_LINKER@//
s/@DYNAMIC_LDFLAGS@// s/@DYNAMIC_LDFLAGS@//
s/@DYNAMIC_CFLAGS@// s/@DYNAMIC_CFLAGS@//
s/LIBS = -L..\/src -l$(LIBRARY_NAME) @LIBOBJC@ @LIBS@ -lm/LIBS = ..\/src\/lib$(LIBRARY_NAME).lib libobjc.lib libgcc.lib libc.lib oldnames.lib user32.lib wsock32.lib/ s/LIBS = -L..\/src -l$(LIBRARY_NAME) @LIBOBJC@ @LIBS@ -lm/LIBS = ..\/src\/lib$(LIBRARY_NAME).lib libobjc.lib libgcc.lib libc.lib oldnames.lib user32.lib advapi32.lib wsock32.lib/
s/@NEXT_INCLUDES@// s/@NEXT_INCLUDES@//
s/CFLAGS = -Wall -Wno-implicit -Wno-format -g -O/CFLAGS = -Wall -Wno-implicit -Wno-format -O/ s/CFLAGS = -Wall -Wno-implicit -Wno-format -g -O/CFLAGS = -Wall -Wno-implicit -Wno-format -O/
s/EXEEXT =/EXEEXT = .exe/ s/EXEEXT =/EXEEXT = .exe/

2
configure.bat
View file

@ -53,7 +53,7 @@ touch 12
echo "include subdirectory" echo "include subdirectory"
cd include cd include
rm -f config.h rm -f config.h
sed -f config-win32.sed config.h.in >>config.h cat config.h.in >config.h
cat config-win32.h >>config.h cat config-win32.h >>config.h
cd .. cd ..
cd .. cd ..