Skip to content

Commit c1435ac

Browse files
authored
Update README.md
1 parent b655143 commit c1435ac

File tree

1 file changed

+33
-14
lines changed

1 file changed

+33
-14
lines changed

README.md

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ The [Images](https://github.com/IUPAC-InChI/InChI/tree/main/Images) subfolder co
162162
</tr>
163163
<tr>
164164
<td>
165-
<strong>Files</strong> (given in compressed <code>.gz</code> format)
165+
<strong>Files</strong> (given in compressed `.zip` format)
166166
</td>
167167
<td>
168168
<strong>Location(s)</strong>
@@ -172,36 +172,52 @@ The [Images](https://github.com/IUPAC-InChI/InChI/tree/main/Images) subfolder co
172172
</td>
173173
</tr>
174174
<tc>
175-
<td>
175+
<td rowspan="2">
176176
<code>inchi-1</code> (ELF file)
177177
</td>
178178
<td>
179-
<em>64-bit</em>: <code>INCHI-1-BIN/linux/64bit/</code><br />
180-
<em>32-bit</em>: <code>INCHI-1-BIN/linux/32bit/</code>
179+
<em>64-bit</em>: <code>INCHI-1-BIN/linux/64bit</code>
181180
</td>
182181
<td>
183182
<code>GCC</code>
184183
</td>
185184
</tr>
186-
<tc>
185+
<tr>
187186
<td>
187+
<em>32-bit</em>: <code>INCHI-1-BIN/linux/32bit</code>
188+
</td>
189+
<td>
190+
<code>Clang/LLVM</code><sup><strong>(2)</strong></sup>
191+
</td>
192+
</tr>
193+
<tc>
194+
<td rowspan="2">
188195
<code>libinchi.so.1.07</code><br /> + corresponding <code>inchi_main</code> (ELF file)
189196
</td>
190197
<td>
191-
<em>64-bit</em>: <code>INCHI-1-BIN/linux/64bit/so/</code><br />
192-
<em>32-bit</em>: <code>INCHI-1-BIN/linux/32bit/so/</code>
198+
<em>64-bit</em>: <code>INCHI-1-BIN/linux/64bit/so</code>
193199
</td>
194200
<td>
195201
<code>GCC</code>
196202
</td>
197203
</tr>
204+
<tr>
205+
<td>
206+
<em>32-bit</em>: <code>INCHI-1-BIN/linux/32bit/so</code>
207+
</td>
208+
<td>
209+
<code>Clang/LLVM</code><sup><strong>(2)</strong></sup>
210+
</td>
211+
</tr>
198212
</table>
199213
<br />
200214

201215
<a id="libgcc_32"></a>
202216
<sup><strong>(1)</strong></sup> <ins>IMPORTANT NOTE</ins>: Since 32-bit binaries for <code>Microsoft<sup>&reg;</sup> Windows</code> operating system have been compiled using <code>MinGW-w64</code>, it <a href="https://github.com/IUPAC-InChI/InChI/issues/71">has been reported</a> that in certain environments a dynamic link library <code>libgcc_s_dw2-1.dll</code> has to be included in the same folder with the executables. Therefore, <code>libgcc_s_dw2-1.dll</code> has been added to <code>INCHI-1-BIN/windows/32bit</code> and <code>INCHI-1-BIN/windows/32bit/dll</code> folders (we would like to thank <a href="https://github.com/nbehrnd">nbehrnd</a> for his assistance with this matter).
217+
<br />
218+
<sup><strong>(2)</strong></sup> In order to make <code>makefile32s</code> more consistent on all operating systems (see <a href="#libgcc_32">the note <sup><strong>(1)</strong></sup> above</a>), and for easier <a href="#MAKEFILE">change of the default compiler</a>, the default compiler on 32-bit <code>UNIX-based OSs</code> has been set to <code>Clang/LLVM</code>.
203219
<!--Please note that 32-bit binaries have to be compiled from the source, although the use of 64-bit versions is highly recommended.-->
204-
<br /><br />
220+
<br />
205221
Precompiled binaries for <strong>MacOS<sup>&reg;</sup></strong> (i.e. <code>.app</code> executables and <code>.dylib</code> libraries) will be provided very soon. Until then, please note that <code>InChI</code> can now be <a href="#compiling-inchi-v107-from-source">compiled from source</a> on <strong>MacOS<sup>&reg;</sup></strong> using native/default <code>Clang</code> or <code>GCC</code> (if installed).
206222
<br />
207223

@@ -223,15 +239,18 @@ For `GCC` and `Clang/LLVM` compilers, `InChI v.1.07` can be compiled from the so
223239

224240
<a id="MAKEFILE"></a>
225241

226-
`makefile/makefile32` files are configured to detect OSs automatically, so it is no longer needed to specify OS explicitly or run batch/bash script(s) before compiling.
227-
`GCC` and `Clang/LLVM` compilers are also automatically detected by `makefile/makefile32` files, with `GCC` set as default compiler.
228-
If both `GCC` and `Clang/LLVM` compilers are installed, setting `Clang/LLVM` as default compiler can be done simply by changing `CCN` parameter from value `1` to `2` in `makefile/makefile32`.
242+
New features in `makefile/makefile32`:
243+
- `makefile/makefile32` files are configured to detect OSs automatically, so it is no longer needed to specify OS explicitly or run batch/bash script(s) before compiling.
244+
- `GCC` and `Clang/LLVM` compilers are also automatically detected by `makefile/makefile32` files with:
245+
- `GCC` set as a default compiler on 64-bit platforms
246+
- `Clang/LLVM` set as a default compiler on 32-bit platforms (please refer to <a href="#libgcc_32">these notes</a> for more details).
247+
- If both `GCC` and `Clang/LLVM` compilers are installed, setting a default compiler can be done simply by changing `CCN` parameter in `makefile/makefile32` where:
248+
- `CCN = 1` corresponds to `GCC`
249+
- `CCN = 2` corresponds to `Clang/LLVM`.
229250

230251
Support for native/default MacOS<sup>&reg;</sup> `Clang` compiler is now provided with 64-bit versions of `makefile` files (we would like to thank <a href="https://github.com/johnmay/">John Mayfield</a> for his assistance with this matter).
231252

232-
If `makefile/makefile32` is used for compiling `libinchi` on Microsoft<sup>&reg;</sup> Windows, `libinchi.dll` is now generated instead of `libinchi.so.1.07`.
233-
234-
Please make sure to read the <a href="#libgcc_32">important note</a> regarding the required <code>libgcc_s_dw2-1.dll</code> for running 32-bit executables on <code>Microsoft<sup>&reg;</sup> Windows</code> operating system in certain environments.
253+
If `makefile/makefile32` is used for compiling `libinchi` on Microsoft<sup>&reg;</sup> Windows, `libinchi.dll` is now generated instead of `libinchi.so.1.07`. Also. please make sure to read the <a href="#libgcc_32">notes</a> regarding the required <code>libgcc_s_dw2-1.dll</code> for running 32-bit executables on <code>Microsoft<sup>&reg;</sup> Windows</code> operating system in certain environments.
235254

236255
**Additional notes**:
237256

0 commit comments

Comments
 (0)