Merge branch 'master' into miami

# Conflicts:
#	premake5.lua
#	sdk/rwsdk/include/d3d8/baaplylt.c
#	sdk/rwsdk/include/d3d8/rpstereo.h
#	sdk/rwsdk/include/d3d8/rpstereo.rpe
#	sdk/rwsdk/include/d3d8/rtintel.h
#	sdk/rwsdk/include/d3d8/rtintel.rpe
#	src/audio/oal/stream.cpp
This commit is contained in:
Sergeanur 2020-08-02 19:49:12 +03:00
commit 3e24ae8812
325 changed files with 1699 additions and 16 deletions

12
.gitmodules vendored
View File

@ -1,3 +1,15 @@
[submodule "librw"] [submodule "librw"]
path = librw path = librw
url = https://github.com/aap/librw url = https://github.com/aap/librw
[submodule "opus"]
path = opus
url = https://github.com/xiph/opus.git
branch = master
[submodule "opusfile"]
path = opusfile
url = https://github.com/xiph/opusfile.git
branch = master
[submodule "ogg"]
path = ogg
url = https://github.com/xiph/ogg.git
branch = master

View File

@ -31,7 +31,7 @@ such that we have a working game at all times.
- **If you use 64-bit D3D9**: We don't ship 64-bit Dx9 SDK. You need to download it from Microsoft if you don't have it(although it should come pre-installed after some Windows version) - **If you use 64-bit D3D9**: We don't ship 64-bit Dx9 SDK. You need to download it from Microsoft if you don't have it(although it should come pre-installed after some Windows version)
> :information_source: **If you choose OpenAL(OAL) on Windows** You must read [Running OAL build on Windows](https://github.com/GTAmodding/re3/wiki/Running-OAL-build-on-Windows). > :information_source: **If you choose OpenAL on Windows** You must read [Running OpenAL build on Windows](https://github.com/GTAmodding/re3/wiki/Running-OpenAL-build-on-Windows).
> :information_source: **Did you notice librw?** re3 uses completely homebrew RenderWare-replacement rendering engine; [librw](https://github.com/aap/librw/). librw comes as submodule of re3, but you also can use LIBRW enviorenment variable to specify path to your own librw. > :information_source: **Did you notice librw?** re3 uses completely homebrew RenderWare-replacement rendering engine; [librw](https://github.com/aap/librw/). librw comes as submodule of re3, but you also can use LIBRW enviorenment variable to specify path to your own librw.

Binary file not shown.

Binary file not shown.

1
ogg Submodule

@ -0,0 +1 @@
Subproject commit 1e8d7cce266df61afc9d35db0283bbacc0237aba

1
opus Submodule

@ -0,0 +1 @@
Subproject commit 8aa7767207b1e3633004c26aecbb67d1c5118485

1
opusfile Submodule

@ -0,0 +1 @@
Subproject commit eb252537f374e30f7b68b84223c5a2303c05eca2

View File

@ -24,6 +24,11 @@ newoption {
description = "Build and use librw from this solution" description = "Build and use librw from this solution"
} }
newoption {
trigger = "with-opus",
description = "Build with opus"
}
if(_OPTIONS["with-librw"]) then if(_OPTIONS["with-librw"]) then
Librw = "librw" Librw = "librw"
else else
@ -160,6 +165,7 @@ project "reVC"
files { addSrcFiles("src") } files { addSrcFiles("src") }
files { addSrcFiles("src/animation") } 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/audio/oal") }
files { addSrcFiles("src/control") } files { addSrcFiles("src/control") }
files { addSrcFiles("src/core") } files { addSrcFiles("src/core") }
@ -177,11 +183,11 @@ project "reVC"
files { addSrcFiles("src/vehicles") } files { addSrcFiles("src/vehicles") }
files { addSrcFiles("src/weapons") } files { addSrcFiles("src/weapons") }
files { addSrcFiles("src/extras") } files { addSrcFiles("src/extras") }
files { addSrcFiles("eax") }
includedirs { "src" } includedirs { "src" }
includedirs { "src/animation" } includedirs { "src/animation" }
includedirs { "src/audio" } includedirs { "src/audio" }
includedirs { "src/audio/eax" }
includedirs { "src/audio/oal" } includedirs { "src/audio/oal" }
includedirs { "src/control" } includedirs { "src/control" }
includedirs { "src/core" } includedirs { "src/core" }
@ -199,12 +205,26 @@ project "reVC"
includedirs { "src/vehicles" } includedirs { "src/vehicles" }
includedirs { "src/weapons" } includedirs { "src/weapons" }
includedirs { "src/extras" } includedirs { "src/extras" }
includedirs { "eax" }
if _OPTIONS["with-opus"] then
includedirs { "ogg/include" }
includedirs { "opus/include" }
includedirs { "opusfile/include" }
end
filter "platforms:*mss" filter "platforms:*mss"
defines { "AUDIO_MSS" } defines { "AUDIO_MSS" }
includedirs { "milessdk/include" } includedirs { "sdk/milessdk/include" }
libdirs { "milessdk/lib" } libdirs { "sdk/milessdk/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 {}
defines { "AUDIO_OPUS" }
end
filter "platforms:*oal" filter "platforms:*oal"
defines { "AUDIO_OAL" } defines { "AUDIO_OAL" }
@ -239,11 +259,18 @@ project "reVC"
filter "platforms:linux*oal" filter "platforms:linux*oal"
links { "openal", "mpg123", "sndfile", "pthread" } links { "openal", "mpg123", "sndfile", "pthread" }
if _OPTIONS["with-opus"] then
filter {}
links { "libogg" }
links { "opus" }
links { "opusfile" }
end
filter "platforms:*RW34*" filter "platforms:*RW34*"
staticruntime "on" staticruntime "on"
includedirs { "rwsdk/include/d3d8" } includedirs { "sdk/rwsdk/include/d3d8" }
libdirs { "rwsdk/lib/d3d8/release" } libdirs { "sdk/rwsdk/lib/d3d8/release" }
links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtanim", "rtcharse", "rpanisot" } links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtanim", "rtcharse", "rpanisot" }
defines { "RWLIBS" } defines { "RWLIBS" }
linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text" linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text"
@ -262,8 +289,8 @@ project "reVC"
links { "d3d9" } links { "d3d9" }
filter "platforms:*x86*d3d*" filter "platforms:*x86*d3d*"
includedirs { "dxsdk/include" } includedirs { "sdk/dx8sdk/include" }
libdirs { "dxsdk/lib" } libdirs { "sdk/dx8sdk/lib" }
filter "platforms:*amd64*d3d9*" filter "platforms:*amd64*d3d9*"
defines { "USE_D3D9" } defines { "USE_D3D9" }

Some files were not shown because too many files have changed in this diff Show More