From d73bcef21a351ef880a6adfc0155216f784655d8 Mon Sep 17 00:00:00 2001 From: complexlogic Date: Tue, 16 Apr 2024 22:47:59 -0700 Subject: [PATCH] Update CI --- .github/workflows/build.yml | 2 +- src/CMakeLists.txt | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fe6055..1fd7fcc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: submodules: true - uses: friendlyanon/setup-vcpkg@v1 - with: { committish: 16ee2ecb31788c336ace8bb14c21801efb6836e4 } + with: { committish: 501cb01e517ee5689577bb01ba8bd1b4c1041a53 } - name: Configure run: cmake -B build -G "${{env.CMAKE_GENERATOR}}" -D "CMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TRIPLET}} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d468a47..9a988c4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,15 +17,16 @@ elseif (WIN32) add_executable(${EXECUTABLE_TITLE} WIN32 ${SOURCES} ${MANIFEST_FILE}) set_property(TARGET ${EXECUTABLE_TITLE} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${PROJECT_BINARY_DIR}") target_link_libraries(${EXECUTABLE_TITLE} - SDL2::SDL2main - $,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static> - $,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static> - $,SDL2_mixer::SDL2_mixer,SDL2_mixer::SDL2_mixer-static> - spdlog::spdlog - LibXml2::LibXml2 - unofficial::inih::libinih - ${GETOPT} - PowrProf + $ + $,SDL2::SDL2,SDL2::SDL2-static> + $,SDL2_image::SDL2_image,SDL2_image::SDL2_image-static> + $,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static> + $,SDL2_mixer::SDL2_mixer,SDL2_mixer::SDL2_mixer-static> + spdlog::spdlog + LibXml2::LibXml2 + unofficial::inih::libinih + ${GETOPT} + PowrProf ) target_include_directories(${EXECUTABLE_TITLE} PUBLIC ${GETOPT_INCLUDE_DIR}) endif ()