diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c099f6a..a781721 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -94,7 +94,7 @@ jobs: - name: Upload Windows artifact uses: actions/upload-artifact@v4 with: - name: RayTrace-wwindows + name: RayTrace-windows path: build/addons release: diff --git a/docker/Dockerfile b/docker/Dockerfile index fd61869..152fee3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,14 +2,9 @@ FROM registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest 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 \ build-essential \ + g++ \ cmake \ ninja-build \ git \ diff --git a/src/Plugin.cpp b/src/Plugin.cpp index b9b5d31..bc65dba 100644 --- a/src/Plugin.cpp +++ b/src/Plugin.cpp @@ -66,7 +66,9 @@ namespace RayTracePlugin if (!shared::g_pGameResourceServiceServer) return false; + Log::Init(); Tasks::Init(); + auto gamedata_path = std::string(Paths::GetRootDirectory() + "/gamedata.json"); shared::g_pGameConfig = new CGameConfig(gamedata_path); char conf_error[255] = ""; diff --git a/src/path.h b/src/path.h index de25a55..ab82ea8 100644 --- a/src/path.h +++ b/src/path.h @@ -20,7 +20,7 @@ namespace RayTracePlugin::Paths { 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 Tier0Path() { return GameDirectory() + "../bin/linuxsteamrt64/libtier0.so"; } inline std::string ServerPath() { return GameDirectory() + "/bin/linuxsteamrt64/libserver.so"; } diff --git a/vendor/khook b/vendor/khook index 776fdb2..09d46ff 160000 --- a/vendor/khook +++ b/vendor/khook @@ -1 +1 @@ -Subproject commit 776fdb2eb8553462f2c1ab3df2d2d2a59724b3f2 +Subproject commit 09d46ffb743f5659b3d497228843a8aa7fcf883f