From d34eaf0b090aed5d6f9bd47c1d763f1a96ac2da9 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Tue, 27 Aug 2024 13:28:43 +0200 Subject: [PATCH] Fixed compiling on Linux without MOC --- neo/cmake-linux-release.sh | 2 +- neo/renderer/RenderProgs.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/neo/cmake-linux-release.sh b/neo/cmake-linux-release.sh index 781f969f..bbc8757e 100755 --- a/neo/cmake-linux-release.sh +++ b/neo/cmake-linux-release.sh @@ -2,4 +2,4 @@ cd .. rm -rf build mkdir build cd build -cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DONATIVE=ON -DFFMPEG=OFF -DBINKDEC=ON ../neo +cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DONATIVE=ON -DFFMPEG=OFF -DBINKDEC=ON -DUSE_PRECOMPILED_HEADERS=OFF -DUSE_INTRINSICS_SSE=OFF ../neo diff --git a/neo/renderer/RenderProgs.h b/neo/renderer/RenderProgs.h index e196ecbc..6abe6d9a 100644 --- a/neo/renderer/RenderProgs.h +++ b/neo/renderer/RenderProgs.h @@ -989,12 +989,12 @@ public: // the rpEnableSkinning render parm should only be set for vertex programs that use it bool ShaderHasOptionalSkinning() const { -#if defined( USE_NVRHI ) +//#if defined( USE_NVRHI ) // FIXME return false; -#else - return renderProgs[current].optionalSkinning; -#endif +//#else +// return renderProgs[current].optionalSkinning; +//#endif } // unbind the currently bound render program