diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2024-04-09 17:04:45 +0200 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2024-04-09 17:04:45 +0200 |
| commit | 33426992ecd5b6d95795e1d465eb085a75fa726f (patch) | |
| tree | 0d3b35a23209c272996367f6cdfd7b51b93899d6 | |
| parent | 197d071160043fa64aa9c49c8dbbc61bc4fdd45f (diff) | |
| download | tdv-33426992ecd5b6d95795e1d465eb085a75fa726f.tar.gz tdv-33426992ecd5b6d95795e1d465eb085a75fa726f.tar.xz tdv-33426992ecd5b6d95795e1d465eb085a75fa726f.zip | |
Bump liberty, moving the Win64 toolchain file
| -rw-r--r-- | README.adoc | 2 | ||||
| -rw-r--r-- | cmake/Win64CrossToolchain.cmake | 15 | ||||
| m--------- | liberty | 0 |
3 files changed, 1 insertions, 16 deletions
diff --git a/README.adoc b/README.adoc index 14294e2..461236e 100644 --- a/README.adoc +++ b/README.adoc @@ -67,7 +67,7 @@ selection watching is a very X11/Wayland-specific feature. Beware that build dependencies take up almost a gigabyte of disk space. $ sh -e cmake/Win64Depends.sh - $ cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Win64CrossToolchain.cmake \ + $ cmake -DCMAKE_TOOLCHAIN_FILE=liberty/cmake/toolchains/MinGW-w64-x64.cmake \ -DCMAKE_BUILD_TYPE=Release -B build $ cmake --build build -- package diff --git a/cmake/Win64CrossToolchain.cmake b/cmake/Win64CrossToolchain.cmake deleted file mode 100644 index e895c2d..0000000 --- a/cmake/Win64CrossToolchain.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set (CMAKE_SYSTEM_NAME "Windows") -set (CMAKE_SYSTEM_PROCESSOR "x86_64") - -set (CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc") -set (CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++") -set (CMAKE_RC_COMPILER "x86_64-w64-mingw32-windres") - -# Remember to set WINEPATH for library dependencies -set (CMAKE_CROSSCOMPILING_EMULATOR "wine64") - -set (CMAKE_FIND_ROOT_PATH "/usr/x86_64-w64-mingw32") - -set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/liberty b/liberty -Subproject cb9d162a265e9e7b86bec92051f40374e79b7a5 +Subproject f04cc2c61e1a00db4d1af1bb55ca7e20b9c3db2 |