Skip to content

Add vcpkg support for VS, delete unneeded files #796

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

Open
svew wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add vcpkg support for VS, delete unneeded files #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4fce1db
Delete VS/ folder
svew Oct 2, 2023
5703cd6
Add vcpkg.json, many build organizations and fixes
svew Oct 3, 2023
ab67025
Deleted imgui hard copy, replaced with package install
svew Oct 3, 2023
b3561fc
More build changes
svew Oct 4, 2023
c5c791b
commit
svew Oct 4, 2023
7fe7862
undo game.cpp change
svew Oct 4, 2023
38042cf
undo init.cpp change
svew Oct 4, 2023
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
8 changes: 7 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,10 @@ steam_appid.txt
xcode/Barony/Barony.xcodeproj/project.xcworkspace/*
xcode/Barony/Barony.xcodeproj/xcuserdata/*
*.ps1
!LICENSE.nativefiledialog.txt
!LICENSE.nativefiledialog.txt
vcpkg_installed/
*.ilk
*.sdf
.VSCodeCounter
*.map
/build/*
2 changes: 1 addition & 1 deletion VS-includes/Config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

//#define STEAMWORKS

#define USE_FMOD
//#define USE_FMOD

#define EDITOR_EXE_NAME "editor"

Expand Down
11 changes: 11 additions & 0 deletions VS.2015/.vs/Barony/project-colors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"Version": 1,
"ProjectMap": {
"a2fe74e1-b743-11d0-ae1a-00a0c90fffc3": {
"ProjectGuid": "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3",
"DisplayName": "Miscellaneous Files",
"ColorIndex": -1
}
},
"NextColorIndex": 0
}
Binary file removed VS.2015/Barony.sdf
View file
Open in desktop
Binary file not shown.
Binary file removed VS.2015/Barony/Barony.sdf
View file
Open in desktop
Binary file not shown.
1,804 changes: 496 additions & 1,308 deletions VS.2015/Barony/Barony.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 3 additions & 57 deletions VS.2015/Barony/Barony.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@
<Filter Include="Source Files\engine\audio">
<UniqueIdentifier>{c52b06e4-fd42-4bf6-9f24-3a747e841cab}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\imgui">
<UniqueIdentifier>{0259fbef-0f26-4925-b7b1-08639111a69b}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\imgui">
<UniqueIdentifier>{0fe96c5c-85fb-48ef-a9a3-a6b0a97788fd}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\actarrow.cpp">
Expand Down Expand Up @@ -462,27 +456,6 @@
<ClCompile Include="..\..\src\input.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui\imgui.cpp">
<Filter>Source Files\imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui\imgui_demo.cpp">
<Filter>Source Files\imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui\imgui_draw.cpp">
<Filter>Source Files\imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui\imgui_impl_opengl3.cpp">
<Filter>Source Files\imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui\imgui_impl_sdl.cpp">
<Filter>Source Files\imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui\imgui_tables.cpp">
<Filter>Source Files\imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui\imgui_widgets.cpp">
<Filter>Source Files\imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\src\shader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -632,36 +605,6 @@
<ClInclude Include="..\..\src\init.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imconfig.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imgui.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imgui_impl_opengl2.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imgui_impl_opengl3.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imgui_impl_opengl3_loader.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imgui_impl_sdl.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imgui_internal.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imstb_rectpack.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imstb_textedit.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui\imstb_truetype.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\src\shader.hpp">
<Filter>Header Files</Filter>
</ClInclude>
Expand All @@ -676,4 +619,7 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\vcpkg.json" />
</ItemGroup>
</Project>
28 changes: 0 additions & 28 deletions VS/Barony.sln
View file
Open in desktop

This file was deleted.

Binary file removed VS/Barony/Barony.sdf
View file
Open in desktop
Binary file not shown.
216 changes: 0 additions & 216 deletions VS/Barony/Barony.vcxproj
View file
Open in desktop

This file was deleted.

Loading