p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Find a better solution to the Lua situation 

It seems that I cannot win here.  If I want XP to work, I need to keep
the old packages in place.  This time the resulting program cannot
find _time32 in msvcrt.dll.
This commit is contained in:
Přemysl Eric Janouch 2018-06-25 02:13:16 +02:00
parent 193b724709
commit 9aa9512190
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -83,7 +83,21 @@ endif (CONVERT_EXECUTABLE AND NOT WIN32)
# Dependencies # Dependencies
find_package (PkgConfig REQUIRED) find_package (PkgConfig REQUIRED)
pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0) pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0)
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.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 # This actually fucks up MinGW cross-compilation if omitted
link_directories (${GTK3_LIBRARY_DIRS}) link_directories (${GTK3_LIBRARY_DIRS})

13
Win32Depends.cmake
View File

@ -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_urls "${pkg_winlibs_root}/GTK+/libjson-glib-1.0-1-mingw32.7z")
set (pkg_winlibs_md5 "f06e42c5998dae5fb6245fecc96a403e") 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 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}/lua/lua-5.2.0-1/lua-5.2.0-1-mingw32-dll-52.tar.xz"
"${pkg_mingw_lua_root}/mingw-w64-i686-gcc-libs-7.3.0-2-any.pkg.tar.xz" "${pkg_mingw_lua_root}/lua/lua-5.2.0-1/lua-5.2.0-1-mingw32-dev.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")
set (pkg_mingw_lua_md5 set (pkg_mingw_lua_md5
"b75af38372cddde0b0ff997cf4fdb038" "150b27cab05b78ba40bbd7225630c00d"
"9507a011e7ab3c7fadf01b24590b8713" "6abe77c1e1a783075fe73c53b7c235fb")
"ecf4d62961c5f4b33841a4d22a0eda80")
# Stage 1: fetch missing packages # Stage 1: fetch missing packages
foreach (pkg_set ${pkg_list}) foreach (pkg_set ${pkg_list})