Skip to content

Commit f3c3ea1

Browse files
authored
Merge pull request uniconproject#445 from Jafaral/msys2-doc
add settings for msys2 shells to vscode
2 parents 9079c56 + 25da059 commit f3c3ea1

File tree

2 files changed

+66
-14
lines changed

2 files changed

+66
-14
lines changed

.vscode/settings.json

+60-8
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
"[shellscript]": {
99
"editor.tabSize": 3
1010
},
11-
"files.associations": {
12-
//"*.r": "c11",
13-
// "*.ri": "c11"
14-
},
1511
"files.exclude": {
1612
"**/*.la": true,
1713
"**/*.lo": true,
@@ -33,10 +29,66 @@
3329
"${workspaceFolder}/src/h",
3430
"${workspaceFolder}/rt/include"
3531
],
36-
//"C_Cpp.default.intelliSenseMode": "linux-gcc-x64",
37-
//"C_Cpp.default.compilerPath": "/usr/bin/gcc",
3832
"C_Cpp.default.defines": [ ],
3933
"editor.tabSize": 3,
40-
"editor.detectIndentation": false
41-
34+
"editor.detectIndentation": false,
35+
"terminal.integrated.defaultProfile.windows": "MSYS2-UCRT64",
36+
"terminal.integrated.profiles.windows": {
37+
"PowerShell": {
38+
"source": "PowerShell",
39+
"icon": "terminal-powershell"
40+
},
41+
"Command Prompt": {
42+
"path": [
43+
"${env:windir}\\Sysnative\\cmd.exe",
44+
"${env:windir}\\System32\\cmd.exe"
45+
],
46+
"args": [ ],
47+
"icon": "terminal-cmd"
48+
},
49+
"MSYS2-MINGW64": {
50+
"path": "C:\\msys64\\usr\\bin\\bash.exe",
51+
"args": [
52+
"--login",
53+
"-i"
54+
],
55+
"env": {
56+
"MSYSTEM": "MINGW64",
57+
"CHERE_INVOKING": "1"
58+
}
59+
},
60+
"MSYS2-MINGW32": {
61+
"path": "C:\\msys64\\usr\\bin\\bash.exe",
62+
"args": [
63+
"--login",
64+
"-i"
65+
],
66+
"env": {
67+
"MSYSTEM": "MINGW32",
68+
"CHERE_INVOKING": "1"
69+
}
70+
},
71+
"MSYS2-UCRT64": {
72+
"path": "C:\\msys64\\usr\\bin\\bash.exe",
73+
"args": [
74+
"--login",
75+
"-i"
76+
],
77+
"env": {
78+
"MSYSTEM": "UCRT64",
79+
"CHERE_INVOKING": "1"
80+
}
81+
},
82+
"MSYS2-CLANG64": {
83+
"path": "C:\\msys64\\usr\\bin\\bash.exe",
84+
"args": [
85+
"--login",
86+
"-i"
87+
],
88+
"env": {
89+
"MSYSTEM": "CLANG64",
90+
"CHERE_INVOKING": "1",
91+
}
92+
}
93+
}
4294
}

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,18 @@ There are two possibilities depending on the choice of the C runtime library. Y
121121
the legacy Microsoft Visual C++ Runtime (MSVCRT), which runs on all versions of Windows, or the
122122
newer Universal C Runtime (UCRT64), which is used by Visual Studio but is only available by default
123123
on Windows 10 and newer. Starting from version 13.3, binary distributions of Unicon for Windows
124-
will be built with UCRT64.
124+
will be built with UCRT64. See msys2 [environemts](https://www.msys2.org/docs/environments/)
125+
for more details about available environemnts and their C Library options.
125126

126-
UCRT64:
127+
#### 1. UCRT64:
127128

128129
- Download and run the installer from https://www.msys2.org/. At the time of writing it is called
129130
`msys2-x86_64-20230127.exe` but it may be updated from that version.
130131

131132
- Go through the installation process to get a UCRT64 environment.
132133
- Using the UCRT64 shell, Install tools required for the build:
133134
```
134-
pacman -S mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-diffutils
135-
pacman -S make git
135+
pacman -S --needed base-devel mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-diffutils git
136136
```
137137
- Install the optional libraries for a full build (Unicon will build without them but some features
138138
will be absent).
@@ -158,7 +158,7 @@ make
158158
Note that, although the build environment is UCRT64, the resulting Unicon binaries may also be
159159
run from the standard Windows command line `cmd` terminal.
160160

161-
MSVCRT:
161+
#### 2. MSVCRT (Legacy):
162162

163163
- Download and run [mingw-get-setup.exe](https://sourceforge.net/projects/mingw/files/Installer/)
164164

@@ -172,7 +172,7 @@ Note that you maybe missing the tool "make". TDM MinGW comes with a "make" that
172172
That file can be found under the insallation directory of MinGW64 inside the bin directory.
173173
create a copy of that file and name it "make.exe" before continuing.
174174

175-
- Clone the Unicon repository (same options as UCRT64).
175+
- Clone the Unicon repository (same steps as UCRT64 above).
176176

177177
After that you can use the standard Windows command line `cmd` terminal to build Unicon.
178178
```

0 commit comments

Comments
 (0)