diff --git a/CHANGES b/CHANGES index cf56353b5..e06bc0f8b 100644 --- a/CHANGES +++ b/CHANGES @@ -48,6 +48,7 @@ Emulation fixes: - GBA Video: Properly clear VRAM on reset (fixes mgba.io/i/3690) Other fixes: - 3DS: Don't detach autosave thread (fixes mgba.io/i/3561) + - CMake: Fix minizip unztell64 detection outside default library paths - Core: Fix inconsistencies with setting game-specific overrides (fixes mgba.io/i/2963) - Core: Don't leave initial empty state in rewind queue - Debugger: Fix writing to specific segment in command-line debugger diff --git a/CMakeLists.txt b/CMakeLists.txt index c30185090..834e9fd9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -679,7 +679,11 @@ elseif(USE_MINIZIP) list(APPEND VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-zip.c) set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libminizip1") set(CMAKE_REQUIRED_LIBRARIES ${MINIZIP_LIBRARIES}) + foreach(DIR IN LISTS MINIZIP_LIBRARY_DIRS) + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -L${DIR}") + endforeach() check_function_exists(unztell64 HAVE_UNZTELL64) + unset(CMAKE_REQUIRED_FLAGS) unset(CMAKE_REQUIRED_LIBRARIES) if(NOT HAVE_UNZTELL64) add_definitions(-Dunztell64=unzTell64) # Bug in downstream minizip that some distros use