Skip to content

Commit 2045484

Browse files
authored
Merge pull request #1984 from mccode-dev/pre-3.5.27-doc-touchup
Clearer structure / info
2 parents c4caa03 + 0f5a30a commit 2045484

2 files changed

Lines changed: 16 additions & 8 deletions

File tree

INSTALL-McStas/Windows/README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33

44
* Please use either of:
55
1. **Recommended:**
6-
* Install [Visual Studio including c/c++ support](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170#download-and-install-the-tools) (Any version of Visual Studio itself should do. Please install at minumum "Desktop development with c++" selecting VS2019 build tools. You can also use newer VS2022 build tools, but VS2019 must be present also. Once installed has completed, please use the `mcstas-shell` shortcut on the desktop - issue terminal command `mcgui` to start the McStas GUI. Option 1 *may* function also on arm64 Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++.
7-
* Use the [mcstas-conda](mcstas-conda.bat) batch script to install the latest mcstas from `conda-forge`
6+
* Install [Visual Studio including c/c++ support](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170#download-and-install-the-tools) (Any version of Visual Studio itself should do. Please install at minumum "Desktop development with c++" selecting VS2019 build tools. You can also use newer VS2022 build tools, but VS2019 must be present also.
7+
* Use the [mcstas-conda](mcstas-conda.bat) batch script to install the latest mcstas from `conda-forge`
8+
* Once install has completed, please use the `mcstas-shell` shortcut on the desktop - issue terminal command `mcgui` to start the McStas GUI.
9+
* Option 1 *may* function `arm64` Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++.
810
2. **Legacy:**
9-
* install the legacy-style MinGW based [McStas 3.5.27 metapackage](https://download.mcstas.org/mcstas-3.5.27/Windows/McStas-Metapackage-3.5.27-win64.exe) - now includes MCPL. Option 2 is also functional on `arm64` processors.
11+
* install the legacy-style MinGW based [McStas 3.5.27 metapackage](https://download.mcstas.org/mcstas-3.5.27/Windows/McStas-Metapackage-3.5.27-win64.exe) - now includes MCPL.
12+
* Option 2 should be fully functional on `arm64` processors.
1013
3. **WSL:**
11-
* Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there. Option 3 is also functional on `arm64` processors.
14+
* Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there.
15+
* Option 3 is fully functional on `arm64` processors.
1216

1317
If you are `conda-forge` knowledgable already, you may also simply install a new environment as explained in [conda-forge](../conda/README.md)
1418

INSTALL-McXtrace/Windows/README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33

44
* Please use either of:
55
1. **Recommended:**
6-
* Install [Visual Studio including c/c++ support](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170#download-and-install-the-tools) (Any version of Visual Studio itself should do. Please install at minumum "Desktop development with c++" selecting VS2019 build tools. You can also use newer VS2022 build tools, but VS2019 must be present also. nce installed has completed, please use the `mcxtrace-shell` shortcut on the desktop - issue terminal command `mxgui` to start the McXtrace GUI. Option 1 *may* function also on arm64 Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++.
7-
* Use the [mcxtrace-conda](mcxtrace-conda.bat) batch script to install the latest mcxtrace from `conda-forge`
6+
* Install [Visual Studio including c/c++ support](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170#download-and-install-the-tools) (Any version of Visual Studio itself should do. Please install at minumum "Desktop development with c++" selecting VS2019 build tools. You can also use newer VS2022 build tools, but VS2019 must be present also.
7+
* Use the [mcxtrace-conda](mcxtrace-conda.bat) batch script to install the latest mcxtrace from `conda-forge`
8+
* Once install has completed, please use the `mcxtrace-shell` shortcut on the desktop - issue terminal command `mxgui` to start the McXtrace GUI.
9+
* Option 1 *may* function `arm64` Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++.
810
2. **Legacy:**
9-
* install the legacy-style MinGW based [McXtrace 3.5.27 metapackage](https://download.mcxtrace.org/mcxtrace-3.5.27/Windows/McXtrace-Metapackage-3.5.27-win64.exe) - now includes MCPL. Option 2 is also functional on `arm64` processors.
11+
* install the legacy-style MinGW based [McXtrace 3.5.27 metapackage](https://download.mcxtrace.org/mcxtrace-3.5.27/Windows/McXtrace-Metapackage-3.5.27-win64.exe) - now includes MCPL.
12+
* Option 2 should be fully functional on `arm64` processors.
1013
3. **WSL:**
11-
* Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there. Option 3 is also functional on `arm64` processors.
14+
* Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there.
15+
* Option 3 is fully functional on `arm64` processors.
1216

1317
If you are `conda-forge` knowledgable already, you may also simply install a new environment as explained in [conda-forge](../conda/README.md)
1418

0 commit comments

Comments
 (0)