diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2017-04-03 11:23:31 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2017-04-03 11:23:31 -0700 |
| commit | 6c48b424665372ddf16886cf2e2f997412c0f3f3 (patch) | |
| tree | 9a047542d1c054dfc72ea25d126eeef11bac86bf /Mkfiles | |
| parent | 14858d7343965c7f33c87fc04ca5253ce0c1a0eb (diff) | |
| download | nasm-6c48b424665372ddf16886cf2e2f997412c0f3f3.tar.gz | |
Mkfiles: harmonize how perl and (if available) makensis is run
Use the same macros to run Perl and makensis across all Makefiles.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'Mkfiles')
| -rw-r--r-- | Mkfiles/msvc.mak | 6 | ||||
| -rw-r--r-- | Mkfiles/openwcom.mak | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 9860d9c9..594509ba 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -39,8 +39,12 @@ INTERNAL_CFLAGS = /I$(srcdir) /I. \ ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS) LDFLAGS = $(LDFLAGS) /SUBSYSTEM:CONSOLE /RELEASE LIBS = + PERL = perl -PERL = $(PERL) -I$(srcdir)/perllib -I$(srcdir) +PERLFLAGS = -I$(srcdir)/perllib -I$(srcdir) +RUNPERL = $(PERL) $(PERLFLAGS) + +MAKENSIS = makensis # Binary suffixes O = obj diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index 24aefd45..f1e2597c 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -22,11 +22,14 @@ LD = *wlink LDEBUG = LDFLAGS = op quiet $(%TARGET_LFLAGS) $(LDEBUG) LIBS = -PERL = perl -RUNPERL = $(PERL) -I$(srcdir)/perllib -I$(srcdir) - STRIP = wstrip +PERL = perl +PERLFLAGS = -I$(srcdir)/perllib -I$(srcdir) +RUNPERL = $(PERL) $(PERLFLAGS) + +MAKENSIS = makensis + # Binary suffixes O = obj X = .exe |