diff options
| author | raysan5 <raysan5@gmail.com> | 2017-02-11 23:34:41 +0100 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2017-02-11 23:34:41 +0100 |
| commit | 05f039f85fb43f9ae4598747a4d9c6770ec5774b (patch) | |
| tree | 6f8254252476652dfa9f3022c25873ec700f30c6 /src | |
| parent | afcd748fdf2d4f379f7a3be1706c1d6cd2ff504d (diff) | |
| download | raylib-05f039f85fb43f9ae4598747a4d9c6770ec5774b.tar.gz raylib-05f039f85fb43f9ae4598747a4d9c6770ec5774b.zip | |
Corrected issue with OpenAL being 'keg only' on OSX
Also reviewed issue with stdbool when compiling with clang
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio.c | 13 | ||||
| -rw-r--r-- | src/external/jar_mod.h | 3 | ||||
| -rw-r--r-- | src/raylib.h | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/audio.c b/src/audio.c index eb5e65d6..58699035 100644 --- a/src/audio.c +++ b/src/audio.c @@ -59,9 +59,14 @@ #include "utils.h" // Required for: fopen() Android mapping, TraceLog() #endif -#include "AL/al.h" // OpenAL basic header -#include "AL/alc.h" // OpenAL context header (like OpenGL, OpenAL requires a context to work) -//#include "AL/alext.h" // OpenAL extensions header, required for AL_EXT_FLOAT32 and AL_EXT_MCFORMATS +#ifdef __APPLE__ + #include "OpenAL/al.h" // OpenAL basic header + #include "OpenAL/alc.h" // OpenAL context header (like OpenGL, OpenAL requires a context to work) +#else + #include "AL/al.h" // OpenAL basic header + #include "AL/alc.h" // OpenAL context header (like OpenGL, OpenAL requires a context to work) + //#include "AL/alext.h" // OpenAL extensions header, required for AL_EXT_FLOAT32 and AL_EXT_MCFORMATS +#endif // OpenAL extension: AL_EXT_FLOAT32 - Support for 32bit float samples // OpenAL extension: AL_EXT_MCFORMATS - Support for multi-channel formats (Quad, 5.1, 6.1, 7.1) @@ -1252,4 +1257,4 @@ void TraceLog(int msgType, const char *text, ...) if (msgType == ERROR) exit(1); // If ERROR message, exit program } -#endif
\ No newline at end of file +#endif diff --git a/src/external/jar_mod.h b/src/external/jar_mod.h index bee9f6ee..c17130a6 100644 --- a/src/external/jar_mod.h +++ b/src/external/jar_mod.h @@ -83,8 +83,7 @@ #include <stdio.h> #include <stdlib.h> -#include <stdbool.h> - +//#include <stdbool.h> #ifdef __cplusplus diff --git a/src/raylib.h b/src/raylib.h index a5849180..800ab2be 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -296,13 +296,9 @@ //---------------------------------------------------------------------------------- #ifndef __cplusplus // Boolean type - #ifndef __APPLE__ - #if !defined(_STDBOOL_H) - typedef enum { false, true } bool; - #define _STDBOOL_H - #endif - #else - #include <stdbool.h> + #if !defined(_STDBOOL_H) + typedef enum { false, true } bool; + #define _STDBOOL_H #endif #endif |