luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 00:55:20 +02:00
Code Activity

Automatically package MinGW runtime in buildbot

Browse Source
This commit is contained in:
sfan5
2021-10-25 22:33:13 +02:00
committed by rubenwardy
parent ea1396f856
commit 0b95da7ad3
5 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/CMakeLists.txt
View File

@@ -278,10 +278,12 @@ if(WIN32)
endif()
set(PLATFORM_LIBS ws2_32.lib version.lib shlwapi.lib ${PLATFORM_LIBS})
set(EXTRA_DLL "" CACHE FILEPATH "Optional paths to additional DLLs that should be packaged")
# DLLs are automatically copied to the output directory by vcpkg when VCPKG_APPLOCAL_DEPS=ON
if(NOT VCPKG_APPLOCAL_DEPS)
find_file(ZLIB_DLL NAMES "" DOC "Path to Zlib DLL for installation (optional)")
find_file(ZSTD_DLL NAMES "" DOC "Path to Zstd DLL for installation (optional)")
set(ZLIB_DLL "" CACHE FILEPATH "Path to Zlib DLL for installation (optional)")
set(ZSTD_DLL "" CACHE FILEPATH "Path to Zstd DLL for installation (optional)")
if(ENABLE_SOUND)
set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)")
set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)")
@@ -294,7 +296,6 @@ if(WIN32)
set(LUA_DLL "" CACHE FILEPATH "Path to luajit-5.1.dll for installation (optional)")
endif()
endif()
else()
# Unix probably
if(BUILD_CLIENT)
@@ -794,6 +795,9 @@ endif()
# Installation
if(WIN32)
if(EXTRA_DLL)
install(FILES ${EXTRA_DLL} DESTINATION ${BINDIR})
endif()
if(VCPKG_APPLOCAL_DEPS)
# Collect the dll's from the output path
install(DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/Release/