diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea0714e..050fd88 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,9 +66,10 @@ jobs: --triplet "x64-windows" ` --vcpkg-root $vcpkgPath ` --x-manifest-root="$PWD\" ` - --x-install-root="$PWD\vcpkg_installed\" + --x-install-root="$PWD\vcpkg_installed\x64-windows" ls ls vcpkg_installed/x64-windows + ls vcpkg_installed/x64-windows/x64-windows - name: build-msvc run: | devenv.com "MissionEditor.sln" /Build "${{ env.CONFIGURATION }}|x64" /project MissionEditor diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index e69292f..84be03f 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -51,10 +51,10 @@ jobs: --triplet "x64-windows" ` --vcpkg-root $vcpkgPath ` --x-manifest-root="$PWD\" ` - --x-install-root="$PWD\vcpkg_installed\" + --x-install-root="$PWD\vcpkg_installed\x64-windows" ls - ls vcpkg_installed/x64-windows - ls vcpkg_installed/x64-windows/include + ls vcpkg_installed/x64-windows/x64-windows + ls vcpkg_installed/x64-windows/x64-windows/include - name: Build Main Program (MSVC) run: | devenv.com "MissionEditor.sln" /Build "${{ env.CONFIGURATION }}|x64" /project MissionEditor diff --git a/MissionEditor/PropertySheets/Common.props b/MissionEditor/PropertySheets/Common.props index 1972aa8..5f2b89c 100644 --- a/MissionEditor/PropertySheets/Common.props +++ b/MissionEditor/PropertySheets/Common.props @@ -7,7 +7,7 @@ True - $(MSBuildThisFileDirectory)..\..\3rdParty\xcc + $(SolutionDir)\3rdParty\xcc diff --git a/MissionEditor/PropertySheets/Debug.props b/MissionEditor/PropertySheets/Debug.props index fdaee8a..164db96 100644 --- a/MissionEditor/PropertySheets/Debug.props +++ b/MissionEditor/PropertySheets/Debug.props @@ -4,7 +4,8 @@ - $(XccDir)\vcpkg_installed\$(Platform)-windows + + $(XccDir)\vcpkg_installed\$(Platform)-windows\$(Platform)-windows $(XccVcpkgDirTriplet)\debug $(SolutionDir)$(Platform)\Debug Debug diff --git a/MissionEditor/PropertySheets/Release.props b/MissionEditor/PropertySheets/Release.props index d85cb07..38446d1 100644 --- a/MissionEditor/PropertySheets/Release.props +++ b/MissionEditor/PropertySheets/Release.props @@ -4,7 +4,8 @@ - $(XccDir)\vcpkg_installed\$(Platform)-windows + + $(XccDir)\vcpkg_installed\$(Platform)-windows\$(Platform)-windows $(XccVcpkgDirTriplet) $(SolutionDir)$(Platform)\Release Release