diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-24 11:42:45 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-24 11:42:45 +0100 |
| commit | ee89c485fcce7f3b9a189f7a80b3a1b2933f79bd (patch) | |
| tree | ba8ccf97a2fd5aff3180f7ad600a53a4d29cf9ff /src/audio/sampman_oal.cpp | |
| parent | fix (diff) | |
| download | re3-ee89c485fcce7f3b9a189f7a80b3a1b2933f79bd.tar re3-ee89c485fcce7f3b9a189f7a80b3a1b2933f79bd.tar.gz re3-ee89c485fcce7f3b9a189f7a80b3a1b2933f79bd.tar.bz2 re3-ee89c485fcce7f3b9a189f7a80b3a1b2933f79bd.tar.lz re3-ee89c485fcce7f3b9a189f7a80b3a1b2933f79bd.tar.xz re3-ee89c485fcce7f3b9a189f7a80b3a1b2933f79bd.tar.zst re3-ee89c485fcce7f3b9a189f7a80b3a1b2933f79bd.zip | |
Diffstat (limited to 'src/audio/sampman_oal.cpp')
| -rw-r--r-- | src/audio/sampman_oal.cpp | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index ec85fc43..7da871a5 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; |