spring/spring-104.0-libopenal-1.20.1.patch

45 lines
1.2 KiB
Diff

From d159c9f0d21d3bc96c85063cc258b6fd8ec1be2d Mon Sep 17 00:00:00 2001
From: abma <spring@abma.de>
Date: Mon, 6 Jan 2020 11:16:25 +0100
Subject: [PATCH] fix #6358: compile error because of new openal version /
changed struct
---
rts/System/Sound/OpenAL/Sound.cpp | 1 -
rts/System/Sound/OpenAL/Sound.h | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/rts/System/Sound/OpenAL/Sound.cpp b/rts/System/Sound/OpenAL/Sound.cpp
index 50bc40e8c4..9ea2ad6a73 100644
--- a/rts/System/Sound/OpenAL/Sound.cpp
+++ b/rts/System/Sound/OpenAL/Sound.cpp
@@ -4,7 +4,6 @@
#include <cstdlib>
#include <cmath>
-#include <alc.h>
#ifndef ALC_ALL_DEVICES_SPECIFIER
#define ALC_ALL_DEVICES_SPECIFIER 0x1013
diff --git a/rts/System/Sound/OpenAL/Sound.h b/rts/System/Sound/OpenAL/Sound.h
index 11d36ef86c..d362cb5b39 100644
--- a/rts/System/Sound/OpenAL/Sound.h
+++ b/rts/System/Sound/OpenAL/Sound.h
@@ -5,6 +5,7 @@
#include <string>
#include <vector>
+#include <alc.h>
#include "System/Sound/ISound.h"
#include "System/float3.h"
@@ -16,8 +17,6 @@
class CSoundSource;
class SoundBuffer;
class SoundItem;
-struct ALCdevice_struct;
-typedef struct ALCdevice_struct ALCdevice;
/// Default sound system implementation (OpenAL)
class CSound : public ISound