1.5: Fuckin' UE5... #38

Manually merged
williamjcm merged 126 commits from one-point-five into master 2024-07-22 11:06:13 +02:00
Showing only changes of commit 088f357a6b - Show all commits

View file

@ -27,8 +27,10 @@ endif()
find_package(Magnum REQUIRED GL Sdl2Application) find_package(Magnum REQUIRED GL Sdl2Application)
find_package(MagnumIntegration REQUIRED ImGui) find_package(MagnumIntegration REQUIRED ImGui)
find_package(CURL REQUIRED HTTPS) find_package(CURL REQUIRED HTTPS)
if(SAVETOOL_USE_SYSTEM_LIBS)
find_package(libzip REQUIRED) find_package(libzip REQUIRED)
find_package(efsw REQUIRED) find_package(efsw REQUIRED)
endif()
set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON) set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)
@ -140,11 +142,15 @@ target_link_libraries(MassBuilderSaveTool PRIVATE
MagnumIntegration::ImGui MagnumIntegration::ImGui
Logger Logger
UESaveFile UESaveFile
efsw::efsw
libzip::zip
CURL::libcurl_static CURL::libcurl_static
) )
if(SAVETOOL_USE_SYSTEM_LIBS)
target_link_libraries(MassBuilderSaveTool PRIVATE libzip::zip efsw::efsw)
else()
target_link_libraries(MassBuilderSaveTool PRIVATE zip efsw)
endif()
if(CORRADE_TARGET_WINDOWS) if(CORRADE_TARGET_WINDOWS)
target_link_libraries(MassBuilderSaveTool PRIVATE target_link_libraries(MassBuilderSaveTool PRIVATE
Corrade::Main Corrade::Main