diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2017-04-06 20:20:04 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2017-04-06 20:20:04 -0700 |
| commit | 77f4395247cc1ff6b5d5d582d0e2f609174028db (patch) | |
| tree | a8214e49c39364934050a530ad8f7db11985d8b0 /Mkfiles | |
| parent | d31a86e5b169d5a1b349b5f9ccd8089e92c14d80 (diff) | |
| download | nasm-77f4395247cc1ff6b5d5d582d0e2f609174028db.tar.gz | |
msvc: finally make it possible to build the full Windows package
Finally make it possible to build the full Windows install package
with MSVC tools.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'Mkfiles')
| -rw-r--r-- | Mkfiles/README | 15 | ||||
| -rw-r--r-- | Mkfiles/msvc.mak | 7 |
2 files changed, 16 insertions, 6 deletions
diff --git a/Mkfiles/README b/Mkfiles/README index 4b310a7a..18d478e4 100644 --- a/Mkfiles/README +++ b/Mkfiles/README @@ -5,12 +5,21 @@ The Makefiles are: Filename Target Compiler Tested with --------------------------------------------------------------------------- - msvc.mak Win32 MS Visual C++ Visual C++ Express 2005 + msvc.mak Win32 MS Visual C++ Visual Visual Studio 2013-2017 For building on a Win32 host using Microsoft Visual C++. - Usage: nmake /f Mkfiles/msvc.mak + Usage: nmake /f Mkfiles\msvc.mak + If the following tools are installed, the full installer package can + be built: + 1. Perl (5.6 or later) + 2. Nullsoft Scriptable Installer System (makensis) + 3. Ghostscript (ps2pdf) or Acrobat Distriller (acrodist) + + These tools need to be in your current path. To build the installer package: + + nmake /f Mkfiles\msvc.mak nsis Filename Target Compiler Tested with --------------------------------------------------------------------------- @@ -20,6 +29,6 @@ The Makefiles are: For building on a DOS, OS/2, Win32 or Linux host using OpenWatcom. OpenWatcom can be downloaded from http://www.openwatcom.org/. - Usage: wmake /f Mkfiles/<filename> <target> + Usage: wmake /f Mkfiles/openwcom.mak <target> <target> is dos, win32, os2, or linux386. diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 19be8be8..ba8b8a84 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -342,10 +342,11 @@ spotless: distclean cleaner strip: -doc: - # cd doc && $(MAKE) all +# Abuse doc/Makefile.in to build nasmdoc.pdf only +docs: + cd doc && $(MAKE) /f Makefile.in srcdir=. top_srcdir=.. PERL=$(PERL) nasmdoc.pdf -everything: all doc rdf +everything: all docs nsis #-- Magic hints to mkdep.pl --# # @object-ending: ".$(O)" |