Fix: fix crash on plugin start with no spdlog loaded
This commit is contained in:
parent
4b95ba9d36
commit
65ee9c0ce2
5 changed files with 6 additions and 9 deletions
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
|
|
@ -94,7 +94,7 @@ jobs:
|
||||||
- name: Upload Windows artifact
|
- name: Upload Windows artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: RayTrace-wwindows
|
name: RayTrace-windows
|
||||||
path: build/addons
|
path: build/addons
|
||||||
|
|
||||||
release:
|
release:
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,9 @@ FROM registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-21 main" >> /etc/apt/sources.list.d/llvm.list
|
|
||||||
RUN echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-21 main" >> /etc/apt/sources.list.d/llvm.list
|
|
||||||
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
|
||||||
RUN apt update && apt install -y clang-21
|
|
||||||
RUN ln -sf /usr/bin/clang-21 /usr/bin/clang && ln -sf /usr/bin/clang++-21 /usr/bin/clang++
|
|
||||||
|
|
||||||
RUN apt update && apt install -y \
|
RUN apt update && apt install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
|
g++ \
|
||||||
cmake \
|
cmake \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
git \
|
git \
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,9 @@ namespace RayTracePlugin
|
||||||
if (!shared::g_pGameResourceServiceServer)
|
if (!shared::g_pGameResourceServiceServer)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
Log::Init();
|
||||||
Tasks::Init();
|
Tasks::Init();
|
||||||
|
|
||||||
auto gamedata_path = std::string(Paths::GetRootDirectory() + "/gamedata.json");
|
auto gamedata_path = std::string(Paths::GetRootDirectory() + "/gamedata.json");
|
||||||
shared::g_pGameConfig = new CGameConfig(gamedata_path);
|
shared::g_pGameConfig = new CGameConfig(gamedata_path);
|
||||||
char conf_error[255] = "";
|
char conf_error[255] = "";
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ namespace RayTracePlugin::Paths {
|
||||||
return gameDirectory;
|
return gameDirectory;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::string GetRootDirectory() { return GameDirectory() + "/addons/RayTracePlugin"; }
|
inline std::string GetRootDirectory() { return GameDirectory() + "/addons/RayTrace"; }
|
||||||
inline std::string EnginePath() { return GameDirectory() + "../bin/linuxsteamrt64/libengine2.so"; }
|
inline std::string EnginePath() { return GameDirectory() + "../bin/linuxsteamrt64/libengine2.so"; }
|
||||||
inline std::string Tier0Path() { return GameDirectory() + "../bin/linuxsteamrt64/libtier0.so"; }
|
inline std::string Tier0Path() { return GameDirectory() + "../bin/linuxsteamrt64/libtier0.so"; }
|
||||||
inline std::string ServerPath() { return GameDirectory() + "/bin/linuxsteamrt64/libserver.so"; }
|
inline std::string ServerPath() { return GameDirectory() + "/bin/linuxsteamrt64/libserver.so"; }
|
||||||
|
|
|
||||||
2
vendor/khook
vendored
2
vendor/khook
vendored
|
|
@ -1 +1 @@
|
||||||
Subproject commit 776fdb2eb8553462f2c1ab3df2d2d2a59724b3f2
|
Subproject commit 09d46ffb743f5659b3d497228843a8aa7fcf883f
|
||||||
Loading…
Add table
Add a link
Reference in a new issue