archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-28 18:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into opus

Browse Source 
# Conflicts:
#	eax/eax.h
#	premake5.lua
#	src/audio/oal/stream.cpp
This commit is contained in:
Sergeanur
2020-05-24 00:45:45 +03:00
parent 97b058d0fa ac208ce02c
commit bd67db523a
21 changed files with 382 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/oal/channel.cpp
View File

@ -1,7 +1,7 @@
#include "channel.h"
#include "common.h"
#ifdef AUDIO_OAL
#include "common.h"
#include "channel.h"
#include "sampman.h"
#ifndef _WIN32

1
src/audio/oal/channel.h
View File

@ -1,5 +1,4 @@
#pragma once
#include "common.h"
#ifdef AUDIO_OAL
#include "oal/oal_utils.h"

1
src/audio/oal/oal_utils.cpp
View File

@ -1,3 +1,4 @@
#include "common.h"
#include "oal_utils.h"
#ifdef AUDIO_OAL

1
src/audio/oal/oal_utils.h
View File

@ -1,5 +1,4 @@
#pragma once
#include "common.h"
#ifdef AUDIO_OAL
#include "eax.h"

4
src/audio/oal/stream.cpp
View File

@ -1,7 +1,7 @@
#include "stream.h"
#include "common.h"
#ifdef AUDIO_OAL
#include "common.h"
#include "stream.h"
#include "sampman.h"
#ifdef AUDIO_OPUS

1
src/audio/oal/stream.h
View File

@ -1,5 +1,4 @@
#pragma once
#include "common.h"
#ifdef AUDIO_OAL
#include <AL/al.h>