diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index f00175c8..b77be5aa 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -136,7 +136,6 @@ jobs: # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - build-macos: runs-on: macOS-latest steps: @@ -200,4 +199,27 @@ jobs: # files: daedalusX64-macos-x86.tar.gz # tag_name: ${{ steps.tag.outputs.VERSION }} # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + build-windows: + runs-on: windows-latest + envs: + VCPKG_DEFAULT_TRIPLET: x64-windows + steps: + - uses: actions/checkout@v2 + + - uses: lukka/get-cmake@latest + + - name: Setup a new (or from cache) vcpkg + uses: lukka/run-vcpkg@v11 + with: + vcpkgGitCommitId: aa628ceb5f15f0c30d4d481f14fa5b2be2b4a658 + runVcpkgInstall: true + + - name: Run CMake config + run: | + cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=$ENV:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -G "Visual Studio 16 2019" -A x64 + + - name: Build + run: | + cmake --build build --config Release diff --git a/.gitignore b/.gitignore index 94f41a10..339160ca 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ Source/tmp *.cia *.3dsx /debug/ +/vcpkg_installed/ diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json new file mode 100644 index 00000000..e5267885 --- /dev/null +++ b/vcpkg-configuration.json @@ -0,0 +1,14 @@ +{ + "default-registry": { + "kind": "git", + "baseline": "aa628ceb5f15f0c30d4d481f14fa5b2be2b4a658", + "repository": "https://github.com/microsoft/vcpkg" + }, + "registries": [ + { + "kind": "artifact", + "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip", + "name": "microsoft" + } + ] +} diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 00000000..244bace4 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,9 @@ +{ + "dependencies": [ + "zlib", + "glew", + "libpng", + "sdl2", + "sdl2-ttf" + ] +}