From 52907088f931ac73c0cf4cae23b60d936e76e560 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 5 May 2020 20:40:27 +0300 Subject: [PATCH 1/4] Fix build status and don't add random files into the project --- README.md | 2 +- premake5.lua | 50 ++++++++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 23 deletions(-) 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) | Platform | Debug | Release | |------------------|-------------|-------------| diff --git a/premake5.lua b/premake5.lua index 1c313a10..2bedf552 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 "re3" kind "WindowedApp" targetname "re3" @@ -112,27 +116,29 @@ project "re3" linkoptions "/SAFESEH:NO" - 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" } @@ -173,7 +179,7 @@ project "re3" filter "platforms:*librw*" defines { "LIBRW" } - files { "src/fakerw/*.*" } + files { addSrcFiles("src/fakerw") } includedirs { "src/fakerw" } includedirs { Librw } if(_OPTIONS["with-librw"]) then From 3adf740bd53eac264d3b4515c8de9563a868948b Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 5 May 2020 20:51:23 +0300 Subject: [PATCH 2/4] Remove audio from premake --- premake5.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/premake5.lua b/premake5.lua index 2bedf552..fbd2e011 100644 --- a/premake5.lua +++ b/premake5.lua @@ -119,8 +119,8 @@ project "re3" files { addSrcFiles("src") } files { addSrcFiles("src/animation") } files { addSrcFiles("src/audio") } - files { addSrcFiles("src/audio/miles") } - files { addSrcFiles("src/audio/openal") } + --files { addSrcFiles("src/audio/miles") } + --files { addSrcFiles("src/audio/openal") } files { addSrcFiles("src/control") } files { addSrcFiles("src/core") } files { addSrcFiles("src/entities") } From 42a64a23798f53b5d47713071d85ddbf3e4a4aad Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 5 May 2020 20:54:44 +0300 Subject: [PATCH 3/4] appveyor update --- .appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 20adee80..611294a5 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%/reVC.exe bin/%PLATFORM%/%CONFIGURATION%/reVC.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 From 0b61ae11ecf4314f21fa8892cd4361dd390d6326 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 5 May 2020 21:05:51 +0300 Subject: [PATCH 4/4] Fix appveyour --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 611294a5..ee25d578 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,7 +30,7 @@ build: project: build/reVC.sln verbosity: minimal after_build: -- 7z a "reVC_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip" bin/%PLATFORM%/%CONFIGURATION%/reVC.exe bin/%PLATFORM%/%CONFIGURATION%/reVC.pdb +- 7z a "reVC_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip" bin/%PLATFORM%/%CONFIGURATION%/re3.exe bin/%PLATFORM%/%CONFIGURATION%/re3.pdb artifacts: - path: "reVC_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip" name: reVC