From ae06d6e7c93560ad7f37e4293e06c616cbca8ee6 Mon Sep 17 00:00:00 2001 From: Rey Date: Thu, 2 Mar 2023 11:14:47 -0600 Subject: [PATCH] Fixed misc build errors. Was missing Win64 on the CMakeSettings.json Was missing the "Oodle" folder for the oodle DLL since it was just looking in deps. --- CMakeLists.txt | 2 +- CMakeSettings.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6597c437..2d18bde4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ add_custom_target( copy_runtime_files ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/web ${CMAKE_BINARY_DIR}/bin/web COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/sql_import.sh ${CMAKE_BINARY_DIR}/bin/sql_import.sh COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/bin/data/actions - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/deps/oo2net_9_win64.dll ${CMAKE_BINARY_DIR}/bin/oo2net_9_win64.dll + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/deps/Oodle/oo2net_9_win64.dll ${CMAKE_BINARY_DIR}/bin/oo2net_9_win64.dll COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/deps/ffxiv-actions/actions ${CMAKE_BINARY_DIR}/bin/data/actions ) ###################################### diff --git a/CMakeSettings.json b/CMakeSettings.json index 60df643a..f0610418 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -8,7 +8,7 @@ "configurations": [ { "name": "x64-Debug", - "generator": "Visual Studio 17 2022", + "generator": "Visual Studio 17 2022 Win64", "configurationType": "Debug", "buildRoot": "${env.BuildDir}\\${name}", "cmakeCommandArgs": "-DCMAKE_BUILD_TYPE=\"Debug\"", @@ -19,7 +19,7 @@ }, { "name": "x64-Release", - "generator": "Visual Studio 17 2022", + "generator": "Visual Studio 17 2022 Win64", "configurationType": "Release", "buildRoot": "${env.BuildDir}\\${name}", "cmakeCommandArgs": "-DCMAKE_BUILD_TYPE=\"RelWithDebInfo\"",