mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 03:50:01 +00:00
OpenAL configs
This commit is contained in:
parent
21071edbfe
commit
e858314a9f
|
@ -6,6 +6,8 @@ configuration:
|
|||
platform:
|
||||
- win-x86-librw_d3d9-mss
|
||||
- win-x86-librw_gl3_glfw-mss
|
||||
- win-x86-librw_d3d9-oal
|
||||
- win-x86-librw_gl3_glfw-oal
|
||||
environment:
|
||||
APPVEYOR_SAVE_CACHE_ON_ERROR: true
|
||||
GLEW_VER: "2.1.0"
|
||||
|
|
20
premake5.lua
20
premake5.lua
|
@ -51,6 +51,9 @@ workspace "re3"
|
|||
"win-x86-RW33_d3d8-mss",
|
||||
"win-x86-librw_d3d9-mss",
|
||||
"win-x86-librw_gl3_glfw-mss",
|
||||
"win-x86-RW33_d3d8-oal",
|
||||
"win-x86-librw_d3d9-oal",
|
||||
"win-x86-librw_gl3_glfw-oal",
|
||||
}
|
||||
|
||||
filter { "system:linux" }
|
||||
|
@ -183,11 +186,23 @@ project "re3"
|
|||
includedirs { "src/extras" }
|
||||
includedirs { "eax" }
|
||||
|
||||
includedirs { "milessdk/include" }
|
||||
includedirs { "eax" }
|
||||
|
||||
filter "platforms:*mss"
|
||||
defines { "AUIOD_MSS" }
|
||||
includedirs { "milessdk/include" }
|
||||
libdirs { "milessdk/lib" }
|
||||
|
||||
filter "platforms:*oal"
|
||||
defines { "AUIOD_OAL" }
|
||||
includedirs { "openal-soft/include" }
|
||||
includedirs { "libsndfile/include" }
|
||||
includedirs { "mpg123/include" }
|
||||
libdirs { "openal-soft/libs/Win32" }
|
||||
libdirs { "libsndfile/lib" }
|
||||
libdirs { "mpg123/lib" }
|
||||
|
||||
filter {}
|
||||
if(os.getenv("GTA_III_RE_DIR")) then
|
||||
setpaths("$(GTA_III_RE_DIR)/", "%(cfg.buildtarget.name)", "")
|
||||
end
|
||||
|
@ -199,8 +214,7 @@ project "re3"
|
|||
characterset ("MBCS")
|
||||
targetextension ".exe"
|
||||
|
||||
filter "platforms:linux*"
|
||||
defines { "OPENAL" }
|
||||
filter "platforms:linux*oal"
|
||||
links { "openal", "mpg123", "sndfile", "pthread" }
|
||||
|
||||
filter "platforms:*RW33*"
|
||||
|
|
|
@ -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,5 +1,4 @@
|
|||
#pragma once
|
||||
#include "common.h"
|
||||
|
||||
#ifdef AUDIO_OAL
|
||||
#include "oal/oal_utils.h"
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
#include "common.h"
|
||||
#include "oal_utils.h"
|
||||
|
||||
#ifdef AUDIO_OAL
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#pragma once
|
||||
#include "common.h"
|
||||
|
||||
#ifdef AUDIO_OAL
|
||||
#include "eax.h"
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
#include "stream.h"
|
||||
#include "common.h"
|
||||
|
||||
#ifdef AUDIO_OAL
|
||||
#include "common.h"
|
||||
#include "stream.h"
|
||||
#include "sampman.h"
|
||||
|
||||
#include <sndfile.h>
|
||||
#include <mpg123.h>
|
||||
#ifdef _WIN32
|
||||
typedef long ssize_t;
|
||||
#pragma comment( lib, "libsndfile-1.lib" )
|
||||
|
@ -13,6 +11,8 @@ typedef long ssize_t;
|
|||
#else
|
||||
#include "crossplatform.h"
|
||||
#endif
|
||||
#include <sndfile.h>
|
||||
#include <mpg123.h>
|
||||
|
||||
class CSndFile : public IDecoder
|
||||
{
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#pragma once
|
||||
#include "common.h"
|
||||
|
||||
#ifdef AUDIO_OAL
|
||||
#include <AL/al.h>
|
||||
|
|
|
@ -196,11 +196,6 @@ enum Config {
|
|||
#define USE_TXD_CDIMAGE // generate and load textures from txd.img
|
||||
#define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number
|
||||
//#define USE_TEXTURE_POOL
|
||||
#ifdef _WIN32
|
||||
#define AUDIO_MSS
|
||||
#else
|
||||
#define AUDIO_OAL
|
||||
#endif
|
||||
|
||||
// Particle
|
||||
//#define PC_PARTICLE
|
||||
|
|
Loading…
Reference in a new issue