From b62b58ed6f0c663cccd7395bd94d3b65fb81623f Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 5 Mar 2008 20:16:31 +0000 Subject: [PATCH] Fix OpenAL on UNIX by wrapping the Windows headers with __WINDOWS__ (AL/al.h), the OS X headers with __APPLE__ (OpenAL/AL.h). The default will be the UNIX location (AL/a.h). Originally committed to SVN as r1908. --- aegisub/audio_player_openal.cpp | 10 +++++++--- aegisub/audio_player_openal.h | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/aegisub/audio_player_openal.cpp b/aegisub/audio_player_openal.cpp index ae744dc7e..308bb827f 100644 --- a/aegisub/audio_player_openal.cpp +++ b/aegisub/audio_player_openal.cpp @@ -47,12 +47,16 @@ #include "frame_main.h" #include "audio_player_openal.h" #include "options.h" -#ifdef __APPLE__ + +#ifdef __WINDOWS__ +#include +#include +#elif defined(__APPLE__) #include #include #else -#include -#include +#include +#include #endif diff --git a/aegisub/audio_player_openal.h b/aegisub/audio_player_openal.h index 08cf38750..5d6aa2245 100644 --- a/aegisub/audio_player_openal.h +++ b/aegisub/audio_player_openal.h @@ -47,12 +47,16 @@ #include "frame_main.h" #include "audio_player.h" #include "options.h" -#ifdef __APPLE__ + +#ifdef __WINDOWS__ +#include +#include +#elif defined(__APPLE__) #include #include #else -#include -#include +#include +#include #endif