diff options
author | rtk0c <[email protected]> | 2022-02-19 13:30:03 -0800 |
---|---|---|
committer | rtk0c <[email protected]> | 2022-02-19 13:30:03 -0800 |
commit | 9dcdcf68f6a60741cbdd287e7eda23b4a21a080e (patch) | |
tree | f5ff4c569607e1f63de9dd87bb7442e021b1f620 /core/src/Entrypoint/main.cpp | |
parent | 2599909052ef552efd5622bf73b60913e815b498 (diff) |
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
Diffstat (limited to 'core/src/Entrypoint/main.cpp')
-rw-r--r-- | core/src/Entrypoint/main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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<RenderingBackend> 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 <doctest/doctest.h> +#endif |