From db3ad3895db445e0948a49921b146208e5452b4a Mon Sep 17 00:00:00 2001 From: haru-s Date: Fri, 18 Nov 2022 12:02:29 +0900 Subject: [PATCH 1/3] update win32.mak and win64.mak --- win32.mak | 5 +++-- win64.mak | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/win32.mak b/win32.mak index cd55b5f..eb84076 100644 --- a/win32.mak +++ b/win32.mak @@ -19,8 +19,9 @@ LFLAGS=-L/map/co .d.obj : $(DMD) -c $(DFLAGS) $* -SRC= $S\bitarray.d $S\regexp.d $S\datebase.d $S\date.d $S\dateparse.d \ - $S\cstream.d $S\stream.d $S\socketstream.d $S\doformat.d $S/string.d \ +SRC= $S\bitarray.d $S\cstream.d $S\date.d $S\datebase.d $S\dateparse.d \ + $S\doformat.d $S\metastrings.d $S\regexp.d $S\signals.d \ + $S\socketstream.d $S\stream.d $S\string.d $S\utf.d $S\xml.d \ $S\internal\file.d SOURCE= $(SRC) win32.mak win64.mak posix.mak LICENSE README.md dub.json diff --git a/win64.mak b/win64.mak index 45a1045..7c58a2f 100644 --- a/win64.mak +++ b/win64.mak @@ -19,8 +19,9 @@ LFLAGS=-L/map/co .d.obj : $(DMD) -c $(DFLAGS) $* -SRC= $S\bitarray.d $S\regexp.d $S\datebase.d $S\date.d $S\dateparse.d \ - $S\cstream.d $S\stream.d $S\socketstream.d $S\doformat.d $S/string.d \ +SRC= $S\bitarray.d $S\cstream.d $S\date.d $S\datebase.d $S\dateparse.d \ + $S\doformat.d $S\metastrings.d $S\regexp.d $S\signals.d \ + $S\socketstream.d $S\stream.d $S\string.d $S\utf.d $S\xml.d \ $S\internal\file.d SOURCE= $(SRC) win32.mak win64.mak posix.mak LICENSE README.md dub.json From 0dda21751a8a638fb6b943e0e27254d36a6de773 Mon Sep 17 00:00:00 2001 From: haru-s Date: Fri, 18 Nov 2022 12:13:50 +0900 Subject: [PATCH 2/3] update posix.mak --- posix.mak | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/posix.mak b/posix.mak index b7f23e5..257efa3 100644 --- a/posix.mak +++ b/posix.mak @@ -19,9 +19,10 @@ LFLAGS=-L/map/co .d.obj : $(DMD) -c $(DFLAGS) $* -SRC= $S/bitarray.d $S/regexp.d $S/datebase.d $S/date.d $S/dateparse.d \ - $S/cstream.d $S/stream.d $S/socketstream.d $S/doformat.d $S/string.d \ - $S/internal/file.d +SRC= $S/bitarray.d $S/cstream.d $S/date.d $S/datebase.d $S/dateparse.d \ + $S/doformat.d $S/metastrings.d $S/regexp.d $S/signals.d \ + $S/socketstream.d $S/stream.d $S/string.d $S/utf.d $S/xml.d \ + $S/internal\file.d SOURCE= $(SRC) win32.mak posix.mak LICENSE README.md dub.json From ec39120b3a54ad1390b712167513638a71ef9735 Mon Sep 17 00:00:00 2001 From: haru-s Date: Sat, 3 Dec 2022 18:31:37 +0900 Subject: [PATCH 3/3] Update/Add make files for building undeaD with m32omf, m32mscoff and m64. --- win32.mak | 4 ++-- win32omf.mak | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ win64.mak | 6 +++--- 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 win32omf.mak diff --git a/win32.mak b/win32.mak index eb84076..2c9622b 100644 --- a/win32.mak +++ b/win32.mak @@ -7,11 +7,11 @@ DMD=dmd DEL=del S=src\undead O=obj -B=bin +B=bin32mscoff TARGET=undead -DFLAGS=-g -Isrc/ +DFLAGS=-g -Isrc/ -m32 LFLAGS=-L/map/co #DFLAGS= #LFLAGS= diff --git a/win32omf.mak b/win32omf.mak new file mode 100644 index 0000000..c8206de --- /dev/null +++ b/win32omf.mak @@ -0,0 +1,56 @@ +#_ win32.mak +# Build win32 version of undead +# Needs Digital Mars D compiler to build, available free from: +# http://www.digitalmars.com/d/ + +DMD=dmd +DEL=del +S=src\undead +O=obj +B=bin32omf + +TARGET=undead + +DFLAGS=-g -Isrc/ -m32omf +LFLAGS=-L/map/co +#DFLAGS= +#LFLAGS= + +.d.obj : + $(DMD) -c $(DFLAGS) $* + +SRC= $S\bitarray.d $S\cstream.d $S\date.d $S\datebase.d $S\dateparse.d \ + $S\doformat.d $S\metastrings.d $S\regexp.d $S\signals.d \ + $S\socketstream.d $S\stream.d $S\string.d $S\utf.d $S\xml.d \ + $S\internal\file.d + +SOURCE= $(SRC) win32.mak win64.mak posix.mak LICENSE README.md dub.json + +all: $B\$(TARGET).lib + +################################################# + +$B\$(TARGET).lib : $(SRC) + $(DMD) -lib -of$B\$(TARGET).lib $(SRC) $(DFLAGS) + + +unittest : + $(DMD) -unittest -main -cov -of$O\unittest.exe $(SRC) $(DFLAGS) + $O\unittest.exe + + +clean: + $(DEL) $O\unittest.exe *.lst + + +tolf: + tolf $(SOURCE) + + +detab: + detab $(SRC) + + +zip: detab tolf $(SOURCE) + $(DEL) undead.zip + zip32 undead $(SOURCE) diff --git a/win64.mak b/win64.mak index 7c58a2f..cb62b46 100644 --- a/win64.mak +++ b/win64.mak @@ -1,5 +1,5 @@ -#_ win32.mak -# Build win32 version of undead +#_ win64.mak +# Build win64 version of undead # Needs Digital Mars D compiler to build, available free from: # http://www.digitalmars.com/d/ @@ -7,7 +7,7 @@ DMD=dmd DEL=del S=src\undead O=obj -B=bin +B=bin64 TARGET=undead