opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

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 19:43:46 +02:00
committed by Rodney
parent c8d95005c1
commit f83b0d93f1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main.cpp
+4 -2
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