diff --git a/doc/manual.xml b/doc/manual.xml index 3568a3f10f2ad6f108278bab2e60464448729eed..231bec91f1a44b2d139915235a2f2a55929fb587 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -112,7 +112,7 @@ Dynare should work on other systems, but some compilation steps are necessary in <para>Some installation instructions for GNU Octave can be found on <ulink url="http://www.dynare.org/DynareWiki/DynareOctave">Dynare Wiki</ulink>.</para> -<para>If you are using MATLAB for Windows, and if you plan to use options <xref linkend="use_dll"/> or <xref linkend="k_order_solver"/>, you will need to install the GNU C++ compiler (g++) on your machine, and configure it with MATLAB (see <ulink url="http://www.dynare.org/DynareWiki/ConfigureMatlabWindowsForMexCompilation">instructions on the Dynare wiki</ulink>). Users of MATLAB under Linux and MacOS, and users of GNU Octave normally need to do nothing, since a working compilation environment is available by default.</para> +<para>If you are using MATLAB for Windows, and if you plan to use options <xref linkend="use_dll"/> (in particular when computing third order approximations with <xref linkend="k_order_solver"/>), you will need to install a C++ compiler on your machine, and configure it with MATLAB: see <ulink url="http://www.dynare.org/DynareWiki/ConfigureMatlabWindowsForMexCompilation">instructions on the Dynare wiki</ulink>. Users of MATLAB under Linux and MacOS, and users of GNU Octave normally need to do nothing, since a working compilation environment is available by default.</para> </sect1> @@ -250,6 +250,8 @@ second step, the program actually runs the computations. Boths steps are trigger <arg><option>onlymacro</option></arg> <arg><option>nolinemacro</option></arg> <arg><option>warn_uninit</option></arg> + <arg><option>cygwin</option></arg> + <arg><option>msvc</option></arg> </cmdsynopsis> </refsynopsisdiv> @@ -315,6 +317,14 @@ These files may be looked at to understand errors reported at the simulation sta <term><option>warn_uninit</option></term> <listitem><para>Display a warning for each variable or parameter which is not initialized. Initialization should be done through <xref linkend="param_init"/> or <xref linkend="load_params_and_steady_state"/> for parameters, or through <xref linkend="initval"/>, <xref linkend="endval"/> or <xref linkend="load_params_and_steady_state"/> for endogenous and exogenous.</para></listitem> </varlistentry> + <varlistentry> + <term><option>cygwin</option></term> + <listitem><para>Tells Dynare that your <trademark class="registered">MATLAB</trademark> is configured for compiling MEX files with Cygwin (see <xref linkend="software-requirements"/>). This option is only available under Windows, and is used in conjunction with <xref linkend="use_dll"/>.</para></listitem> + </varlistentry> + <varlistentry> + <term><option>msvc</option></term> + <listitem><para>Tells Dynare that your <trademark class="registered">MATLAB</trademark> is configured for compiling MEX files with Microsoft Visual C++ (see <xref linkend="software-requirements"/>). This option is only available under Windows, and is used in conjunction with <xref linkend="use_dll"/>.</para></listitem> + </varlistentry> </variablelist> </refsect1>