summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-05 20:46:00 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-05 20:46:00 +0200
commitf0896ceba7c65d1d77191d2108ffa946f7c20cbe (patch)
tree6132df96d704ffdf7a04508e2718b76b8070e485
parentscript stuff (diff)
parentFix appveyour (diff)
downloadre3-f0896ceba7c65d1d77191d2108ffa946f7c20cbe.tar
re3-f0896ceba7c65d1d77191d2108ffa946f7c20cbe.tar.gz
re3-f0896ceba7c65d1d77191d2108ffa946f7c20cbe.tar.bz2
re3-f0896ceba7c65d1d77191d2108ffa946f7c20cbe.tar.lz
re3-f0896ceba7c65d1d77191d2108ffa946f7c20cbe.tar.xz
re3-f0896ceba7c65d1d77191d2108ffa946f7c20cbe.tar.zst
re3-f0896ceba7c65d1d77191d2108ffa946f7c20cbe.zip
-rw-r--r--.appveyor.yml10
-rw-r--r--README.md2
-rw-r--r--premake5.lua50
3 files changed, 34 insertions, 28 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 20adee80..ee25d578 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -27,13 +27,13 @@ install:
premake5 vs2019 --with-librw --glewdir=%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE% --glfwdir=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%
build:
- project: build/re3.sln
+ project: build/reVC.sln
verbosity: minimal
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:
-- path: "re3_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip"
- name: re3
+- path: "reVC_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip"
+ name: reVC
deploy:
- provider: BinTray
username: shfil119
@@ -43,7 +43,7 @@ deploy:
repo: re3
package: "%configuration%_%platform%"
version: "%APPVEYOR_BUILD_VERSION%"
- artifact: re3
+ artifact: reVC
publish: true
on:
branch: master
diff --git a/README.md b/README.md
index 2affcc96..cffdbd1d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
# 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>
| Platform | Debug | Release |
|------------------|-------------|-------------|
diff --git a/premake5.lua b/premake5.lua
index 1d9e423b..d189e975 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -103,6 +103,10 @@ project "librw"
filter {}
end
+local function addSrcFiles( prefix )
+ return prefix .. "/*cpp", prefix .. "/*.h", prefix .. "/*.c", prefix .. "/*.ico", prefix .. "/*.aps", prefix .. "/*.rc"
+end
+
project "reVC"
kind "WindowedApp"
targetname "re3"
@@ -113,27 +117,29 @@ project "reVC"
defines { "MIAMI" }
- files { "src/*.*" }
- files { "src/animation/*.*" }
- files { "src/audio/*.*" }
- files { "src/control/*.*" }
- files { "src/core/*.*" }
- files { "src/entities/*.*" }
- files { "src/math/*.*" }
- files { "src/modelinfo/*.*" }
- files { "src/objects/*.*" }
- files { "src/peds/*.*" }
- files { "src/render/*.*" }
- files { "src/rw/*.*" }
- files { "src/save/*.*" }
- files { "src/skel/*.*" }
- files { "src/skel/win/*.*" }
- files { "src/skel/glfw/*.*" }
- files { "src/text/*.*" }
- files { "src/vehicles/*.*" }
- files { "src/weapons/*.*" }
- files { "src/extras/*.*" }
- files { "eax/*.*" }
+ files { addSrcFiles("src") }
+ files { addSrcFiles("src/animation") }
+ files { addSrcFiles("src/audio") }
+ --files { addSrcFiles("src/audio/miles") }
+ --files { addSrcFiles("src/audio/openal") }
+ files { addSrcFiles("src/control") }
+ files { addSrcFiles("src/core") }
+ files { addSrcFiles("src/entities") }
+ files { addSrcFiles("src/math") }
+ files { addSrcFiles("src/modelinfo") }
+ files { addSrcFiles("src/objects") }
+ files { addSrcFiles("src/peds") }
+ files { addSrcFiles("src/render") }
+ files { addSrcFiles("src/rw") }
+ files { addSrcFiles("src/save") }
+ files { addSrcFiles("src/skel") }
+ files { addSrcFiles("src/skel/win") }
+ files { addSrcFiles("src/skel/glfw") }
+ files { addSrcFiles("src/text") }
+ files { addSrcFiles("src/vehicles") }
+ files { addSrcFiles("src/weapons") }
+ files { addSrcFiles("src/extras") }
+ files { addSrcFiles("eax") }
includedirs { "src" }
includedirs { "src/animation" }
@@ -174,7 +180,7 @@ project "reVC"
filter "platforms:*librw*"
defines { "LIBRW" }
- files { "src/fakerw/*.*" }
+ files { addSrcFiles("src/fakerw") }
includedirs { "src/fakerw" }
includedirs { Librw }
if(_OPTIONS["with-librw"]) then