aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Leake2017-11-03 12:06:07 -0500
committerStephen Leake2017-11-03 12:09:12 -0500
commit94b490529a85ea0844f2e1cf0dc7d2284c2ff2f2 (patch)
tree111c4962b636c5d028439642492e4fd5dacac91a
parentc25113d4ac20ceb2b7697e1df8dd649e01228779 (diff)
downloademacs-94b490529a85ea0844f2e1cf0dc7d2284c2ff2f2.tar.gz
emacs-94b490529a85ea0844f2e1cf0dc7d2284c2ff2f2.zip
* nt/INSTALL.W64: Update to current mingw64 install instructions
-rw-r--r--nt/INSTALL.W6414
1 files changed, 7 insertions, 7 deletions
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index 841660bf0f9..71864ce8c26 100644
--- a/nt/INSTALL.W64
+++ b/nt/INSTALL.W64
@@ -49,13 +49,13 @@ will also be available at the Windows console.
49 49
50** Download and install the necessary packages 50** Download and install the necessary packages
51 51
52Run msys2_shell.bat in your MSYS2 directory and you will see a BASH window 52Run c:/msys64/msys2.exe in your MSYS2 directory and you will see a BASH window
53opened. 53opened.
54 54
55In the BASH prompt, use the following command to install the necessary 55In the BASH prompt, use the following command to install the necessary
56packages (you can copy and paste it into the shell with Shift + Insert): 56packages (you can copy and paste it into the shell with Shift + Insert):
57 57
58 pacman -S base-devel \ 58 pacman -S --needed base-devel \
59 mingw-w64-x86_64-toolchain \ 59 mingw-w64-x86_64-toolchain \
60 mingw-w64-x86_64-xpm-nox \ 60 mingw-w64-x86_64-xpm-nox \
61 mingw-w64-x86_64-libtiff \ 61 mingw-w64-x86_64-libtiff \
@@ -63,7 +63,7 @@ packages (you can copy and paste it into the shell with Shift + Insert):
63 mingw-w64-x86_64-libpng \ 63 mingw-w64-x86_64-libpng \
64 mingw-w64-x86_64-libjpeg-turbo \ 64 mingw-w64-x86_64-libjpeg-turbo \
65 mingw-w64-x86_64-librsvg \ 65 mingw-w64-x86_64-librsvg \
66 mingw-w64-x86_64-liblcms2 \ 66 mingw-w64-x86_64-lcms2 \
67 mingw-w64-x86_64-libxml2 \ 67 mingw-w64-x86_64-libxml2 \
68 mingw-w64-x86_64-gnutls \ 68 mingw-w64-x86_64-gnutls \
69 mingw-w64-x86_64-zlib 69 mingw-w64-x86_64-zlib
@@ -126,10 +126,10 @@ Now you're ready to build and install Emacs with autogen, configure, make,
126and make install. 126and make install.
127 127
128First we need to switch to the MinGW-w64 environment. Exit the MSYS2 BASH 128First we need to switch to the MinGW-w64 environment. Exit the MSYS2 BASH
129console and run mingw64_shell.bat in the C:\msys64 folder, then cd back to 129console and run mingw64.exe in the C:\msys64 folder, then cd back to
130your Emacs source directory, e.g.: 130your Emacs source directory, e.g.:
131 131
132 cd /c/emacs/emacs-25 132 cd /c/emacs/emacs-26
133 133
134** Run autogen 134** Run autogen
135 135
@@ -146,7 +146,7 @@ that the example given here is just a simple one - for more information
146on the options available please see the INSTALL file in this directory. 146on the options available please see the INSTALL file in this directory.
147 147
148The '--prefix' option specifies a location for the resulting binary files, 148The '--prefix' option specifies a location for the resulting binary files,
149which 'make install' will use - in this example we set it to C:\emacs\emacs-25. 149which 'make install' will use - in this example we set it to C:\emacs\emacs-26.
150If a prefix is not specified the files will be put in the standard Unix 150If a prefix is not specified the files will be put in the standard Unix
151directories located in your C:\msys64 directory, but this is not recommended. 151directories located in your C:\msys64 directory, but this is not recommended.
152 152
@@ -154,7 +154,7 @@ Note also that we need to disable Imagemagick because Emacs does not yet
154support it on Windows. 154support it on Windows.
155 155
156 PKG_CONFIG_PATH=/mingw64/lib/pkgconfig \ 156 PKG_CONFIG_PATH=/mingw64/lib/pkgconfig \
157 ./configure --prefix=/c/emacs/emacs-25 --without-imagemagick 157 ./configure --prefix=/c/emacs/emacs-26 --without-imagemagick
158 158
159** Run make 159** Run make
160 160