summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpj <rpj>2000-01-05 14:15:36 +0000
committerrpj <rpj>2000-01-05 14:15:36 +0000
commit84c70cdeda9d11c7a58103ed4707eab83f87c768 (patch)
treebb5e3c6abadd1f3270d8e8484138167f1cb2f410
parent05d85f1763459eeb5d6cfc4a2616f5a09e0115ad (diff)
2000-01-06 Ross Johnson <rpj@special.ise.canberra.edu.au>
* Makefile: Remove inconsistencies in 'cl' args - Erik Hensema <erik.hensema@group2000.nl>
-rw-r--r--ChangeLog5
-rw-r--r--Makefile7
-rw-r--r--Makefile.vc7
3 files changed, 9 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index e0d0b3e..4c23493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-06 Ross Johnson <rpj@special.ise.canberra.edu.au>
+
+ * Makefile: Remove inconsistencies in 'cl' args
+ - Erik Hensema <erik.hensema@group2000.nl>
+
2000-01-04 Ross Johnson <rpj@special.ise.canberra.edu.au>
* private.c (_pthread_get_exception_services_code): New; returns
diff --git a/Makefile b/Makefile
index 4b87074..2c91069 100644
--- a/Makefile
+++ b/Makefile
@@ -44,13 +44,10 @@ install: all
copy pthread.lib $(LIBDEST)
pthread.dll: $(OBJ) pthread.def
- cl /LDd /Zi *.obj /Fepthread.dll \
- pthread.def \
- /link /nodefaultlib:libcmt \
- msvcrt.lib
+ cl /LDd /Zi /MD $(OBJ) /Fepthread.dll pthread.def
.c.obj::
- cl /W3 /MT /nologo /Yd /Zi /I. \
+ cl /W3 /MD /nologo /Yd /Zi /I. \
/D_WIN32_WINNT=0x400 \
/DSTDCALL=_stdcall \
-c $<
diff --git a/Makefile.vc b/Makefile.vc
index 4b87074..2c91069 100644
--- a/Makefile.vc
+++ b/Makefile.vc
@@ -44,13 +44,10 @@ install: all
copy pthread.lib $(LIBDEST)
pthread.dll: $(OBJ) pthread.def
- cl /LDd /Zi *.obj /Fepthread.dll \
- pthread.def \
- /link /nodefaultlib:libcmt \
- msvcrt.lib
+ cl /LDd /Zi /MD $(OBJ) /Fepthread.dll pthread.def
.c.obj::
- cl /W3 /MT /nologo /Yd /Zi /I. \
+ cl /W3 /MD /nologo /Yd /Zi /I. \
/D_WIN32_WINNT=0x400 \
/DSTDCALL=_stdcall \
-c $<