summaryrefslogtreecommitdiff
path: root/www/advanced-windows-installation.html
diff options
context:
space:
mode:
authorCristy <urban-warrior@imagemagick.org>2015-11-26 09:07:51 -0500
committerCristy <urban-warrior@imagemagick.org>2015-11-26 09:07:51 -0500
commite93be688ef0675db1b53781d10aa90564a2e4ef2 (patch)
treea20d490d16c489eaee72a7e268abe30507ac462e /www/advanced-windows-installation.html
parentde652d97c06704d2ee2ca4250a881914933cfc8d (diff)
downloadImageMagick-e93be688ef0675db1b53781d10aa90564a2e4ef2.tar.gz
Update ImageMagick documentation
Diffstat (limited to 'www/advanced-windows-installation.html')
-rw-r--r--www/advanced-windows-installation.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index 29b9bb98d..9e6612b5d 100644
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -42,7 +42,7 @@
<a class="magick-nav-item " href="../index.html">Home</a>
<a class="magick-nav-item " href="binary-releases.html">Download</a>
<a class="magick-nav-item " href="command-line-tools.html">Tools</a>
- <a class="magick-nav-item " href="command-line-options.html">Options</a>
+ <a class="magick-nav-item " href="command-line-processing.html">Command-line</a>
<a class="magick-nav-item " href="resources.html">Resources</a>
<a class="magick-nav-item " href="api.html">Develop</a>
<a class="magick-nav-item " href="http://nextgen.imagemagick.org/script/search.php">Search</a>
@@ -132,7 +132,7 @@ unzip ImageMagick-windows.zip
<p>The <var>clean</var> step is necessary in order to make sure that all of the target support libraries are updated with any patches needed to get them to compile properly under Visual Studio.</p>
-<p>After a successful build, all of the required files that are needed to run any of the <a href="command-line-tools.html">command line tools</a> are located in the <code>VisualMagick\bin</code> folder. This includes EXE, DLL libraries, and ImageMagick configuration files. You should be able to test the build directly from this directory without having to move anything to any of the global SYSTEM or SYSTEM32 areas in the operating system installation.</p>
+<p>After a successful build, all of the required files that are needed to run any of the <a href="command-line-tools.html">command-line tools</a> are located in the <code>VisualMagick\bin</code> folder. This includes EXE, DLL libraries, and ImageMagick configuration files. You should be able to test the build directly from this directory without having to move anything to any of the global SYSTEM or SYSTEM32 areas in the operating system installation.</p>
<p>The Visual Studio distribution of ImageMagick comes with the Magick++ C++ wrapper by default. This add-on layer has a large number of demo and test files that can be found in <code>ImageMagick\Magick++\demo</code>, and <code>ImageMagick\Magick++\tests</code>. There are also a variety of tests that use the straight C API as well in ImageMagick\tests.</p>
@@ -167,7 +167,7 @@ VisualMagick\Magick++\demo\UTIL_demo_xxx_exe.dsp (for C++)
<p>The choice of what to use as a starting point is very easy.</p>
-<p>For straight C API command line applications use something from:</p>
+<p>For straight C API command-line applications use something from:</p>
<pre>
ImageMagick\tests or
@@ -176,7 +176,7 @@ ImageMagick\VisualMagick\tests or
ImageMagick\Visualmagick\utilities (project - DSP)
</pre>
-<p>For C++ and Magick++ command line applications use something from:</p>
+<p>For C++ and Magick++ command-line applications use something from:</p>
<pre>
ImageMagick\Magick++\tests or ImageMagick\Magick++\demo (source code) or
@@ -208,7 +208,7 @@ ImageMagick\VisualMagick\contrib\win32\MFC\NtMagick (project - DSP)
<p>The <code>bin</code> folder should contains all EXE's and DLL's as well as the very important <code>modules.xml</code> file.</p>
-<p>With this default setup, you can use any of the command line tools and run scripts as normal. You can actually get by quite nicely this way by doing something like <code>pushd e:\xxx\yyy\bin</code> in any scripts you write to execute <var>out of</var> this directory.</p>
+<p>With this default setup, you can use any of the command-line tools and run scripts as normal. You can actually get by quite nicely this way by doing something like <code>pushd e:\xxx\yyy\bin</code> in any scripts you write to execute <var>out of</var> this directory.</p>
<p>By default the core of ImageMagick on Win32 always looks in the place were the exe program is run from in order to find all of the files as well as the DLL's it needs.</p>
@@ -261,9 +261,9 @@ convert image.ext win:
<h2 class="magick-header"><a id="Install"></a>Install</h2>
-<p>You can run ImageMagick command line utilities directly from the <code>VisualMagick\bin</code> folder, however, in most cases you may want the convenience of an installer script. ImageMagick provides <a href="http://www.jrsoftware.org">Inno Setup</a> scripts for this purpose. Note, you must define MAGICKCORE_INSTALLED_SUPPORT at <a href="advanced-windows-installation.html#configure">configure</a> time to utilize the installer scripts.</p>
+<p>You can run ImageMagick command-line utilities directly from the <code>VisualMagick\bin</code> folder, however, in most cases you may want the convenience of an installer script. ImageMagick provides <a href="http://www.jrsoftware.org">Inno Setup</a> scripts for this purpose. Note, you must define MAGICKCORE_INSTALLED_SUPPORT at <a href="advanced-windows-installation.html#configure">configure</a> time to utilize the installer scripts.</p>
-<p>To get started building a self-installing ImageMagick executable, go to <code>VisualMagick\installer</code> folder and click on a script that matches your build environment. Press F9 to build and install ImageMagick. The default location is <code>C:Program Files\ImageMagick-6.?.?\Q?</code>. The exact folder name depends on the ImageMagick version and quantum depth. Once installed, ImageMagick command line utilities and libraries are available to the MS Command Prompt, web scripts, or to meet your development needs.</p>
+<p>To get started building a self-installing ImageMagick executable, go to <code>VisualMagick\installer</code> folder and click on a script that matches your build environment. Press F9 to build and install ImageMagick. The default location is <code>C:Program Files\ImageMagick-6.?.?\Q?</code>. The exact folder name depends on the ImageMagick version and quantum depth. Once installed, ImageMagick command-line utilities and libraries are available to the MS Command Prompt, web scripts, or to meet your development needs.</p>
<h2 class="magick-header"><a id="binary"></a>Create a Self-Installing Binary Distribution</h2>