diff options
author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-27 15:36:59 -0700 |
---|---|---|
committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-27 15:36:59 -0700 |
commit | 513e19c8da06745525492b58795d8d8caa545049 (patch) | |
tree | da6c947aa0aff1a4fd00ee538e14d64e827166f3 /Mkfiles/msvc.mak | |
parent | f53966af8b81d7ef11f46f084a4f91e9faa55914 (diff) | |
parent | a825b33423d5046dfc4c0992c3ebfea5b8a531c4 (diff) | |
download | nasm-513e19c8da06745525492b58795d8d8caa545049.tar.gz |
Merge tag 'nasm-2.15'
NASM 2.15
Resolved Conflicts:
version
Diffstat (limited to 'Mkfiles/msvc.mak')
-rw-r--r-- | Mkfiles/msvc.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 09bb42fe..f004e984 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -87,7 +87,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ x86\disp8.$(O) x86\iflag.$(O) \ \ asm\error.$(O) asm\warnings.$(O) \ - asm\float.$(O) \ + asm\floats.$(O) \ asm\directiv.$(O) asm\directbl.$(O) \ asm\pragma.$(O) \ asm\assemble.$(O) asm\labels.$(O) asm\parser.$(O) \ |