From 404ce30357ec77ccd01a2edbde41a800e10b6eed Mon Sep 17 00:00:00 2001 From: Kenix Date: Thu, 3 Nov 2022 21:24:49 -0400 Subject: [PATCH] Fixes build validation and adds vcpkg auto download to README --- .github/workflows/build-validation.yml | 2 +- .gitignore | 1 + README.md | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml index 44d0096..69d8011 100644 --- a/.github/workflows/build-validation.yml +++ b/.github/workflows/build-validation.yml @@ -86,5 +86,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: soh-windows - path: build-cmake/**/src/**/*.lib + path: build-cmake/src/**/*.lib if-no-files-found: error diff --git a/.gitignore b/.gitignore index 93af693..1c94861 100644 --- a/.gitignore +++ b/.gitignore @@ -337,5 +337,6 @@ MigrationBackup/ !libultraship/Lib/** libultraship/DebugObj/* build/ +build-cmake/ libultraship.a .DS_Store diff --git a/README.md b/README.md index 56fd0e9..829ea78 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # libultraship -## Building +## Building on Linux/Mac ``` cmake -H. -Bbuild cmake --build build @@ -9,7 +9,12 @@ cmake --build build ## Generating a Visual Studio `.sln` on Windows ``` # Visual Studio 2022 -& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 17 2022" -T v142 -A x64 +& 'C:\Program Files\CMake\bin\cmake' -DUSE_AUTO_VCPKG=true -S . -B "build/x64" -G "Visual Studio 17 2022" -T v142 -A x64 # Visual Studio 2019 -& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 16 2019" -T v142 -A x64 +& 'C:\Program Files\CMake\bin\cmake' -DUSE_AUTO_VCPKG=true -S . -B "build/x64" -G "Visual Studio 16 2019" -T v142 -A x64 +``` + +## To build on Windows +``` +& 'C:\Program Files\CMake\bin\cmake' --build .\build\x64 ``` \ No newline at end of file