Reduce MSVC Warnings (#135)

Mostly deal with that deprecated thingy from juce font. Sign.
surge-synthesizer · Nov 26, 2024 · 70aa8c9 · 70aa8c9
1 parent 55af8e4
commit 70aa8c9
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 206 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,21 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 option(SST_JUCEGUI_BUILD_EXAMPLES "Add targets for building and running sst-filters examples" FALSE)
 
 if (${SST_JUCEGUI_BUILD_EXAMPLES})
+    if (${PROJECT_IS_TOP_LEVEL})
+        if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+            message(STATUS "Including reduced MSVC warning flags")
+            add_compile_options(
+                    /wd4244   # convert float from double
+                    /wd4305   # truncate from double to float
+                    /wd4018   # signed unsigned compare
+                    /wd4996   # don't warn on stricmp vs _stricmp and other posix names
+                    /wd4267   # converting size_t <-> int
+                    /wd4005   # macro redefinition for nominmax
+                    /utf-8
+            )
+        endif ()
+    endif()
+
     message(STATUS "Including SST JUCEGUI Examples")
 
     if (NOT TARGET juce::juce_gui_basics)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,2 +1 @@
-add_subdirectory(component-demo)
-add_subdirectory(scxt-wireframes)
+add_subdirectory(component-demo)
diff --git a/examples/scxt-wireframes/CMakeLists.txt b/examples/scxt-wireframes/CMakeLists.txt
diff --git a/examples/scxt-wireframes/MainWindow.h b/examples/scxt-wireframes/MainWindow.h
diff --git a/examples/scxt-wireframes/SCXTWireframesMain.cpp b/examples/scxt-wireframes/SCXTWireframesMain.cpp
diff --git a/src/sst/jucegui/components/GlyphPainter.cpp b/src/sst/jucegui/components/GlyphPainter.cpp
@@ -100,11 +100,10 @@ void paintFromSvg(juce::Graphics &g, const juce::Rectangle<int> &into, const std
             auto res = juce::Drawable::createFromImageData(svg.data(), svg.size());
             dbls[path] = std::move(res);
         }
-        catch (std::exception &e)
+        catch (std::exception &)
         {
             g.setColour(juce::Colours::red);
             g.fillRect(into);
-            // oh well
         }
     }
 

diff --git a/src/sst/jucegui/style/StyleSheet.cpp b/src/sst/jucegui/style/StyleSheet.cpp
@@ -95,7 +95,17 @@ struct StyleSheetBuiltInImpl : public StyleSheet
                  const juce::Font &f) override
     {
         jassert(isValidPair(c, p));
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+
         fonts[c.cname][p.pname] = f;
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
     }
 
     void replaceFontsWithTypeface(const juce::Typeface::Ptr &p) override