Skip to content

SourceMod SDK: introduction into Valve memory system #1689

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SourceMod SDK: introduction into Valve memory system #1689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc01259
SourceMod SDK: introduction into Valve memory system
Wend4r Dec 30, 2021
d4622e7
Add memoverride.cpp source to Core
Wend4r Jan 7, 2022
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: 4 additions & 0 deletions core/AMBuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ for sdk_name in SM.sdks:
binary.sources += pb_sources
binary.compiler.cxxdefines += ['PROTOBUF_ENABLE']

# Instead of using the external SourceMod SDK.
if cxx.target.platform in ['linux', 'mac']:
binary.sources += [os.path.join(sdk.path, 'public', 'tier0', 'memoverride.cpp')]

if cxx.target.platform == 'mac' and sdk.name in ['csgo']:
# We need a proxy library since the game uses libstdc++.
pb_binary = SM.HL2Library(builder, cxx, 'pbproxy.' + sdk.ext, sdk)
Expand Down
9 changes: 6 additions & 3 deletions public/smsdk_ext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,9 @@ bool SDKExtension::SDK_OnMetamodPauseChange(bool paused, char *error, size_t max

#endif

#if defined(__linux__) || defined(__APPLE__)
/* Overload a few things to prevent libstdc++ linking */
#if defined __linux__ || defined __APPLE__
#if !defined(SOURCE_ENGINE) || defined(NO_MALLOC_OVERRIDE) || defined(META_NO_HL2SDK)
extern "C" void __cxa_pure_virtual(void)
{
}
Expand All @@ -499,5 +500,7 @@ void operator delete[](void * ptr)
{
free(ptr);
}
#endif

#else
#include <tier0/memoverride.cpp>
#endif // !defined(SOURCE_ENGINE) || defined(NO_MALLOC_OVERRIDE) || defined(META_NO_HL2SDK)
#endif // defined(__linux__) || defined(__APPLE__)