diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-05-22 21:49:54 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-05-22 21:49:54 +0200 |
| commit | c993e99e0086aae50357c8ffa180de54396ede92 (patch) | |
| tree | 4a65137e1237f2db8bb5d285a6bffecc9ccc2e51 | |
| parent | Possibly fix travis (diff) | |
| download | re3-c993e99e0086aae50357c8ffa180de54396ede92.tar re3-c993e99e0086aae50357c8ffa180de54396ede92.tar.gz re3-c993e99e0086aae50357c8ffa180de54396ede92.tar.bz2 re3-c993e99e0086aae50357c8ffa180de54396ede92.tar.lz re3-c993e99e0086aae50357c8ffa180de54396ede92.tar.xz re3-c993e99e0086aae50357c8ffa180de54396ede92.tar.zst re3-c993e99e0086aae50357c8ffa180de54396ede92.zip | |
| -rw-r--r-- | premake5.lua | 14 | ||||
| -rw-r--r-- | src/audio/oal/stream.cpp | 5 |
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 { |