Skip to content

Commit e9825a7

Browse files
committed
update khook include path
1 parent 1a0c145 commit e9825a7

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

AMBuildScript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ class MMSPluginConfig(object):
292292
cxx.cxxincludes += [
293293
os.path.join(context.currentSourcePath),
294294
os.path.join(mms_core_path),
295-
os.path.join(mms_core_path, 'khook', 'include'),
295+
os.path.join(self.mms_root, 'third_party', 'khook', 'include'),
296296
]
297297

298298
defines = []

CS2Fixes.vcxproj

Lines changed: 2 additions & 2 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/khook/include;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
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)/third_party/khook/include;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/khook/include;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
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)/third_party/khook/include;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>

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ RUN apt update && apt install -y clang-16
66
RUN ln -sf /usr/bin/clang-16 /usr/bin/clang && ln -sf /usr/bin/clang++-16 /usr/bin/clang++
77
RUN git clone https://github.com/alliedmodders/ambuild
88
RUN cd ambuild && python setup.py install && cd ..
9-
RUN git clone -b k/sourcehook_alternative https://github.com/alliedmodders/metamod-source
10-
# no recursive submodules, steamrt3 doesn't support ssh checkout
11-
RUN cd metamod-source && git submodule update --init && cd ..
9+
RUN git clone --recurse-submodules -b k/sourcehook_alternative https://github.com/alliedmodders/metamod-source
1210
RUN git config --global --add safe.directory /app
1311

1412
COPY ./docker-entrypoint.sh ./

0 commit comments

Comments
 (0)