games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #992 from kambala-decapitator/msvc-ai-dlls

Browse Source 
[MSVC] place AI dependencies into the right location at build time
This commit is contained in:
Andrii Danylchenko
2022-09-25 17:53:16 +03:00
committed by GitHub
parent e11a5dbffc a5b62104d4
commit d6c2d05376
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -15,7 +15,6 @@ project(VCMI)
# #
# Vckpg: # Vckpg:
# - Improve install code once there is better way to deploy DLLs and Qt plugins # - Improve install code once there is better way to deploy DLLs and Qt plugins
# - Move Vcpkg install BundleUtilities code from osx/CMakeLists.txt
# #
# Other: # Other:
# - Cleanup remove_directory copy_directory if performance will be a problem. # - Cleanup remove_directory copy_directory if performance will be a problem.
@@ -564,7 +563,6 @@ if(WIN32)
set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
# Use BundleUtilities to fix build when Vcpkg is used and disable it for MXE # Use BundleUtilities to fix build when Vcpkg is used and disable it for MXE
if(NOT (${CMAKE_CROSSCOMPILING})) if(NOT (${CMAKE_CROSSCOMPILING}))
add_subdirectory(osx)
add_subdirectory(win) add_subdirectory(win)
endif() endif()
elseif(APPLE_MACOS AND NOT ENABLE_MONOLITHIC_INSTALL) elseif(APPLE_MACOS AND NOT ENABLE_MONOLITHIC_INSTALL)

9
client/CMakeLists.txt
View File

@@ -198,6 +198,15 @@ if(WIN32)
target_link_libraries(vcmiclient SDL2::SDL2main) target_link_libraries(vcmiclient SDL2::SDL2main)
endif() endif()
target_compile_definitions(vcmiclient PRIVATE WINDOWS_IGNORE_PACKING_MISMATCH) target_compile_definitions(vcmiclient PRIVATE WINDOWS_IGNORE_PACKING_MISMATCH)
# TODO: very hacky, find proper solution to copy AI dlls into bin dir
if(MSVC)
add_custom_command(TARGET vcmiclient POST_BUILD
WORKING_DIRECTORY "$<TARGET_FILE_DIR:vcmiclient>"
COMMAND ${CMAKE_COMMAND} -E rename AI/fuzzylite.dll fuzzylite.dll
COMMAND ${CMAKE_COMMAND} -E rename AI/tbb.dll tbb.dll
)
endif()
elseif(APPLE_IOS) elseif(APPLE_IOS)
target_link_libraries(vcmiclient PRIVATE target_link_libraries(vcmiclient PRIVATE
iOS_utils iOS_utils