a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 18:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source 
# Conflicts:
#	premake5.lua
This commit is contained in:
Sergeanur 2020-05-05 20:42:11 +03:00
parent 7428590457 52907088f9
commit 4bd4d24802
2 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,5 +1,5 @@
# re3 # re3
[![Build status](https://ci.appveyor.com/api/projects/status/hyiwgegks122h8jg?svg=true)](https://ci.appveyor.com/project/aap/re3/branch/master) [![Build status](https://ci.appveyor.com/api/projects/status/hyiwgegks122h8jg/branch/master?svg=true)](https://ci.appveyor.com/project/aap/re3/branch/master)
<a href="https://discord.gg/jYpXxTm"><img src="https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat" /></a> <a href="https://discord.gg/jYpXxTm"><img src="https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat" /></a>
| Platform | Debug | Release | | Platform | Debug | Release |
|------------------|-------------|-------------| |------------------|-------------|-------------|

50
premake5.lua
View file

@ -103,6 +103,10 @@ project "librw"
filter {} filter {}
end end
local function addSrcFiles( prefix )
return prefix .. "/*cpp", prefix .. "/*.h", prefix .. "/*.c", prefix .. "/*.ico", prefix .. "/*.aps", prefix .. "/*.rc"
end
project "reVC" project "reVC"
kind "WindowedApp" kind "WindowedApp"
targetname "re3" targetname "re3"
@ -113,27 +117,29 @@ project "reVC"
defines { "MIAMI" } defines { "MIAMI" }
files { "src/*.*" } files { addSrcFiles("src") }
files { "src/animation/*.*" } files { addSrcFiles("src/animation") }
files { "src/audio/*.*" } files { addSrcFiles("src/audio") }
files { "src/control/*.*" } files { addSrcFiles("src/audio/miles") }
files { "src/core/*.*" } files { addSrcFiles("src/audio/openal") }
files { "src/entities/*.*" } files { addSrcFiles("src/control") }
files { "src/math/*.*" } files { addSrcFiles("src/core") }
files { "src/modelinfo/*.*" } files { addSrcFiles("src/entities") }
files { "src/objects/*.*" } files { addSrcFiles("src/math") }
files { "src/peds/*.*" } files { addSrcFiles("src/modelinfo") }
files { "src/render/*.*" } files { addSrcFiles("src/objects") }
files { "src/rw/*.*" } files { addSrcFiles("src/peds") }
files { "src/save/*.*" } files { addSrcFiles("src/render") }
files { "src/skel/*.*" } files { addSrcFiles("src/rw") }
files { "src/skel/win/*.*" } files { addSrcFiles("src/save") }
files { "src/skel/glfw/*.*" } files { addSrcFiles("src/skel") }
files { "src/text/*.*" } files { addSrcFiles("src/skel/win") }
files { "src/vehicles/*.*" } files { addSrcFiles("src/skel/glfw") }
files { "src/weapons/*.*" } files { addSrcFiles("src/text") }
files { "src/extras/*.*" } files { addSrcFiles("src/vehicles") }
files { "eax/*.*" } files { addSrcFiles("src/weapons") }
files { addSrcFiles("src/extras") }
files { addSrcFiles("eax") }
includedirs { "src" } includedirs { "src" }
includedirs { "src/animation" } includedirs { "src/animation" }
@ -174,7 +180,7 @@ project "reVC"
filter "platforms:*librw*" filter "platforms:*librw*"
defines { "LIBRW" } defines { "LIBRW" }
files { "src/fakerw/*.*" } files { addSrcFiles("src/fakerw") }
includedirs { "src/fakerw" } includedirs { "src/fakerw" }
includedirs { Librw } includedirs { Librw }
if(_OPTIONS["with-librw"]) then if(_OPTIONS["with-librw"]) then