diff --git a/CMakeLists.txt b/CMakeLists.txt index 3de10ea2a..f17d8e6d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,9 +184,9 @@ if(NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhack endif() # set up versioning. -set(DF_VERSION "0.47.04") -set(DFHACK_RELEASE "r5") -set(DFHACK_PRERELEASE FALSE) +set(DF_VERSION "0.47.05") +set(DFHACK_RELEASE "alpha0") +set(DFHACK_PRERELEASE TRUE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 776a7de76..fd6c1c460 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -406,7 +406,10 @@ if(APPLE) set(ZIP_LIBRARY /usr/lib/libz.dylib) target_link_libraries(dfhack ${SDL_LIBRARY}) target_link_libraries(dfhack ${CXX_LIBRARY}) - target_link_libraries(dfhack ${ZIP_LIBRARY}) + if(EXISTS ${ZIP_LIBRARY}) + # doesn't exist on macOS 11, but DFHack seems to find the right library there + target_link_libraries(dfhack ${ZIP_LIBRARY}) + endif() target_link_libraries(dfhack ncurses) set_target_properties(dfhack PROPERTIES VERSION 1.0.0) set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0) diff --git a/library/xml b/library/xml index be0444cc1..b7222848d 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit be0444cc165a1abff053d5893dc1f780f06526b7 +Subproject commit b7222848dbfd4391d8acafc926303bc4f6253d24