From f83b0d93f106c46481a90c3728f9e2cecd70a767 Mon Sep 17 00:00:00 2001 From: Jimi Huotari Date: Wed, 16 Aug 2023 16:29:26 +0300 Subject: [PATCH] UI: Fix compiling without nlohmann JSON After commit 89553386247, 'UI/update/models/whatsnew.hpp' is included unconditionally, even with 'ENABLE_WHATSNEW=OFF', which breaks building OBS Studio without nlohmann JSON. --- UI/window-basic-main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index a7579654c..9e811faef 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -84,6 +84,10 @@ #include "windows.h" #endif +#ifdef WHATSNEW_ENABLED +#include "update/models/whatsnew.hpp" +#endif + #if !defined(_WIN32) && defined(WHATSNEW_ENABLED) #include "update/shared-update.hpp" #endif @@ -97,8 +101,6 @@ #include -#include "update/models/whatsnew.hpp" - #ifdef ENABLE_WAYLAND #include #endif