mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-25 05:41:54 +00:00
Merge remote-tracking branch 'upstream/miami' into miami
This commit is contained in:
commit
f0896ceba7
|
@ -27,13 +27,13 @@ install:
|
||||||
premake5 vs2019 --with-librw --glewdir=%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE% --glfwdir=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%
|
premake5 vs2019 --with-librw --glewdir=%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE% --glfwdir=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%
|
||||||
|
|
||||||
build:
|
build:
|
||||||
project: build/re3.sln
|
project: build/reVC.sln
|
||||||
verbosity: minimal
|
verbosity: minimal
|
||||||
after_build:
|
after_build:
|
||||||
- 7z a "re3_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip" bin/%PLATFORM%/%CONFIGURATION%/re3.exe bin/%PLATFORM%/%CONFIGURATION%/re3.pdb
|
- 7z a "reVC_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip" bin/%PLATFORM%/%CONFIGURATION%/re3.exe bin/%PLATFORM%/%CONFIGURATION%/re3.pdb
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: "re3_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip"
|
- path: "reVC_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip"
|
||||||
name: re3
|
name: reVC
|
||||||
deploy:
|
deploy:
|
||||||
- provider: BinTray
|
- provider: BinTray
|
||||||
username: shfil119
|
username: shfil119
|
||||||
|
@ -43,7 +43,7 @@ deploy:
|
||||||
repo: re3
|
repo: re3
|
||||||
package: "%configuration%_%platform%"
|
package: "%configuration%_%platform%"
|
||||||
version: "%APPVEYOR_BUILD_VERSION%"
|
version: "%APPVEYOR_BUILD_VERSION%"
|
||||||
artifact: re3
|
artifact: reVC
|
||||||
publish: true
|
publish: true
|
||||||
on:
|
on:
|
||||||
branch: master
|
branch: master
|
||||||
|
|
|
@ -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
50
premake5.lua
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue