diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2021-10-21 21:53:20 +0200 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2021-10-21 21:53:20 +0200 |
| commit | 03c6ae0750e8a5ef73d8aa3c7f444129ddf1f3be (patch) | |
| tree | 7ea3cde454d4c69037b4059e69ab60d9498faaa2 | |
| parent | 95f53863ec971bae69f1d25befd5722235c92cfb (diff) | |
| download | logdiag-03c6ae0750e8a5ef73d8aa3c7f444129ddf1f3be.tar.gz logdiag-03c6ae0750e8a5ef73d8aa3c7f444129ddf1f3be.tar.xz logdiag-03c6ae0750e8a5ef73d8aa3c7f444129ddf1f3be.zip | |
Include modern build instructions for Win64
Mostly just so that the two options don't look the same.
| -rw-r--r-- | README.adoc | 9 | ||||
| -rw-r--r-- | ToolchainCrossWin64.cmake | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/README.adoc b/README.adoc index ebfd0b6..6f9d848 100644 --- a/README.adoc +++ b/README.adoc @@ -100,12 +100,9 @@ Just install MinGW-w64 and let automation take care of the rest. Alternatively, for an unnecessarily bloated MSYS2-based 64-bit build: $ sh Win64Depends.cmake - $ mkdir build - $ cd build - $ cmake .. \ - -DCMAKE_TOOLCHAIN_FILE=../ToolchainCrossWin64.cmake \ - -DCMAKE_BUILD_TYPE=Release - $ cpack + $ cmake -DCMAKE_TOOLCHAIN_FILE=ToolchainCrossWin64.cmake \ + -DCMAKE_BUILD_TYPE=Release -B build + $ cmake --build build -- package Contributing and Support ------------------------ diff --git a/ToolchainCrossWin64.cmake b/ToolchainCrossWin64.cmake index a562ed0..5550d6d 100644 --- a/ToolchainCrossWin64.cmake +++ b/ToolchainCrossWin64.cmake @@ -6,7 +6,7 @@ set (CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++") set (CMAKE_RC_COMPILER "x86_64-w64-mingw32-windres") # Not needed to crosscompile an installation package -#set (CMAKE_CROSSCOMPILING_EMULATOR "wine") +#set (CMAKE_CROSSCOMPILING_EMULATOR "wine64") set (CMAKE_FIND_ROOT_PATH "/usr/x86_64-w64-mingw32") |