merge attempt

2020-12-19 03:21:04 +03:00
parent c17ccc50ab a080fbfbd4
commit 8d1996833b
68 changed files with 2149 additions and 316 deletions
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -10,13 +10,15 @@
 #ifdef _WIN32
 #pragma comment( lib, "libsndfile-1.lib" )
 #pragma comment( lib, "libmpg123-0.lib" )
-#else
-#include "crossplatform.h"
 #endif
 #include <sndfile.h>
 #include <mpg123.h>
 #endif

+#ifndef _WIN32
+#include "crossplatform.h"
+#endif
+
 #ifndef AUDIO_OPUS
 class CSndFile : public IDecoder
 {