summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--premake5.lua14
-rw-r--r--src/audio/oal/stream.cpp5
2 files changed, 10 insertions, 9 deletions
diff --git a/premake5.lua b/premake5.lua
index 75b1b979..fd6da6ac 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -195,12 +195,6 @@ project "re3"
filter "platforms:*oal"
defines { "AUDIO_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
@@ -214,6 +208,14 @@ project "re3"
characterset ("MBCS")
targetextension ".exe"
+ filter "platforms:win*oal"
+ includedirs { "openal-soft/include" }
+ includedirs { "libsndfile/include" }
+ includedirs { "mpg123/include" }
+ libdirs { "openal-soft/libs/Win32" }
+ libdirs { "libsndfile/lib" }
+ libdirs { "mpg123/lib" }
+
filter "platforms:linux*oal"
links { "openal", "mpg123", "sndfile", "pthread" }
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index c70cd2c1..34518f54 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -8,12 +8,11 @@
typedef long ssize_t;
#pragma comment( lib, "libsndfile-1.lib" )
#pragma comment( lib, "libmpg123.lib" )
+#else
+#include "crossplatform.h"
#endif
#include <sndfile.h>
#include <mpg123.h>
-#ifndef _WIN32
-#include "crossplatform.h"
-#endif
class CSndFile : public IDecoder
{