4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fix compiling without nlohmann JSON

Browse source 
After commit 8955338624, 'UI/update/models/whatsnew.hpp' is included
unconditionally, even with 'ENABLE_WHATSNEW=OFF', which breaks
building OBS Studio without nlohmann JSON.
This commit is contained in:
Jimi Huotari 2023-08-16 16:29:26 +03:00 • committed by Rodney
commit f83b0d93f1
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
UI/window-basic-main.cpp
View file

@ -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 <QWindow>
#include "update/models/whatsnew.hpp"
#ifdef ENABLE_WAYLAND
#include <obs-nix-platform.h>
#endif