The preprocessor now compiles the MEX when use_dll is specified.

Manually cherry-picked from 096936be9c.
time-shift
Stéphane Adjemian (Charybdis) 2019-02-18 16:13:56 +01:00
parent 3467a47ae3
commit 223c5105f8
Signed by untrusted user who does not match committer: stepan
GPG Key ID: A6D44CB9C64CE77B
2 changed files with 6 additions and 37 deletions

View File

@ -111,34 +111,25 @@ Compiler installation
Prerequisites on Windows Prerequisites on Windows
------------------------ ------------------------
If you are using MATLAB under Windows, install a C++ compiler on your There is no prerequisites on Windows. Dynare now ships a compilation
machine and configure it with MATLAB. There are at least two free environment that can be used with the :opt:`use_dll` option.
compilers you can use. First, there is Microsofts Visual Studio
Community (`https://www.visualstudio.com/`), which has the largest
history of MATLAB support, but requires much space on the
hard-disk. Second, since MATLAB R2015b, MATLAB supports the MinGW-w64
C/C++ Compiler from TDM-GCC. To install this compiler, use the Add-Ons
menu of MATLAB. Search for MinGW or select it from Features.
For older version of MATLAB, in particular before R2014a, it may
sometimes make sense to use the ``gcc`` compiler provided by
Cygwin. However, integrating it in MATLAB can be quite cumbersome and
should be considered as a legacy option. For details, see
`instructions on the Dynare wiki`_.
Prerequisites on Debian GNU/Linux and Ubuntu Prerequisites on Debian GNU/Linux and Ubuntu
-------------------------------------------- --------------------------------------------
Users of MATLAB under Linux need to have a working compilation Users of MATLAB under GNU/Linux need a working compilation
environment installed. If not already present, it can be installed via environment installed. If not already present, it can be installed via
``apt-get install build-essential``. ``apt-get install build-essential``.
Users of Octave under Linux should install the package for MEX file Users of Octave under GNU/Linux should install the package for MEX file
compilation (under Debian or Ubuntu, it is called ``liboctave-dev``). compilation (under Debian or Ubuntu, it is called ``liboctave-dev``).
Prerequisites on macOS Prerequisites on macOS
---------------------- ----------------------
[TO BE UPDATED]
If you are using MATLAB under macOS, you should install the latest If you are using MATLAB under macOS, you should install the latest
version of XCode: `see instructions on the Dynare wiki version of XCode: `see instructions on the Dynare wiki
<https://git.dynare.org/Dynare/dynare/wikis/Install-on-MacOS>`_. <https://git.dynare.org/Dynare/dynare/wikis/Install-on-MacOS>`_.
@ -248,4 +239,3 @@ Dynare unusable.
.. _Ubuntu: http://www.ubuntu.com/ .. _Ubuntu: http://www.ubuntu.com/
.. _Dynare website: https://www.dynare.org/ .. _Dynare website: https://www.dynare.org/
.. _Dynare wiki: https://git.dynare.org/Dynare/dynare/wikis .. _Dynare wiki: https://git.dynare.org/Dynare/dynare/wikis
.. _instructions on the Dynare wiki : http://www.dynare.org/DynareWiki/ConfigureMatlabWindowsForMexCompilation

View File

@ -263,27 +263,6 @@ by the ``dynare`` command.
Prevent Dynare from printing the output of the steps leading up to the Prevent Dynare from printing the output of the steps leading up to the
preprocessor as well as the preprocessor output itself. preprocessor as well as the preprocessor output itself.
.. option:: mingw
Tells Dynare that your MATLAB is configured for compiling MEX
files with the MinGW compiler from TDM-GCC (see
:ref:`compil-install`). This option is only available under
Windows, and is used in conjunction with ``use_dll``.
.. option:: msvc
Tells Dynare that your MATLAB is configured for compiling MEX
files with Microsoft Visual C++ (see
:ref:`compil-install`). This option is only available under
Windows, and is used in conjunction with ``use_dll``.
.. option:: cygwin
Tells Dynare that your MATLAB is configured for compiling MEX
files with Cygwin (see :ref:`compil-install`). This option is
only available under Windows, and is used in conjunction with
``use_dll``.
.. option:: parallel[=CLUSTER_NAME] .. option:: parallel[=CLUSTER_NAME]
Tells Dynare to perform computations in parallel. If Tells Dynare to perform computations in parallel. If