From f85b5e99edfb2e1b9a4563cacc96892195eee379 Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Sat, 16 Jan 2021 16:44:59 +0300
Subject: Includes overhaul, fix some compiler warnings

---
 src/audio/sampman_oal.cpp | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'src/audio/sampman_oal.cpp')

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;
 
-- 
cgit v1.2.3