aboutsummaryrefslogtreecommitdiffstats
path: root/Mkfiles
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:52:02 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:52:02 -0700
commitc59337797f2dac6c89c66440f3d30d468adf5bbc (patch)
tree56b3769fce933ffbcf2180124f925465acbd6043 /Mkfiles
parent513e19c8da06745525492b58795d8d8caa545049 (diff)
parent444905e48bc2e4e428064b3ad5ec6d6c5d23d2f1 (diff)
downloadnasm-master.tar.gz
nasm-master.tar.xz
nasm-master.zip
Merge remote-tracking branch 'origin/nasm-2.15.xx'HEADmaster
Resolved Conflicts: version Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'Mkfiles')
-rw-r--r--Mkfiles/msvc.mak2
-rw-r--r--Mkfiles/openwcom.mak2
2 files changed, 2 insertions, 2 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index f004e984..d0272b2b 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -143,7 +143,7 @@ PERLREQ = x86\insnsb.c x86\insnsa.c x86\insnsd.c x86\insnsi.h x86\insnsn.c \
x86\iflag.c x86\iflaggen.h \
macros\macros.c \
asm\pptok.ph asm\directbl.c asm\directiv.h \
- asm\warnings.c include\warnings.h \
+ asm\warnings.c include\warnings.h doc\warnings.src \
version.h version.mac version.mak nsis\version.nsh
INSDEP = x86\insns.dat x86\insns.pl x86\insns-iflags.ph x86\iflags.ph
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 82ce05ac..73e0d1bc 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -156,7 +156,7 @@ PERLREQ = x86\insnsb.c x86\insnsa.c x86\insnsd.c x86\insnsi.h x86\insnsn.c &
x86\iflag.c x86\iflaggen.h &
macros\macros.c &
asm\pptok.ph asm\directbl.c asm\directiv.h &
- asm\warnings.c include\warnings.h &
+ asm\warnings.c include\warnings.h doc\warnings.src &
version.h version.mac version.mak nsis\version.nsh
INSDEP = x86\insns.dat x86\insns.pl x86\insns-iflags.ph x86\iflags.ph