From 83b291da79c54d9f04cbc2a5eb41abab21fef050 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 15 Mar 2021 01:15:28 +0300 Subject: docs: grammar --- docs/boost.md | 4 ++-- docs/cmake.md | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/boost.md b/docs/boost.md index 37ff3bb..72cea4a 100644 --- a/docs/boost.md +++ b/docs/boost.md @@ -5,8 +5,8 @@ The way Boost names library files by default is insane. It's absolutely not compatible between OSs, compilers, Boost versions, etc. On Linux, for example, it would create stage/lib/libboost_filesystem.a, while on Windows it would become something insane like stage\lib\libboost_filesystem-vc142-mt-s-x64-1_72.lib. -More than that, older Boost versions wouldn't include architecture information -(the "x64" part) in the file name, so you couldn't store libraries for both x86 +More than that, older Boost versions don't include architecture information +(the "x64" part) in the file name, so you cannot store libraries for both x86 and x64 in the same directory. On Linux, on the other hand, you can't even store debug/release binaries in the same directory. What's worse is that older CMake versions don't support the architecture suffix, choking on the Windows diff --git a/docs/cmake.md b/docs/cmake.md index cd8a149..d4685f8 100644 --- a/docs/cmake.md +++ b/docs/cmake.md @@ -61,7 +61,7 @@ to detect that. Cross-compilation ----------------- -If you want to e.g. build x86 binary on x64 and vice versa, the easiest way +If you want to e.g. build x86 binaries on x64 and vice versa, the easiest way seems to be to make a CMake "toolchain file", which initializes the proper compiler flags (like -m64/-m32, etc.). Such file could look like this: @@ -72,8 +72,7 @@ compiler flags (like -m64/-m32, etc.). Such file could look like this: You can then pass the path to it using the CMAKE_TOOLCHAIN_FILE parameter. -If you use the Visual Studio generators, just use the -A parameter, like `-A -Win32`. +If you use the Visual Studio generators, just use the -A parameter: `-A Win32`. As a side note, if you want to cross-compile between x86 and x64 using GCC on Ubuntu, you need to install the gcc-multilib package. -- cgit v1.2.3