diff --git a/.gitignore b/.gitignore index f3cdbd5e4f9ccfc7306e63c5866b594d0ecee657..82e8a6444615fa4c440ef7a8886cb33c736dcfbc 100644 --- a/.gitignore +++ b/.gitignore @@ -80,6 +80,7 @@ doc/internals/ltxpng *.mexa64 *.mexw32 *.mexw64 +*.mexmaca64 *.mexmaci *.mexmaci64 /mex/matlab/ diff --git a/macOS/distribution_template.xml b/macOS/distribution_template.xml index fa213eb3a1b0626862043ddbebf201f34e4213b0..cc80c9f6ca9203b056748a461c2d9abe2eb8ea1b 100644 --- a/macOS/distribution_template.xml +++ b/macOS/distribution_template.xml @@ -6,7 +6,7 @@ <welcome file="welcome.html" mime-type="text/html" /> <license file="gpl-3.0-standalone.html" mime-type="text/html" /> <pkg-ref id="org.dynare" /> - <options customize="allow" require-scripts="false" hostArchitectures="x86_64" /> + <options customize="allow" require-scripts="false" hostArchitectures="x86_64,arm64" /> <choices-outline> <line choice="org.dynare" /> <line choice="org.dynare.gcc" /> diff --git a/macOS/welcome_template.html b/macOS/welcome_template.html index 43b5295d773128a72e32e2af19b471942b5890fa..900811f688203bc8c547e81db193cc3c1ed2b307 100644 --- a/macOS/welcome_template.html +++ b/macOS/welcome_template.html @@ -10,6 +10,6 @@ <p>Installing GCC will require an active internet connection with the ability to connect to the Apple servers and GitHub. The installation will take anywhere from a few minutes to a half an hour during the <i>Running package scripts</i> phase of Installation. The time it takes depends on your internet speed, the speed of your computer, and whether or not you already have XCode Command Line Tools installed. The progress bar will not advance during this phase. Please be patient.</p> - <p> You can choose not to install GCC by choosing <i>Customize</i> from the <i>Installation Type</i> screen and deselecting <i>GCC compiler</i>. If you already have <tt>GCC_BINARY</tt> installed under <tt>/usr/local</tt>, you can forgo the installation of GCC here as Dynare will find your system compiler when you use <tt>use_dll</tt>.</p> + <p> You can choose not to install GCC by choosing <i>Customize</i> from the <i>Installation Type</i> screen and deselecting <i>GCC compiler</i>. If you already have <tt>GCC_BINARY</tt> installed under either <tt>/opt/homebrew/bin</tt> for Apple Silicon or <tt>/usr/local/bin</tt> for Intel systems, you can forgo the installation of GCC here as Dynare will find your system compiler when you use <tt>use_dll</tt>.</p> </body> </html>