summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.appveyor.yml2
-rw-r--r--premake5.lua24
-rw-r--r--src/audio/oal/channel.cpp4
-rw-r--r--src/audio/oal/channel.h1
-rw-r--r--src/audio/oal/oal_utils.cpp1
-rw-r--r--src/audio/oal/oal_utils.h1
-rw-r--r--src/audio/oal/stream.cpp8
-rw-r--r--src/audio/oal/stream.h1
-rw-r--r--src/core/config.h5
9 files changed, 28 insertions, 19 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 20adee80..05604e2c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -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"
diff --git a/premake5.lua b/premake5.lua
index c8494884..79b8db64 100644
--- a/premake5.lua
+++ b/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" }
-
- libdirs { "milessdk/lib" }
+ 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*"
diff --git a/src/audio/oal/channel.cpp b/src/audio/oal/channel.cpp
index 6fe1d856..731e3581 100644
--- a/src/audio/oal/channel.cpp
+++ b/src/audio/oal/channel.cpp
@@ -1,7 +1,7 @@
-#include "channel.h"
+#include "common.h"
#ifdef AUDIO_OAL
-#include "common.h"
+#include "channel.h"
#include "sampman.h"
#ifndef _WIN32
diff --git a/src/audio/oal/channel.h b/src/audio/oal/channel.h
index 4dd09ca1..0c86bdc6 100644
--- a/src/audio/oal/channel.h
+++ b/src/audio/oal/channel.h
@@ -1,5 +1,4 @@
#pragma once
-#include "common.h"
#ifdef AUDIO_OAL
#include "oal/oal_utils.h"
diff --git a/src/audio/oal/oal_utils.cpp b/src/audio/oal/oal_utils.cpp
index 4119672f..e16de572 100644
--- a/src/audio/oal/oal_utils.cpp
+++ b/src/audio/oal/oal_utils.cpp
@@ -1,3 +1,4 @@
+#include "common.h"
#include "oal_utils.h"
#ifdef AUDIO_OAL
diff --git a/src/audio/oal/oal_utils.h b/src/audio/oal/oal_utils.h
index af45a944..b89ccf36 100644
--- a/src/audio/oal/oal_utils.h
+++ b/src/audio/oal/oal_utils.h
@@ -1,5 +1,4 @@
#pragma once
-#include "common.h"
#ifdef AUDIO_OAL
#include "eax.h"
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 5a9c7d7d..34518f54 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -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
{
diff --git a/src/audio/oal/stream.h b/src/audio/oal/stream.h
index f1e5f458..456c080a 100644
--- a/src/audio/oal/stream.h
+++ b/src/audio/oal/stream.h
@@ -1,5 +1,4 @@
#pragma once
-#include "common.h"
#ifdef AUDIO_OAL
#include <AL/al.h>
diff --git a/src/core/config.h b/src/core/config.h
index 40882128..f43067d7 100644
--- a/src/core/config.h
+++ b/src/core/config.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