Skip to content

Commit 86cd64c

Browse files
committed
Select compiler to use. Update README
1 parent 0364228 commit 86cd64c

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Oolite MSYS2 MinGW64 Environment
22

3-
Creates MSYS2 MinGW64 packages of dependencies that Oolite needs
3+
Creates MSYS2 MinGW64 packages of dependencies that Oolite needs including both clang and gcc versions for the GNUStep libraries.
44

5-
You can also create an environment locally, building all dependencies, as follows:
5+
You can also create an environment locally, building all dependencies from source, as follows:
66

7-
Double click Run Me. You will be prompted for an install location. If you type c:, MSYS2 will be installed in c:\msys64. Then Oolite's dependencies will be installed followed by Oolite itself. A gcc build is created by default.
7+
Double click Run Me. You will be prompted for an install location. If you type c:, MSYS2 will be installed in c:\msys64. You will then be prompted for the compiler to use. Type gcc or clang as desired. Then Oolite's dependencies will be built from source followed by Oolite itself.
88

99
Once completed, you can type the following in the shell:
1010

1111
cd oolite/oolite.app
1212
./oolite.exe
13-
14-
By default, install.sh is run with parameter gcc by setup.cmd (which is started by Run Me). install.sh can be run with parameter clang for a clang build. The GitHub Action passes no parameters which creates a clang build followed by a gcc build.
13+
14+
Run Me is a shortcut which runs setup.cmd. setup.cmd installs MSYS2. It passes parameter gcc or clang to install.sh. install.sh builds Oolite's dependencies from source and then Oolite. The GitHub Action passes no parameters which creates a clang build followed by a gcc build of Oolite.

setup.cmd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ echo Running in: %CD%
88
:: Prompt the user for a path
99
set /p INSTALL_PATH=Enter the installation path:
1010

11+
:: Prompt the user for whether to install gcc or clang
12+
set /p GCC_OR_CLANG=Enter compiler to use - gcc or clang:
13+
1114
:: Where to download installer
1215
set MSYS2_URL=https://github.com/msys2/msys2-installer/releases/latest/download/msys2-base-x86_64-latest.sfx.exe
1316
set INSTALLER=%TEMP%\msys2-base.sfx.exe
@@ -30,6 +33,6 @@ set MSYS2_ROOT=%INSTALL_PATH%\msys64
3033
%MSYS2_ROOT%\usr\bin\bash -lc "pacman -Syu --noconfirm"
3134

3235
echo === Launch MinGW64 shell, build Oolite dependencies install Oolite ===
33-
%MSYS2_ROOT%\msys2_shell.cmd -mingw64 -defterm -here -no-start -c "./install.sh gcc; exec bash"
36+
%MSYS2_ROOT%\msys2_shell.cmd -mingw64 -defterm -here -no-start -c "./install.sh %GCC_OR_CLANG%; exec bash"
3437

3538
endlocal

0 commit comments

Comments
 (0)