Merge branch 'master' into opus

# Conflicts: # eax/eax.h # premake5.lua # src/audio/oal/stream.cpp
2020-05-24 00:45:45 +03:00
parent 97b058d0fa ac208ce02c
commit bd67db523a
21 changed files with 382 additions and 383 deletions
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -1,7 +1,7 @@
-#include "stream.h"
+#include "common.h"

 #ifdef AUDIO_OAL
-#include "common.h"
+#include "stream.h"
 #include "sampman.h"

 #ifdef AUDIO_OPUS