Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove ObjectCreator from main cdda solution #61274

Merged
merged 1 commit into from
Sep 27, 2022
Merged

Remove ObjectCreator from main cdda solution #61274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/msvc-full-features.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ jobs:

- name: Build
run: |
cd msvc-full-features
msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:Cataclysm-vcpkg-static;Cataclysm-test-vcpkg-static;JsonFormatter-vcpkg-static;ObjectCreator-vcpkg-static" Cataclysm-vcpkg-static.sln
msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:Cataclysm-vcpkg-static;Cataclysm-test-vcpkg-static;JsonFormatter-vcpkg-static" msvc-full-features/Cataclysm-vcpkg-static.sln
msbuild -m -p:Configuration=Release -p:Platform=x64 "-target:ObjectCreator-vcpkg-static" msvc-object_creator/ObjectCreator-vcpkg-static.sln

- name: Post-build ccache manipulation
if: ${{ !failure() }}
Expand Down
18 changes: 0 additions & 18 deletions msvc-full-features/Cataclysm-vcpkg-static.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonFormatter-vcpkg-static"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonFormatter-lib-vcpkg-static", "JsonFormatter-lib-vcpkg-static.vcxproj", "{534A4E38-96A1-40E4-BDA7-8D17607F0270}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ObjectCreator-vcpkg-static", "..\msvc-object_creator\ObjectCreator-vcpkg-static.vcxproj", "{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flatbuffers", "flatbuffers.vcxproj", "{8A533A64-435D-4D4F-9FF0-1E97AACE9374}"
EndProject
Global
Expand Down Expand Up @@ -120,22 +118,6 @@ Global
{534A4E38-96A1-40E4-BDA7-8D17607F0270}.Release-NoTiles|x64.Build.0 = Release|x64
{534A4E38-96A1-40E4-BDA7-8D17607F0270}.Release-NoTiles|x86.ActiveCfg = Release|Win32
{534A4E38-96A1-40E4-BDA7-8D17607F0270}.Release-NoTiles|x86.Build.0 = Release|Win32
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Debug|x64.ActiveCfg = Debug|x64
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Debug|x64.Build.0 = Debug|x64
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Debug|x86.ActiveCfg = Debug|Win32
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Debug|x86.Build.0 = Debug|Win32
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Debug-NoTiles|x64.ActiveCfg = Debug|x64
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Debug-NoTiles|x64.Build.0 = Debug|x64
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Debug-NoTiles|x86.ActiveCfg = Debug|Win32
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Debug-NoTiles|x86.Build.0 = Debug|Win32
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Release|x64.ActiveCfg = Release|x64
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Release|x64.Build.0 = Release|x64
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Release|x86.ActiveCfg = Release|Win32
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Release|x86.Build.0 = Release|Win32
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Release-NoTiles|x64.ActiveCfg = Release|x64
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Release-NoTiles|x64.Build.0 = Release|x64
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Release-NoTiles|x86.ActiveCfg = Release|Win32
{EC6E05EB-8EE1-4D16-914E-F8DA029E5F50}.Release-NoTiles|x86.Build.0 = Release|Win32
{8A533A64-435D-4D4F-9FF0-1E97AACE9374}.Debug|x64.ActiveCfg = Debug|x64
{8A533A64-435D-4D4F-9FF0-1E97AACE9374}.Debug|x64.Build.0 = Debug|x64
{8A533A64-435D-4D4F-9FF0-1E97AACE9374}.Debug|x86.ActiveCfg = Debug|Win32
Expand Down