diff options
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | Win32Depends.cmake | 13 |
2 files changed, 20 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 58ddccb..3769430 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,21 @@ endif (CONVERT_EXECUTABLE AND NOT WIN32) # Dependencies find_package (PkgConfig REQUIRED) pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0) -pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2) + +if (NOT WIN32) + pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2) +else (NOT WIN32) + # For whatever reason this now seems to be required + set (LUA_INCLUDE_DIR "${WIN32_DEPENDS_PATH}/include") + + # XXX: this seems to require CMake 3.0 ... include it in the project? + find_package (Lua REQUIRED) + if (LUA_VERSION_STRING VERSION_LESS "5.2") + message (FATAL_ERROR "Lua 5.2 not found") + endif (LUA_VERSION_STRING VERSION_LESS "5.2") + set (Lua_LIBRARIES ${LUA_LIBRARIES}) + set (Lua_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) +endif (NOT WIN32) # This actually fucks up MinGW cross-compilation if omitted link_directories (${GTK3_LIBRARY_DIRS}) diff --git a/Win32Depends.cmake b/Win32Depends.cmake index 4a9c320..61347da 100644 --- a/Win32Depends.cmake +++ b/Win32Depends.cmake @@ -46,16 +46,13 @@ set (pkg_winlibs_root "http://sourceforge.net/projects/winlibs/files") set (pkg_winlibs_urls "${pkg_winlibs_root}/GTK+/libjson-glib-1.0-1-mingw32.7z") set (pkg_winlibs_md5 "f06e42c5998dae5fb6245fecc96a403e") -set (pkg_mingw_lua_root "http://repo.msys2.org/mingw/i686") +set (pkg_mingw_lua_root "http://sourceforge.net/projects/mingw/files/MinGW/Extension") set (pkg_mingw_lua_urls - "${pkg_mingw_lua_root}/mingw-w64-i686-lua-5.3.4-1-any.pkg.tar.xz" - "${pkg_mingw_lua_root}/mingw-w64-i686-gcc-libs-7.3.0-2-any.pkg.tar.xz" - "${pkg_mingw_lua_root}/mingw-w64-i686-libwinpthread-git-6.0.0.5134.2416de71-1-any.pkg.tar.xz") -set (pkg_mingw_lua_strip "mingw32") + "${pkg_mingw_lua_root}/lua/lua-5.2.0-1/lua-5.2.0-1-mingw32-dll-52.tar.xz" + "${pkg_mingw_lua_root}/lua/lua-5.2.0-1/lua-5.2.0-1-mingw32-dev.tar.xz") set (pkg_mingw_lua_md5 - "b75af38372cddde0b0ff997cf4fdb038" - "9507a011e7ab3c7fadf01b24590b8713" - "ecf4d62961c5f4b33841a4d22a0eda80") + "150b27cab05b78ba40bbd7225630c00d" + "6abe77c1e1a783075fe73c53b7c235fb") # Stage 1: fetch missing packages foreach (pkg_set ${pkg_list}) |