Merge remote-tracking branch 'upstream/miami' into miami

.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"
+- path: "reVC_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip"
-  name: re3
+  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

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 |
 |------------------|-------------|-------------|

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 { 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/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