diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 21:59:16 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 21:59:16 +0100 |
commit | ef59c623fd3ab492ccc8826d21d93fc4be825257 (patch) | |
tree | b68bb54324eaef4bbb14868413cde00245576859 /src/audio/sampman_oal.cpp | |
parent | fix (diff) | |
parent | wrong ifdef (diff) | |
download | re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.gz re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.bz2 re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.lz re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.xz re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.tar.zst re3-ef59c623fd3ab492ccc8826d21d93fc4be825257.zip |
Diffstat (limited to 'src/audio/sampman_oal.cpp')
-rw-r--r-- | src/audio/sampman_oal.cpp | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index bb7f0aac..798ea287 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,22 @@ #include <AL/alext.h> #include <AL/efx.h> #include <AL/efx-presets.h> + +#pragma comment(lib, "OpenAL32.lib") + +// for user MP3s +#include <direct.h> +#include <shlobj.h> +#include <shlguid.h> +#else +#define _getcwd getcwd #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 +46,6 @@ //TODO: max channels //TODO: loop count -#ifdef _WIN32 -#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; |