diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-05-13 00:19:21 +0300 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-13 00:27:15 +0300 |
commit | 33dfaf7da11675fdad2909e39b6d15e49fc6cc68 (patch) | |
tree | ff2b3fe079b51b521cb26ceb2da0a5717b0601ff /eax | |
parent | dc444b9ca06efd32eb624e5da063cfec309a086a (diff) | |
parent | c40fcdf39ab77cb0fde26e314652e0aaf9dd4544 (diff) |
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
Diffstat (limited to 'eax')
-rw-r--r-- | eax/eax.h | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -50,8 +50,13 @@ extern "C" { #else // OPENAL +#ifndef _WIN32 + #include <AL/al.h> + #include <string.h> +#else #include <al.h> - +#endif + #ifndef GUID_DEFINED #define GUID_DEFINED typedef struct _GUID |