Merge remote-tracking branch 'origin/master' into texture_rework

ZDoom · May 23, 2020 · 00acbac · 00acbac
2 parents 58b3cb0 + 3dfb417
commit 00acbac
Show file tree

Hide file tree

Showing 3 changed files with 573 additions and 370 deletions.
diff --git a/src/common/audio/music/music.cpp b/src/common/audio/music/music.cpp
@@ -37,7 +37,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <stdexcept>
 
 #include "i_sound.h"
 #include "i_music.h"

diff --git a/src/common/utility/files_decompress.cpp b/src/common/utility/files_decompress.cpp
@@ -39,6 +39,7 @@
 #include <zlib.h>
 #include <bzlib.h>
 #include <algorithm>
+#include <stdexcept>
 
 #include "files.h"
 #include "templates.h"