From 4f16d92ba37f881988dc2b72cdd4f3958bb6cc0d Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 17 Sep 2023 00:54:40 -0500 Subject: [PATCH] Update stb to 5736b15 (Jan 29 2023) --- external/stb | 2 +- scwx-qt/source/scwx/qt/external/stb_image.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/external/stb b/external/stb index 8b5f1f37..5736b15f 160000 --- a/external/stb +++ b/external/stb @@ -1 +1 @@ -Subproject commit 8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55 +Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9 diff --git a/scwx-qt/source/scwx/qt/external/stb_image.cpp b/scwx-qt/source/scwx/qt/external/stb_image.cpp index b2c73443..f611b488 100644 --- a/scwx-qt/source/scwx/qt/external/stb_image.cpp +++ b/scwx-qt/source/scwx/qt/external/stb_image.cpp @@ -7,8 +7,16 @@ # pragma GCC diagnostic ignored "-Wunused-but-set-variable" #endif +#if defined(_MSC_VER) +# pragma warning(push, 0) +#endif + #include #if defined(__GNUC__) # pragma GCC diagnostic pop #endif + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif