From 0af4d57408842d501af2fce4617e19a3bf9466eb Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Fri, 22 May 2020 17:40:19 +0300 Subject: opus support --- premake5.lua | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index c8494884..c6551a21 100644 --- a/premake5.lua +++ b/premake5.lua @@ -17,6 +17,11 @@ newoption { description = "Build and use librw from this solution" } +newoption { + trigger = "with-opus", + description = "Build with opus" +} + if(_OPTIONS["with-librw"]) then Librw = "librw" else @@ -185,8 +190,25 @@ project "re3" includedirs { "milessdk/include" } includedirs { "eax" } + + includedirs { "openal-soft/include" } + includedirs { "mpg123/include" } + includedirs { "libsndfile/include" } + includedirs { "ogg/include" } + includedirs { "opus/include" } + includedirs { "opusfile/include" } libdirs { "milessdk/lib" } + libdirs { "openal-soft/libs/Win32" } + libdirs { "mpg123/lib" } + libdirs { "libsndfile/lib" } + if _OPTIONS["with-opus"] then + filter "platforms:win*" + libdirs { "ogg/win32/VS2015/Win32/%{cfg.buildcfg}" } + libdirs { "opus/win32/VS2015/Win32/%{cfg.buildcfg}" } + libdirs { "opusfile/win32/VS2015/Win32/Release-NoHTTP" } + filter {} + end if(os.getenv("GTA_III_RE_DIR")) then setpaths("$(GTA_III_RE_DIR)/", "%(cfg.buildtarget.name)", "") @@ -202,6 +224,13 @@ project "re3" filter "platforms:linux*" defines { "OPENAL" } links { "openal", "mpg123", "sndfile", "pthread" } + + if _OPTIONS["with-opus"] then + filter {} + links { "libogg" } + links { "opus" } + links { "opusfile" } + end filter "platforms:*RW33*" staticruntime "on" -- cgit v1.2.3 From 97b058d0fa44eb1bb032484a6f4bee6df1f249bd Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Fri, 22 May 2020 17:43:26 +0300 Subject: more checks in premake --- premake5.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index c6551a21..95c03b21 100644 --- a/premake5.lua +++ b/premake5.lua @@ -194,9 +194,11 @@ project "re3" includedirs { "openal-soft/include" } includedirs { "mpg123/include" } includedirs { "libsndfile/include" } - includedirs { "ogg/include" } - includedirs { "opus/include" } - includedirs { "opusfile/include" } + if _OPTIONS["with-opus"] then + includedirs { "ogg/include" } + includedirs { "opus/include" } + includedirs { "opusfile/include" } + end libdirs { "milessdk/lib" } libdirs { "openal-soft/libs/Win32" } -- cgit v1.2.3 From 3a7651e7ab87e21ff510441f98dcbe6711134a18 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sun, 24 May 2020 00:56:20 +0300 Subject: Cleanup --- premake5.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index c7321dcb..036dad09 100644 --- a/premake5.lua +++ b/premake5.lua @@ -209,6 +209,7 @@ project "re3" libdirs { "opus/win32/VS2015/Win32/%{cfg.buildcfg}" } libdirs { "opusfile/win32/VS2015/Win32/Release-NoHTTP" } filter {} + defines { "AUDIO_OPUS" } end filter "platforms:*oal" -- cgit v1.2.3 From 550b813d92f484fb278cd2e1606cc262d217ffb4 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Wed, 29 Jul 2020 16:08:01 +0300 Subject: premake fix --- premake5.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index 87cb9e2d..3ddc554e 100644 --- a/premake5.lua +++ b/premake5.lua @@ -211,10 +211,11 @@ project "re3" includedirs { "opusfile/include" } end - libdirs { "milessdk/lib" } - libdirs { "openal-soft/libs/Win32" } - libdirs { "mpg123/lib" } - libdirs { "libsndfile/lib" } + filter "platforms:*mss" + defines { "AUDIO_MSS" } + includedirs { "milessdk/include" } + libdirs { "sdk/milessdk/lib" } + if _OPTIONS["with-opus"] then filter "platforms:win*" libdirs { "ogg/win32/VS2015/Win32/%{cfg.buildcfg}" } -- cgit v1.2.3 From e823e018600bbc71fd4a58c50d86f1bd2ce467ff Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Wed, 29 Jul 2020 16:10:59 +0300 Subject: more fix --- premake5.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index 3ddc554e..57db0fe8 100644 --- a/premake5.lua +++ b/premake5.lua @@ -214,7 +214,7 @@ project "re3" filter "platforms:*mss" defines { "AUDIO_MSS" } includedirs { "milessdk/include" } - libdirs { "sdk/milessdk/lib" } + libdirs { "milessdk/lib" } if _OPTIONS["with-opus"] then filter "platforms:win*" -- cgit v1.2.3 From 2c6f2f24e717a6ba5994346ec7a4fa7b02c6d58d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Wed, 29 Jul 2020 19:32:06 +0300 Subject: Fix Win32 OAL build --- premake5.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index 7381da1d..07ca5ced 100644 --- a/premake5.lua +++ b/premake5.lua @@ -225,7 +225,7 @@ project "re3" includedirs { "libsndfile.32/include" } includedirs { "mpg123.32/include" } libdirs { "mpg123.32/lib" } - libdirs { "libsndfile32/lib" } + libdirs { "libsndfile.32/lib" } libdirs { "openal-soft/libs/Win32" } filter "platforms:win-amd64*oal" -- cgit v1.2.3 From a786dd45a4ebc6b91936b5e46d0ef0a9befc05af Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sun, 2 Aug 2020 19:36:50 +0300 Subject: Move sdk and eax --- premake5.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index ddcfd6a9..c8190e15 100644 --- a/premake5.lua +++ b/premake5.lua @@ -163,7 +163,8 @@ project "re3" files { addSrcFiles("src") } files { addSrcFiles("src/animation") } - files { addSrcFiles("src/audio") } + files { addSrcFiles("src/audio") } + files { addSrcFiles("src/audio/eax") } files { addSrcFiles("src/audio/oal") } files { addSrcFiles("src/control") } files { addSrcFiles("src/core") } @@ -181,11 +182,11 @@ project "re3" files { addSrcFiles("src/vehicles") } files { addSrcFiles("src/weapons") } files { addSrcFiles("src/extras") } - files { addSrcFiles("eax") } includedirs { "src" } includedirs { "src/animation" } - includedirs { "src/audio" } + includedirs { "src/audio" } + includedirs { "src/audio/eax" } includedirs { "src/audio/oal" } includedirs { "src/control" } includedirs { "src/core" } @@ -203,7 +204,6 @@ project "re3" includedirs { "src/vehicles" } includedirs { "src/weapons" } includedirs { "src/extras" } - includedirs { "eax" } if _OPTIONS["with-opus"] then includedirs { "ogg/include" } @@ -213,8 +213,8 @@ project "re3" filter "platforms:*mss" defines { "AUDIO_MSS" } - includedirs { "milessdk/include" } - libdirs { "milessdk/lib" } + includedirs { "sdk/milessdk/include" } + libdirs { "sdk/milessdk/lib" } if _OPTIONS["with-opus"] then filter "platforms:win*" @@ -268,8 +268,8 @@ project "re3" filter "platforms:*RW33*" staticruntime "on" - includedirs { "rwsdk/include/d3d8" } - libdirs { "rwsdk/lib/d3d8/release" } + includedirs { "sdk/rwsdk/include/d3d8" } + libdirs { "sdk/rwsdk/lib/d3d8/release" } links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtcharse" } defines { "RWLIBS" } linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text" @@ -288,8 +288,8 @@ project "re3" links { "d3d9" } filter "platforms:*x86*d3d*" - includedirs { "dxsdk/include" } - libdirs { "dxsdk/lib" } + includedirs { "sdk/dx8sdk/include" } + libdirs { "sdk/dx8sdk/lib" } filter "platforms:*amd64*d3d9*" defines { "USE_D3D9" } -- cgit v1.2.3