From fa78b983127c0f9d34e80dead67b45e7b2f2b0c7 Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Wed, 10 May 2017 16:04:22 +0200 Subject: [PATCH] Change alut includes to Alut's pkg-config definition only adds the top-level include directory containing the AL directory to the include paths. This works on most platforms because OpenAL adds that AL directory. However, with nix, these two directories are distinct and the build fails. --- src/platform/C4MusicFile.cpp | 2 +- src/platform/C4SoundIncludes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/C4MusicFile.cpp b/src/platform/C4MusicFile.cpp index 5638a434f..d850fff81 100644 --- a/src/platform/C4MusicFile.cpp +++ b/src/platform/C4MusicFile.cpp @@ -30,7 +30,7 @@ // This is an ugly hack to make FreeALUT not dllimport everything. #define _XBOX #endif -#include +#include #undef _XBOX #endif #define alErrorCheck(X) do { X; { ALenum err = alGetError(); if (err) LogF("al error: %s (%x)", #X, err); } } while (0) diff --git a/src/platform/C4SoundIncludes.h b/src/platform/C4SoundIncludes.h index d4cf131d7..8c3c46626 100644 --- a/src/platform/C4SoundIncludes.h +++ b/src/platform/C4SoundIncludes.h @@ -35,7 +35,7 @@ // This is an ugly hack to make FreeALUT not dllimport everything. # define _XBOX # endif -# include +# include # undef _XBOX # if defined(__APPLE__) # import