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

ensure offline builds still work; clean up

develop
Myk Taylor 2023-05-23 16:56:42 -07:00
parent a48344fd24
commit 61eeea20e8
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
Unescape Escape View File

@ -8,8 +8,8 @@ project(dfhack)
# set up versioning. # set up versioning.
set(DF_VERSION "50.08") set(DF_VERSION "50.08")
set(DFHACK_RELEASE "r4") set(DFHACK_RELEASE "r2rc1")
set(DFHACK_PRERELEASE FALSE) set(DFHACK_PRERELEASE TRUE)
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
set(DFHACK_ABI_VERSION 1) set(DFHACK_ABI_VERSION 1)
@ -285,24 +285,23 @@ else()
unset(CMAKE_HAVE_PTHREAD_H CACHE) unset(CMAKE_HAVE_PTHREAD_H CACHE)
endif() endif()
# Move zlib to the build folder so possible 32 and 64-bit builds if(NOT APPLE AND DFHACK_BUILD_32)
# in the same source tree don't conflict set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
file(COPY ${dfhack_SOURCE_DIR}/depends/zlib
DESTINATION ${CMAKE_BINARY_DIR}/depends/)
file(COPY ${ZLIB_DOWNLOAD_DIR}/zlib.lib
DESTINATION ${CMAKE_BINARY_DIR}/depends/zlib/lib/)
endif() endif()
endif()
find_package(ZLIB REQUIRED)
include_directories(${ZLIB_INCLUDE_DIRS})
# Download SDL release and extract into depends (in the build dir so as not to clutter up the source dir) # Download SDL release and extract into depends in the build dir
# all we need are the header files, so the same release package will work for all platforms # all we need are the header files, so the same release package will work for all platforms
# (the above statement is untested for OSX) # (the above statement is untested for OSX)
set(SDL_VERSION 2.26.2) set(SDL_VERSION 2.26.2)
set(SDL_ZIP_MD5 574daf26d48de753d0b1e19823c9d8bb)
set(SDL_ZIP_FILE SDL2-devel-${SDL_VERSION}-VC.zip) set(SDL_ZIP_FILE SDL2-devel-${SDL_VERSION}-VC.zip)
set(SDL_ZIP_PATH ${CMAKE_BINARY_DIR}/depends/SDL2/) set(SDL_ZIP_PATH ${CMAKE_BINARY_DIR}/depends/SDL2/)
file(DOWNLOAD "https://github.com/libsdl-org/SDL/releases/download/release-${SDL_VERSION}/${SDL_ZIP_FILE}" download_file("https://github.com/libsdl-org/SDL/releases/download/release-${SDL_VERSION}/${SDL_ZIP_FILE}"
${SDL_ZIP_PATH}${SDL_ZIP_FILE} ${SDL_ZIP_PATH}${SDL_ZIP_FILE}
EXPECTED_MD5 574daf26d48de753d0b1e19823c9d8bb ${SDL_ZIP_MD5})
SHOW_PROGRESS)
file(ARCHIVE_EXTRACT INPUT ${SDL_ZIP_PATH}${SDL_ZIP_FILE} file(ARCHIVE_EXTRACT INPUT ${SDL_ZIP_PATH}${SDL_ZIP_FILE}
DESTINATION ${SDL_ZIP_PATH}) DESTINATION ${SDL_ZIP_PATH})
include_directories(${SDL_ZIP_PATH}/SDL2-${SDL_VERSION}/include) include_directories(${SDL_ZIP_PATH}/SDL2-${SDL_VERSION}/include)