Corrected issue with OpenAL being 'keg only' on OSX
Also reviewed issue with stdbool when compiling with clang
This commit is contained in:
parent
afcd748fdf
commit
05f039f85f
4 changed files with 14 additions and 14 deletions
|
@ -153,7 +153,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
||||||
# libraries for OS X 10.9 desktop compiling
|
# libraries for OS X 10.9 desktop compiling
|
||||||
# requires the following packages:
|
# requires the following packages:
|
||||||
# libglfw3-dev libopenal-dev libegl1-mesa-dev
|
# libglfw3-dev libopenal-dev libegl1-mesa-dev
|
||||||
LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa
|
LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAL -framework Cocoa
|
||||||
else
|
else
|
||||||
# libraries for Windows desktop compiling
|
# libraries for Windows desktop compiling
|
||||||
# NOTE: GLFW3 and OpenAL Soft libraries should be installed
|
# NOTE: GLFW3 and OpenAL Soft libraries should be installed
|
||||||
|
|
11
src/audio.c
11
src/audio.c
|
@ -59,9 +59,14 @@
|
||||||
#include "utils.h" // Required for: fopen() Android mapping, TraceLog()
|
#include "utils.h" // Required for: fopen() Android mapping, TraceLog()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "AL/al.h" // OpenAL basic header
|
#ifdef __APPLE__
|
||||||
#include "AL/alc.h" // OpenAL context header (like OpenGL, OpenAL requires a context to work)
|
#include "OpenAL/al.h" // OpenAL basic header
|
||||||
//#include "AL/alext.h" // OpenAL extensions header, required for AL_EXT_FLOAT32 and AL_EXT_MCFORMATS
|
#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_FLOAT32 - Support for 32bit float samples
|
||||||
// OpenAL extension: AL_EXT_MCFORMATS - Support for multi-channel formats (Quad, 5.1, 6.1, 7.1)
|
// OpenAL extension: AL_EXT_MCFORMATS - Support for multi-channel formats (Quad, 5.1, 6.1, 7.1)
|
||||||
|
|
3
src/external/jar_mod.h
vendored
3
src/external/jar_mod.h
vendored
|
@ -83,8 +83,7 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdbool.h>
|
//#include <stdbool.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
10
src/raylib.h
10
src/raylib.h
|
@ -296,13 +296,9 @@
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
#ifndef __cplusplus
|
#ifndef __cplusplus
|
||||||
// Boolean type
|
// Boolean type
|
||||||
#ifndef __APPLE__
|
#if !defined(_STDBOOL_H)
|
||||||
#if !defined(_STDBOOL_H)
|
typedef enum { false, true } bool;
|
||||||
typedef enum { false, true } bool;
|
#define _STDBOOL_H
|
||||||
#define _STDBOOL_H
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#include <stdbool.h>
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue