diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | README.adoc | 6 | ||||
| -rw-r--r-- | ToolchainCrossMinGW.cmake | 5 | ||||
| -rw-r--r-- | ToolchainCrossMinGWW64.cmake | 5 | ||||
| -rw-r--r-- | ToolchainCrossWin64.cmake | 5 | ||||
| -rw-r--r-- | Win64Depends.sh | 3 |
6 files changed, 14 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d942601..9164d31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,8 @@ pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0) link_directories (${GTK3_LIBRARY_DIRS}) if (NOT WIN32) - pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2) + pkg_search_module (Lua REQUIRED lua>=5.2 + lua5.4 lua-5.4 lua5.3 lua-5.3 lua5.2 lua-5.2) link_directories (${Lua_LIBRARY_DIRS}) else () # For whatever reason this now seems to be required diff --git a/README.adoc b/README.adoc index c8a77cf..5cb3fae 100644 --- a/README.adoc +++ b/README.adoc @@ -10,8 +10,10 @@ image::docs/user-guide/logdiag-en.png[align="center"] Packages -------- -Regular releases are sporadic. git master should be stable enough. You can get -a package with the latest development version from Archlinux's AUR. +Regular releases are sporadic. git master should be stable enough. +You can get a package with the latest development version using Arch Linux's +https://aur.archlinux.org/packages/logdiag-git[AUR], +or as a https://git.janouch.name/p/nixexprs[Nix derivation]. Windows installers can be downloaded from https://git.janouch.name/p/logdiag/releases[the Releases page on Gitea]. diff --git a/ToolchainCrossMinGW.cmake b/ToolchainCrossMinGW.cmake index 7c9242b..4aaa387 100644 --- a/ToolchainCrossMinGW.cmake +++ b/ToolchainCrossMinGW.cmake @@ -5,12 +5,11 @@ set (CMAKE_C_COMPILER "i586-mingw32msvc-gcc") set (CMAKE_CXX_COMPILER "i586-mingw32msvc-g++") set (CMAKE_RC_COMPILER "i586-mingw32msvc-windres") -# Not needed to crosscompile an installation package -#set (CMAKE_CROSSCOMPILING_EMULATOR "wine") +# Remember to set WINEPATH for library dependencies +set (CMAKE_CROSSCOMPILING_EMULATOR "wine") set (CMAKE_FIND_ROOT_PATH "/usr/i586-mingw32msvc") 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/ToolchainCrossMinGWW64.cmake b/ToolchainCrossMinGWW64.cmake index f72e903..886df14 100644 --- a/ToolchainCrossMinGWW64.cmake +++ b/ToolchainCrossMinGWW64.cmake @@ -5,12 +5,11 @@ set (CMAKE_C_COMPILER "i686-w64-mingw32-gcc") set (CMAKE_CXX_COMPILER "i686-w64-mingw32-g++") set (CMAKE_RC_COMPILER "i686-w64-mingw32-windres") -# Not needed to crosscompile an installation package -#set (CMAKE_CROSSCOMPILING_EMULATOR "wine") +# Remember to set WINEPATH for library dependencies +set (CMAKE_CROSSCOMPILING_EMULATOR "wine") set (CMAKE_FIND_ROOT_PATH "/usr/i686-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/ToolchainCrossWin64.cmake b/ToolchainCrossWin64.cmake index 5550d6d..e895c2d 100644 --- a/ToolchainCrossWin64.cmake +++ b/ToolchainCrossWin64.cmake @@ -5,12 +5,11 @@ 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") -# Not needed to crosscompile an installation package -#set (CMAKE_CROSSCOMPILING_EMULATOR "wine64") +# 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/Win64Depends.sh b/Win64Depends.sh index 8d68ec7..bff86eb 100644 --- a/Win64Depends.sh +++ b/Win64Depends.sh @@ -57,7 +57,8 @@ configure() { > lib/gdk-pixbuf-2.0/2.10.0/loaders.cache # pkgconf has a command line option for this, but CMake can't pass it. - sed -i "s|^prefix=/mingw64|prefix=$(pwd)|" {share,lib}/pkgconfig/*.pc + sed -i "s|^prefix=/mingw64|prefix=$(pwd)|" \ + share/pkgconfig/*.pc lib/pkgconfig/*.pc } mkdir -p win32-depends |