Skip to content

Commit 262d123

Browse files
Vaufftilgep
authored andcommitted
Update VS solution to use AMBuild protobufs to avoid duplication
This does mean that setting up a dev environment now requires running at least one build through AMBuild, to generate the protobuf headers for Visual Studio to use
1 parent cbe0b41 commit 262d123

File tree

124 files changed

+25
-714355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+25
-714355
lines changed

CS2Fixes.vcxproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<PrecompiledHeader>NotUsing</PrecompiledHeader>
125125
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
126126
<LanguageStandard>stdcpp20</LanguageStandard>
127-
<AdditionalIncludeDirectories>protobuf/generated;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;$(MMSOURCE112)/core;$(MMSOURCE112)/core/sourcehook;$(MMSOURCE_DEV)/core;$(MMSOURCE_DEV)/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127+
<AdditionalIncludeDirectories>build/cs2fixes.cs2/windows-x86_64;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;$(MMSOURCE112)/core;$(MMSOURCE112)/core/sourcehook;$(MMSOURCE_DEV)/core;$(MMSOURCE_DEV)/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
128128
<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
129129
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
130130
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -150,7 +150,7 @@
150150
<PrecompiledHeader>NotUsing</PrecompiledHeader>
151151
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
152152
<LanguageStandard>stdcpp20</LanguageStandard>
153-
<AdditionalIncludeDirectories>protobuf/generated;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;$(MMSOURCE112)/core;$(MMSOURCE112)/core/sourcehook;$(MMSOURCE_DEV)/core;$(MMSOURCE_DEV)/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
153+
<AdditionalIncludeDirectories>build/cs2fixes.cs2/windows-x86_64;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;$(MMSOURCE112)/core;$(MMSOURCE112)/core/sourcehook;$(MMSOURCE_DEV)/core;$(MMSOURCE_DEV)/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
154154
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
155155
<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
156156
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -169,17 +169,17 @@
169169
</ItemDefinitionGroup>
170170
<ItemGroup>
171171
<ClCompile Include="src\buttonwatch.cpp" />
172-
<ClCompile Include="protobuf\generated\cs_usercmd.pb.cc" />
173-
<ClCompile Include="protobuf\generated\networkbasetypes.pb.cc" />
174-
<ClCompile Include="protobuf\generated\network_connection.pb.cc" />
175-
<ClCompile Include="protobuf\generated\usercmd.pb.cc" />
176-
<ClCompile Include="protobuf\generated\usermessages.pb.cc" />
177-
<ClCompile Include="protobuf\generated\cstrike15_gcmessages.pb.cc" />
178-
<ClCompile Include="protobuf\generated\cstrike15_usermessages.pb.cc" />
179-
<ClCompile Include="protobuf\generated\gcsdk_gcmessages.pb.cc" />
180-
<ClCompile Include="protobuf\generated\engine_gcmessages.pb.cc" />
181-
<ClCompile Include="protobuf\generated\netmessages.pb.cc" />
182-
<ClCompile Include="protobuf\generated\steammessages.pb.cc" />
172+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cs_usercmd.pb.cc" />
173+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\networkbasetypes.pb.cc" />
174+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\network_connection.pb.cc" />
175+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\usercmd.pb.cc" />
176+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\usermessages.pb.cc" />
177+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cstrike15_gcmessages.pb.cc" />
178+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cstrike15_usermessages.pb.cc" />
179+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\gcsdk_gcmessages.pb.cc" />
180+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\engine_gcmessages.pb.cc" />
181+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\netmessages.pb.cc" />
182+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\steammessages.pb.cc" />
183183
<ClCompile Include="sdk\entity2\entityidentity.cpp" />
184184
<ClCompile Include="sdk\entity2\entitykeyvalues.cpp" />
185185
<ClCompile Include="sdk\entity2\entitysystem.cpp" />

CS2Fixes.vcxproj.filters

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,37 +137,37 @@
137137
<ClCompile Include="src\panoramavote.cpp">
138138
<Filter>Source Files</Filter>
139139
</ClCompile>
140-
<ClCompile Include="protobuf\generated\usermessages.pb.cc">
140+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\usermessages.pb.cc">
141141
<Filter>Source Files\protobuf</Filter>
142142
</ClCompile>
143-
<ClCompile Include="protobuf\generated\cs_usercmd.pb.cc">
143+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cs_usercmd.pb.cc">
144144
<Filter>Source Files\protobuf</Filter>
145145
</ClCompile>
146-
<ClCompile Include="protobuf\generated\cstrike15_gcmessages.pb.cc">
146+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cstrike15_gcmessages.pb.cc">
147147
<Filter>Source Files\protobuf</Filter>
148148
</ClCompile>
149-
<ClCompile Include="protobuf\generated\cstrike15_usermessages.pb.cc">
149+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cstrike15_usermessages.pb.cc">
150150
<Filter>Source Files\protobuf</Filter>
151151
</ClCompile>
152-
<ClCompile Include="protobuf\generated\engine_gcmessages.pb.cc">
152+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\engine_gcmessages.pb.cc">
153153
<Filter>Source Files\protobuf</Filter>
154154
</ClCompile>
155-
<ClCompile Include="protobuf\generated\gcsdk_gcmessages.pb.cc">
155+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\gcsdk_gcmessages.pb.cc">
156156
<Filter>Source Files\protobuf</Filter>
157157
</ClCompile>
158-
<ClCompile Include="protobuf\generated\netmessages.pb.cc">
158+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\netmessages.pb.cc">
159159
<Filter>Source Files\protobuf</Filter>
160160
</ClCompile>
161-
<ClCompile Include="protobuf\generated\network_connection.pb.cc">
161+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\network_connection.pb.cc">
162162
<Filter>Source Files\protobuf</Filter>
163163
</ClCompile>
164-
<ClCompile Include="protobuf\generated\networkbasetypes.pb.cc">
164+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\networkbasetypes.pb.cc">
165165
<Filter>Source Files\protobuf</Filter>
166166
</ClCompile>
167-
<ClCompile Include="protobuf\generated\steammessages.pb.cc">
167+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\steammessages.pb.cc">
168168
<Filter>Source Files\protobuf</Filter>
169169
</ClCompile>
170-
<ClCompile Include="protobuf\generated\usercmd.pb.cc">
170+
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\usercmd.pb.cc">
171171
<Filter>Source Files\protobuf</Filter>
172172
</ClCompile>
173173
<ClCompile Include="sdk\public\tier0\memoverride.cpp">

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ambuild
5353

5454
#### Windows
5555

56-
Make sure to run in "x64 Native Tools Command Prompt for VS"
56+
Make sure to run in "x64 Native Tools Command Prompt for VS". Doing an initial build here is also required to setup the protobuf headers for Visual Studio to reference.
5757

5858
```bash
5959
set MMSOURCE_DEV=\path\to\metamod

0 commit comments

Comments
 (0)