From 3573bd5de45d85efeb6a69c1085b304450fcf274 Mon Sep 17 00:00:00 2001 From: Gordon McCann Date: Wed, 26 Jan 2022 11:45:34 -0500 Subject: [PATCH] Fixed some minor issues with semantics and header locations for asio --- Navigator/src/Navigator/Editor/SourceDialog.cpp | 4 ++-- Navigator/src/Navigator/Physics/CompassOnlineSource.h | 4 ++-- premake5.lua | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Navigator/src/Navigator/Editor/SourceDialog.cpp b/Navigator/src/Navigator/Editor/SourceDialog.cpp index a17fd8c..735af20 100644 --- a/Navigator/src/Navigator/Editor/SourceDialog.cpp +++ b/Navigator/src/Navigator/Editor/SourceDialog.cpp @@ -58,7 +58,7 @@ namespace Navigator { { m_fileDialog.SetOpenDirDialog(true); } - auto& temp = m_fileDialog.ImGuiRenderOpenDir(); + auto temp = m_fileDialog.ImGuiRenderOpenDir(); if (temp != "") m_chosenLocation = temp; } @@ -79,4 +79,4 @@ namespace Navigator { } } -} \ No newline at end of file +} diff --git a/Navigator/src/Navigator/Physics/CompassOnlineSource.h b/Navigator/src/Navigator/Physics/CompassOnlineSource.h index a63ac86..584145b 100644 --- a/Navigator/src/Navigator/Physics/CompassOnlineSource.h +++ b/Navigator/src/Navigator/Physics/CompassOnlineSource.h @@ -2,7 +2,7 @@ #define COMPASS_ONLINE_SOURCE_H #include "DataSource.h" -#include "asio/include/asio.hpp" +#include "asio.hpp" namespace Navigator { @@ -31,4 +31,4 @@ namespace Navigator { } -#endif \ No newline at end of file +#endif diff --git a/premake5.lua b/premake5.lua index 1febdf8..913476d 100644 --- a/premake5.lua +++ b/premake5.lua @@ -16,7 +16,7 @@ IncludeDirs["ImGui"] = "Navigator/vendor/imgui" IncludeDirs["glad"] = "Navigator/vendor/glad/include" IncludeDirs["ImPlot"] = "Navigator/vendor/implot" IncludeDirs["glm"] = "Navigator/vendor/glm" -IncludeDirs["asio"] = "Navigator/vendor/asio" +IncludeDirs["asio"] = "Navigator/vendor/asio/asio/include" include "Navigator/vendor/glfw" include "Navigator/vendor/imgui"