From 9dcdcf68f6a60741cbdd287e7eda23b4a21a080e Mon Sep 17 00:00:00 2001 From: rtk0c Date: Sat, 19 Feb 2022 13:30:03 -0800 Subject: Fix build errors and update all dependencies to latest version - Fixed doctest executable not compiling - Fixed class accessibility error in Workflow_Main.cpp - Fixed selection of OpenGL loader in imgui OpenGL 2 & 3 backends - All loading is handled in our code now, the imgui_*_backend.cpp files are instructed to do nothing --- core/src/Entrypoint/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'core/src/Entrypoint/main.cpp') diff --git a/core/src/Entrypoint/main.cpp b/core/src/Entrypoint/main.cpp index 5ed7d84..abfb26c 100644 --- a/core/src/Entrypoint/main.cpp +++ b/core/src/Entrypoint/main.cpp @@ -96,6 +96,7 @@ static std::unique_ptr CreateBackend(std::string_view option) } } +#ifdef DOCTEST_CONFIG_DISABLE int main(int argc, char* argv[]) { argparse::ArgumentParser parser; @@ -156,3 +157,7 @@ int main(int argc, char* argv[]) return 0; } +#else +# define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN +# include +#endif -- cgit v1.2.3-70-g09d2