diff --git a/src/ModMan/Web/Edge/AssetHandlerEdge.cpp b/src/ModMan/Web/Edge/AssetHandlerEdge.cpp index 9f57d808..a1e7b4b8 100644 --- a/src/ModMan/Web/Edge/AssetHandlerEdge.cpp +++ b/src/ModMan/Web/Edge/AssetHandlerEdge.cpp @@ -1,12 +1,12 @@ #include "AssetHandlerEdge.h" +#if defined(WEBVIEW_PLATFORM_WINDOWS) && defined(WEBVIEW_EDGE) + #pragma warning(push, 0) #include #include #pragma warning(pop) -#if defined(WEBVIEW_PLATFORM_WINDOWS) && defined(WEBVIEW_EDGE) - #include "Web/UiAssets.h" #include diff --git a/src/ModMan/Web/Edge/AssetHandlerEdge.h b/src/ModMan/Web/Edge/AssetHandlerEdge.h index 8d7f3ad4..5154ff63 100644 --- a/src/ModMan/Web/Edge/AssetHandlerEdge.h +++ b/src/ModMan/Web/Edge/AssetHandlerEdge.h @@ -1,8 +1,6 @@ #pragma once -#pragma warning(push, 0) #include -#pragma warning(pop) #if defined(WEBVIEW_PLATFORM_WINDOWS) && defined(WEBVIEW_EDGE) diff --git a/src/ModMan/Web/Gtk/AssetHandlerGtk.cpp b/src/ModMan/Web/Gtk/AssetHandlerGtk.cpp index 1aaaacce..e02cc85f 100644 --- a/src/ModMan/Web/Gtk/AssetHandlerGtk.cpp +++ b/src/ModMan/Web/Gtk/AssetHandlerGtk.cpp @@ -1,21 +1,18 @@ #include "AssetHandlerGtk.h" -#pragma warning(push, 0) +#if defined(WEBVIEW_PLATFORM_LINUX) && defined(WEBVIEW_GTK) + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include #include -#pragma warning(pop) - -#if defined(WEBVIEW_PLATFORM_LINUX) && defined(WEBVIEW_GTK) +#pragma GCC diagnostic pop #include "Web/UiAssets.h" #include #include -#define G_SPAWN_ERROR g_spawn_error_quark() - -G_DEFINE_QUARK(g - spawn - error - quark, g_spawn_error) - namespace { std::unordered_map assetLookup; diff --git a/src/ModMan/Web/Gtk/AssetHandlerGtk.h b/src/ModMan/Web/Gtk/AssetHandlerGtk.h index c104e10f..6f41d01f 100644 --- a/src/ModMan/Web/Gtk/AssetHandlerGtk.h +++ b/src/ModMan/Web/Gtk/AssetHandlerGtk.h @@ -1,14 +1,13 @@ #pragma once -#pragma warning(push, 0) #include -#pragma warning(pop) #if defined(WEBVIEW_PLATFORM_LINUX) && defined(WEBVIEW_GTK) -#pragma warning(push, 0) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include -#pragma warning(pop) +#pragma GCC diagnostic pop namespace gtk { diff --git a/src/ModMan/main.cpp b/src/ModMan/main.cpp index ae3b0fca..76baa46b 100644 --- a/src/ModMan/main.cpp +++ b/src/ModMan/main.cpp @@ -1,6 +1,17 @@ -#pragma warning(push, 0) +#ifdef _MSC_VER +#pragma warning(push, 0) +#else +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + #include "webview/webview.h" + +#ifdef _MSC_VER #pragma warning(pop) +#else +#pragma GCC diagnostic pop +#endif #include "Web/Edge/AssetHandlerEdge.h" #include "Web/Gtk/AssetHandlerGtk.h" @@ -41,7 +52,13 @@ namespace { try { - webview::webview w(true, nullptr); + webview::webview w( +#ifdef _DEBUG + true, +#else + false, +#endif + nullptr); w.set_title("OpenAssetTools ModMan"); w.set_size(1280, 640, WEBVIEW_HINT_NONE); w.set_size(480, 320, WEBVIEW_HINT_MIN);