From c2eec1f22e0c8d31deb1c018720caea858c6e482 Mon Sep 17 00:00:00 2001 From: Tim <72736935+TLTimeplex@users.noreply.github.com> Date: Mon, 3 Jul 2023 16:59:28 +0200 Subject: [PATCH] Fix for windows users --- .clang-format | 6 ++---- .gitignore | 3 ++- src/lib/src/context.cpp | 2 +- src/lib/src/renderer.cpp | 2 ++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.clang-format b/.clang-format index 1254c0b..5ebe470 100644 --- a/.clang-format +++ b/.clang-format @@ -1,10 +1,8 @@ ---- # We'll use defaults from the LLVM style, but with 4 columns indentation. BasedOnStyle: LLVM IndentWidth: 4 ---- + Language: Cpp # Force pointers to the type for C++. DerivePointerAlignment: false -PointerAlignment: Left ---- \ No newline at end of file +PointerAlignment: Left \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1899660..ad0a7b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ build -.vscode \ No newline at end of file +.vscode +/.vs diff --git a/src/lib/src/context.cpp b/src/lib/src/context.cpp index b31c9af..031ca07 100644 --- a/src/lib/src/context.cpp +++ b/src/lib/src/context.cpp @@ -84,7 +84,7 @@ Rectangle Context::viewport() const { return impl_->viewport(); } void Context::clear() { impl_->clear(); } -u_int32_t Context::get_error() const { return impl_->get_error(); } +uint32_t Context::get_error() const { return impl_->get_error(); } RGBA Context::clearcolor() const { return impl_->clear_color_; } diff --git a/src/lib/src/renderer.cpp b/src/lib/src/renderer.cpp index eccb289..226e188 100644 --- a/src/lib/src/renderer.cpp +++ b/src/lib/src/renderer.cpp @@ -33,6 +33,8 @@ #include #include +#undef max + namespace paradiso { struct Renderer::impl {