From 1addf869ec4a1dd204896f3d42925c7b6ce82697 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 12 Mar 2024 12:37:41 +0300 Subject: [PATCH] msvc build fix --- CMakeLists.txt | 1 + src/frontend/debug_panel.cpp | 1 + src/logic/PlayerController.cpp | 6 +++--- src/logic/scripting/lua/libaudio.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82a81fec..fadedd5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,6 +91,7 @@ if (WIN32) find_package(glm REQUIRED) find_package(vorbis REQUIRED) set(PNGLIB spng::spng) + set(VORBISLIB Vorbis::vorbis Vorbis::vorbisfile) else() find_package(Lua REQUIRED) set(PNGLIB spng) diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index bb41880b..9d8ef444 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -1,5 +1,6 @@ #include #include +#include #include "gui/controls.h" #include "../audio/audio.h" diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 0c0daca4..4c5ad80a 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -1,3 +1,6 @@ +#define _USE_MATH_DEFINES +#include + #include "PlayerController.h" #include "../objects/Player.h" @@ -20,9 +23,6 @@ #include "../core_defs.h" -#define _USE_MATH_DEFINES -#include - const float CAM_SHAKE_OFFSET = 0.025f; const float CAM_SHAKE_OFFSET_Y = 0.031f; const float CAM_SHAKE_SPEED = 1.75f; diff --git a/src/logic/scripting/lua/libaudio.cpp b/src/logic/scripting/lua/libaudio.cpp index 45fcd99f..66a52f1e 100644 --- a/src/logic/scripting/lua/libaudio.cpp +++ b/src/logic/scripting/lua/libaudio.cpp @@ -65,7 +65,7 @@ inline audio::speakerid_t play_stream( if (channel == -1) return 0; auto paths = scripting::engine->getResPaths(); - fs::path file = paths->find(fs::path(filename)); + fs::path file = paths->find(filename); return audio::play_stream( file, glm::vec3(