summaryrefslogtreecommitdiffstats
path: root/src/audio/sampman_oal.cpp
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-01-16 14:44:59 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2021-01-23 01:23:16 +0100
commitf85b5e99edfb2e1b9a4563cacc96892195eee379 (patch)
treee8c670366d80e62776b0856466625b50af97c0c7 /src/audio/sampman_oal.cpp
parentfix config.h (diff)
downloadre3-f85b5e99edfb2e1b9a4563cacc96892195eee379.tar
re3-f85b5e99edfb2e1b9a4563cacc96892195eee379.tar.gz
re3-f85b5e99edfb2e1b9a4563cacc96892195eee379.tar.bz2
re3-f85b5e99edfb2e1b9a4563cacc96892195eee379.tar.lz
re3-f85b5e99edfb2e1b9a4563cacc96892195eee379.tar.xz
re3-f85b5e99edfb2e1b9a4563cacc96892195eee379.tar.zst
re3-f85b5e99edfb2e1b9a4563cacc96892195eee379.zip
Diffstat (limited to '')
-rw-r--r--src/audio/sampman_oal.cpp35
1 files changed, 16 insertions, 19 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 5fe05d54..0d06098d 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -1,17 +1,11 @@
//#define JUICY_OAL
#ifdef AUDIO_OAL
-#include "sampman.h"
-
#include <time.h>
#include "eax.h"
#include "eax-util.h"
-#define WITHWINDOWS
-#include "common.h"
-#include "crossplatform.h"
-
#ifdef _WIN32
#include <io.h>
#include <AL/al.h>
@@ -19,8 +13,24 @@
#include <AL/alext.h>
#include <AL/efx.h>
#include <AL/efx-presets.h>
+
+// for user MP3s
+#include <direct.h>
+#include <shlobj.h>
+#include <shlguid.h>
+#else
+#define _getcwd getcwd
+#endif
+
+#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK
+#pragma comment( lib, "OpenAL32.lib" )
#endif
+#include "common.h"
+#include "crossplatform.h"
+
+#include "sampman.h"
+
#include "oal/oal_utils.h"
#include "oal/aldlist.h"
#include "oal/channel.h"
@@ -38,19 +48,6 @@
//TODO: max channels
//TODO: loop count
-#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK
-#pragma comment( lib, "OpenAL32.lib" )
-#endif
-
-// for user MP3s
-#ifdef _WIN32
-#include <direct.h>
-#include <shobjidl.h>
-#include <shlguid.h>
-#else
-#define _getcwd getcwd
-#endif
-
cSampleManager SampleManager;
bool _bSampmanInitialised = false;