summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-22 17:00:18 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-22 17:01:09 +0200
commite858314a9f1c0adb0a8c2ec2dd1536e111932650 (patch)
treebd0b284bb62511623e7380ec32a1f3261e28606a /src
parentfixes for CPhysical and friends (diff)
downloadre3-e858314a9f1c0adb0a8c2ec2dd1536e111932650.tar
re3-e858314a9f1c0adb0a8c2ec2dd1536e111932650.tar.gz
re3-e858314a9f1c0adb0a8c2ec2dd1536e111932650.tar.bz2
re3-e858314a9f1c0adb0a8c2ec2dd1536e111932650.tar.lz
re3-e858314a9f1c0adb0a8c2ec2dd1536e111932650.tar.xz
re3-e858314a9f1c0adb0a8c2ec2dd1536e111932650.tar.zst
re3-e858314a9f1c0adb0a8c2ec2dd1536e111932650.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio/oal/channel.cpp4
-rw-r--r--src/audio/oal/channel.h1
-rw-r--r--src/audio/oal/oal_utils.cpp1
-rw-r--r--src/audio/oal/oal_utils.h1
-rw-r--r--src/audio/oal/stream.cpp8
-rw-r--r--src/audio/oal/stream.h1
-rw-r--r--src/core/config.h5
7 files changed, 7 insertions, 14 deletions
diff --git a/src/audio/oal/channel.cpp b/src/audio/oal/channel.cpp
index 6fe1d856..731e3581 100644
--- a/src/audio/oal/channel.cpp
+++ b/src/audio/oal/channel.cpp
@@ -1,7 +1,7 @@
-#include "channel.h"
+#include "common.h"
#ifdef AUDIO_OAL
-#include "common.h"
+#include "channel.h"
#include "sampman.h"
#ifndef _WIN32
diff --git a/src/audio/oal/channel.h b/src/audio/oal/channel.h
index 4dd09ca1..0c86bdc6 100644
--- a/src/audio/oal/channel.h
+++ b/src/audio/oal/channel.h
@@ -1,5 +1,4 @@
#pragma once
-#include "common.h"
#ifdef AUDIO_OAL
#include "oal/oal_utils.h"
diff --git a/src/audio/oal/oal_utils.cpp b/src/audio/oal/oal_utils.cpp
index 4119672f..e16de572 100644
--- a/src/audio/oal/oal_utils.cpp
+++ b/src/audio/oal/oal_utils.cpp
@@ -1,3 +1,4 @@
+#include "common.h"
#include "oal_utils.h"
#ifdef AUDIO_OAL
diff --git a/src/audio/oal/oal_utils.h b/src/audio/oal/oal_utils.h
index af45a944..b89ccf36 100644
--- a/src/audio/oal/oal_utils.h
+++ b/src/audio/oal/oal_utils.h
@@ -1,5 +1,4 @@
#pragma once
-#include "common.h"
#ifdef AUDIO_OAL
#include "eax.h"
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 5a9c7d7d..34518f54 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -1,11 +1,9 @@
-#include "stream.h"
+#include "common.h"
#ifdef AUDIO_OAL
-#include "common.h"
+#include "stream.h"
#include "sampman.h"
-#include <sndfile.h>
-#include <mpg123.h>
#ifdef _WIN32
typedef long ssize_t;
#pragma comment( lib, "libsndfile-1.lib" )
@@ -13,6 +11,8 @@ typedef long ssize_t;
#else
#include "crossplatform.h"
#endif
+#include <sndfile.h>
+#include <mpg123.h>
class CSndFile : public IDecoder
{
diff --git a/src/audio/oal/stream.h b/src/audio/oal/stream.h
index f1e5f458..456c080a 100644
--- a/src/audio/oal/stream.h
+++ b/src/audio/oal/stream.h
@@ -1,5 +1,4 @@
#pragma once
-#include "common.h"
#ifdef AUDIO_OAL
#include <AL/al.h>
diff --git a/src/core/config.h b/src/core/config.h
index 40882128..f43067d7 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -196,11 +196,6 @@ enum Config {
#define USE_TXD_CDIMAGE // generate and load textures from txd.img
#define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number
//#define USE_TEXTURE_POOL
-#ifdef _WIN32
-#define AUDIO_MSS
-#else
-#define AUDIO_OAL
-#endif
// Particle
//#define PC_PARTICLE