MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into myk_dreamfort

develop
myk002 2021-02-02 10:53:38 -08:00
parent 5e135d2bb7 06cd0c8437
commit 45a3c903a0
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
Unescape Escape View File

@ -184,9 +184,9 @@ if(NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhack
endif() endif()
# set up versioning. # set up versioning.
set(DF_VERSION "0.47.04") set(DF_VERSION "0.47.05")
set(DFHACK_RELEASE "r5") set(DFHACK_RELEASE "alpha0")
set(DFHACK_PRERELEASE FALSE) set(DFHACK_PRERELEASE TRUE)
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

3
library/CMakeLists.txt
Unescape Escape View File

@ -406,7 +406,10 @@ if(APPLE)
set(ZIP_LIBRARY /usr/lib/libz.dylib) set(ZIP_LIBRARY /usr/lib/libz.dylib)
target_link_libraries(dfhack ${SDL_LIBRARY}) target_link_libraries(dfhack ${SDL_LIBRARY})
target_link_libraries(dfhack ${CXX_LIBRARY}) target_link_libraries(dfhack ${CXX_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}) target_link_libraries(dfhack ${ZIP_LIBRARY})
endif()
target_link_libraries(dfhack ncurses) target_link_libraries(dfhack ncurses)
set_target_properties(dfhack PROPERTIES VERSION 1.0.0) set_target_properties(dfhack PROPERTIES VERSION 1.0.0)
set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0) set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0)

2
library/xml

@ -1 +1 @@
Subproject commit be0444cc165a1abff053d5893dc1f780f06526b7 Subproject commit b7222848dbfd4391d8acafc926303bc4f6253d24