1 files changed, 326 insertions, 306 deletions

diff --git a/premake5.lua b/premake5.lua
index c8190e15..dc64956d 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -1,308 +1,328 @@
-newoption {
-	trigger     = "glewdir",
-	value       = "PATH",
-	description = "Directory of GLEW",
-	default     = "glew-2.1.0"
-}
-
-newoption {
-	trigger     = "glfwdir64",
-	value       = "PATH",
-	description = "Directory of glfw",
-	default     = "glfw-3.3.2.bin.WIN64",
-}
-
-newoption {
-	trigger     = "glfwdir32",
-	value       = "PATH",
-	description = "Directory of glfw",
-	default     = "glfw-3.3.2.bin.WIN32",
-}
-
-newoption {
-	trigger     = "with-librw",
-	description = "Build and use librw from this solution"
-}
-
-newoption {
-	trigger     = "with-opus",
-	description = "Build with opus"
-}
-
-if(_OPTIONS["with-librw"]) then
-	Librw = "librw"
-else
-	Librw = os.getenv("LIBRW") or "librw"
-end
-
-function getsys(a)
-	if a == 'windows' then
-		return 'win'
-	end
-	return a
-end
-
-function getarch(a)
-	if a == 'x86_64' then
-		return 'amd64'
-	elseif a == 'ARM' then
-		return 'arm'
-	end
-	return a
-end
-
-workspace "re3"
-	language "C++"
-	configurations { "Debug", "Release" }
-	location "build"
-	symbols "Full"
-	staticruntime "off"
-
-	filter { "system:windows" }
-		platforms {
-			"win-x86-RW33_d3d8-mss",
-			"win-x86-librw_d3d9-mss",
-			"win-x86-librw_gl3_glfw-mss",
-			"win-x86-RW33_d3d8-oal",
-			"win-x86-librw_d3d9-oal",
-			"win-x86-librw_gl3_glfw-oal",
-			"win-amd64-librw_d3d9-oal",
-			"win-amd64-librw_gl3_glfw-oal",
-		}
-
-	filter { "system:linux" }
-		platforms {
-			"linux-x86-librw_gl3_glfw-oal",
-			"linux-amd64-librw_gl3_glfw-oal",
-			"linux-arm-librw_gl3_glfw-oal",
-		}
-
-	filter "configurations:Debug"
-		defines { "DEBUG" }
-		
-	filter "configurations:Release"
-		defines { "NDEBUG" }
-		optimize "On"
-
-	filter { "platforms:win*" }
-		system "windows"
-
-	filter { "platforms:linux*" }
-		system "linux"
-		
-	filter { "platforms:*x86*" }
-		architecture "x86"
-		
-	filter { "platforms:*amd64*" }
-		architecture "amd64"
-
-	filter { "platforms:*arm*" }
-		architecture "ARM"
-
-	filter { "platforms:*librw_d3d9*" }
-		defines { "RW_D3D9" }
-		if(not _OPTIONS["with-librw"]) then
-			libdirs { path.join(Librw, "lib/win-%{getarch(cfg.architecture)}-d3d9/%{cfg.buildcfg}") }
-		end
-		
-	filter "platforms:*librw_gl3_glfw*"
-		defines { "RW_GL3" }
-		includedirs { path.join(_OPTIONS["glewdir"], "include") }
-		if(not _OPTIONS["with-librw"]) then
-			libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
-		end
-		
-	filter "platforms:*x86-librw_gl3_glfw*"
-		includedirs { path.join(_OPTIONS["glfwdir32"], "include") }
-		
-	filter "platforms:*amd64-librw_gl3_glfw*"
-		includedirs { path.join(_OPTIONS["glfwdir64"], "include") }
-
-	filter "platforms:win*librw_gl3_glfw*"
-		defines { "GLEW_STATIC" }
-
-	filter  {}
-		
-    function setpaths (gamepath, exepath, scriptspath)
-       scriptspath = scriptspath or ""
-       if (gamepath) then
-          postbuildcommands {
-             '{COPY} "%{cfg.buildtarget.abspath}" "' .. gamepath .. scriptspath .. '%{cfg.buildtarget.name}"'
-          }
-          debugdir (gamepath)
-          if (exepath) then
-			 -- Used VS variable $(TargetFileName) because it doesn't accept premake tokens. Does debugcommand even work outside VS??
-             debugcommand (gamepath .. "$(TargetFileName)")
-             dir, file = exepath:match'(.*/)(.*)'
-             debugdir (gamepath .. (dir or ""))
-          end
-       end
-       --targetdir ("bin/%{prj.name}/" .. scriptspath)
-    end
-
-if(_OPTIONS["with-librw"]) then
-project "librw"
-	kind "StaticLib"
-	targetname "rw"
-	targetdir "lib/%{cfg.platform}/%{cfg.buildcfg}"
-	files { path.join(Librw, "src/*.*") }
-	files { path.join(Librw, "src/*/*.*") }
-	filter "platforms:*RW33*"
-		flags { "ExcludeFromBuild" }
-	filter  {}
-end
-
-local function addSrcFiles( prefix )
-	return prefix .. "/*cpp", prefix .. "/*.h", prefix .. "/*.c", prefix .. "/*.ico", prefix .. "/*.rc"
-end
-
-project "re3"
-	kind "WindowedApp"
-	targetname "re3"
-	targetdir "bin/%{cfg.platform}/%{cfg.buildcfg}"
-
-	files { addSrcFiles("src") }
-	files { addSrcFiles("src/animation") }
+newoption {

+	trigger     = "glewdir",

+	value       = "PATH",

+	description = "Directory of GLEW",

+	default     = "glew-2.1.0"

+}

+

+newoption {

+	trigger     = "glfwdir64",

+	value       = "PATH",

+	description = "Directory of glfw",

+	default     = "glfw-3.3.2.bin.WIN64",

+}

+

+newoption {

+	trigger     = "glfwdir32",

+	value       = "PATH",

+	description = "Directory of glfw",

+	default     = "glfw-3.3.2.bin.WIN32",

+}

+

+newoption {

+	trigger     = "with-librw",

+	description = "Build and use librw from this solution"

+}

+

+newoption {

+	trigger     = "with-opus",

+	description = "Build with opus"

+}

+

+if(_OPTIONS["with-librw"]) then

+	Librw = "librw"

+else

+	Librw = os.getenv("LIBRW") or "librw"

+end

+

+function getsys(a)

+	if a == 'windows' then

+		return 'win'

+	end

+	return a

+end

+

+function getarch(a)

+	if a == 'x86_64' then

+		return 'amd64'

+	elseif a == 'ARM' then

+		return 'arm'

+	end

+	return a

+end

+

+workspace "re3"

+	language "C++"

+	configurations { "Debug", "Release" }

+	location "build"

+	symbols "Full"

+	staticruntime "off"

+

+	filter { "system:windows" }

+		platforms {

+			"win-x86-RW33_d3d8-mss",

+			"win-x86-librw_d3d9-mss",

+			"win-x86-librw_gl3_glfw-mss",

+			"win-x86-RW33_d3d8-oal",

+			"win-x86-librw_d3d9-oal",

+			"win-x86-librw_gl3_glfw-oal",

+			"win-amd64-librw_d3d9-oal",

+			"win-amd64-librw_gl3_glfw-oal",

+		}

+

+	filter { "system:linux" }

+		platforms {

+			"linux-x86-librw_gl3_glfw-oal",

+			"linux-amd64-librw_gl3_glfw-oal",

+			"linux-arm-librw_gl3_glfw-oal",

+		}

+	filter { "system:bsd" }

+		platforms {

+			"bsd-amd64-librw_gl3_glfw-oal"

+		}

+

+	filter "configurations:Debug"

+		defines { "DEBUG" }

+		

+	filter "configurations:Release"

+		defines { "NDEBUG" }

+		optimize "On"

+

+	filter { "platforms:win*" }

+		system "windows"

+

+	filter { "platforms:linux*" }

+		system "linux"

+	

+	filter { "platforms:bsd*" }

+		system "bsd"

+		

+	filter { "platforms:*x86*" }

+		architecture "x86"

+		

+	filter { "platforms:*amd64*" }

+		architecture "amd64"

+

+	filter { "platforms:*arm*" }

+		architecture "ARM"

+

+	filter { "platforms:*librw_d3d9*" }

+		defines { "RW_D3D9" }

+		if(not _OPTIONS["with-librw"]) then

+			libdirs { path.join(Librw, "lib/win-%{getarch(cfg.architecture)}-d3d9/%{cfg.buildcfg}") }

+		end

+		

+	filter "platforms:*librw_gl3_glfw*"

+		defines { "RW_GL3" }

+		includedirs { path.join(_OPTIONS["glewdir"], "include") }

+		if(not _OPTIONS["with-librw"]) then

+			libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }

+		end

+		

+	filter "platforms:*x86-librw_gl3_glfw*"

+		includedirs { path.join(_OPTIONS["glfwdir32"], "include") }

+		

+	filter "platforms:*amd64-librw_gl3_glfw*"

+		includedirs { path.join(_OPTIONS["glfwdir64"], "include") }

+

+	filter "platforms:win*librw_gl3_glfw*"

+		defines { "GLEW_STATIC" }

+

+	filter  {}

+		

+    function setpaths (gamepath, exepath, scriptspath)

+       scriptspath = scriptspath or ""

+       if (gamepath) then

+          postbuildcommands {

+             '{COPY} "%{cfg.buildtarget.abspath}" "' .. gamepath .. scriptspath .. '%{cfg.buildtarget.name}"'

+          }

+          debugdir (gamepath)

+          if (exepath) then

+			 -- Used VS variable $(TargetFileName) because it doesn't accept premake tokens. Does debugcommand even work outside VS??

+             debugcommand (gamepath .. "$(TargetFileName)")

+             dir, file = exepath:match'(.*/)(.*)'

+             debugdir (gamepath .. (dir or ""))

+          end

+       end

+       --targetdir ("bin/%{prj.name}/" .. scriptspath)

+    end

+

+if(_OPTIONS["with-librw"]) then

+project "librw"

+	kind "StaticLib"

+	targetname "rw"

+	targetdir "lib/%{cfg.platform}/%{cfg.buildcfg}"

+	files { path.join(Librw, "src/*.*") }

+	files { path.join(Librw, "src/*/*.*") }

+	

+	filter "platforms:bsd*"

+		includedirs { "/usr/local/include" }

+		libdirs { "/usr/local/lib" }

+	

+	filter "platforms:*RW33*"

+		flags { "ExcludeFromBuild" }

+	filter  {}

+end

+

+local function addSrcFiles( prefix )

+	return prefix .. "/*cpp", prefix .. "/*.h", prefix .. "/*.c", prefix .. "/*.ico", prefix .. "/*.rc"

+end

+

+project "re3"

+	kind "WindowedApp"

+	targetname "re3"

+	targetdir "bin/%{cfg.platform}/%{cfg.buildcfg}"

+

+	files { addSrcFiles("src") }

+	files { addSrcFiles("src/animation") }

 	files { addSrcFiles("src/audio") }

-	files { addSrcFiles("src/audio/eax") }
-	files { addSrcFiles("src/audio/oal") }
-	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/glfw") }
-	files { addSrcFiles("src/text") }
-	files { addSrcFiles("src/vehicles") }
-	files { addSrcFiles("src/weapons") }
-	files { addSrcFiles("src/extras") }
-
-	includedirs { "src" }
-	includedirs { "src/animation" }
+	files { addSrcFiles("src/audio/eax") }

+	files { addSrcFiles("src/audio/oal") }

+	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/glfw") }

+	files { addSrcFiles("src/text") }

+	files { addSrcFiles("src/vehicles") }

+	files { addSrcFiles("src/weapons") }

+	files { addSrcFiles("src/extras") }

+

+	includedirs { "src" }

+	includedirs { "src/animation" }

 	includedirs { "src/audio" }

-	includedirs { "src/audio/eax" }
-	includedirs { "src/audio/oal" }
-	includedirs { "src/control" }
-	includedirs { "src/core" }
-	includedirs { "src/entities" }
-	includedirs { "src/math" }
-	includedirs { "src/modelinfo" }
-	includedirs { "src/objects" }
-	includedirs { "src/peds" }
-	includedirs { "src/render" }
-	includedirs { "src/rw" }
-	includedirs { "src/save/" }
-	includedirs { "src/skel/" }
-	includedirs { "src/skel/glfw" }
-	includedirs { "src/text" }
-	includedirs { "src/vehicles" }
-	includedirs { "src/weapons" }
-	includedirs { "src/extras" }
-	
-	if _OPTIONS["with-opus"] then
-		includedirs { "ogg/include" }
-		includedirs { "opus/include" }
-		includedirs { "opusfile/include" }
-	end
-
-	filter "platforms:*mss"
-		defines { "AUDIO_MSS" }
-		includedirs { "sdk/milessdk/include" }
-		libdirs { "sdk/milessdk/lib" }
-	
-	if _OPTIONS["with-opus"] then
-		filter "platforms:win*"
-			libdirs { "ogg/win32/VS2015/Win32/%{cfg.buildcfg}" }
-			libdirs { "opus/win32/VS2015/Win32/%{cfg.buildcfg}" }
-			libdirs { "opusfile/win32/VS2015/Win32/Release-NoHTTP" }
-		filter {}
-		defines { "AUDIO_OPUS" }
-	end
-		
-	filter "platforms:*oal"
-		defines { "AUDIO_OAL" }
-	
-	filter {}
-	if(os.getenv("GTA_III_RE_DIR")) then
-		setpaths("$(GTA_III_RE_DIR)/", "%(cfg.buildtarget.name)", "")
-	end
-	
-	filter "platforms:win*"
-		files { addSrcFiles("src/skel/win") }
-		includedirs { "src/skel/win" }
-		linkoptions "/SAFESEH:NO"
-		characterset ("MBCS")
-		targetextension ".exe"
-		
-	filter "platforms:win-x86*oal"
-		includedirs { "openal-soft/include" }
-		includedirs { "libsndfile.32/include" }
-		includedirs { "mpg123.32/include" }
-		libdirs { "mpg123.32/lib" }
-		libdirs { "libsndfile.32/lib" }
-		libdirs { "openal-soft/libs/Win32" }
-		
-	filter "platforms:win-amd64*oal"
-		includedirs { "openal-soft/include" }
-		includedirs { "libsndfile.64/include" }
-		includedirs { "mpg123.64/include" }
-		libdirs { "mpg123.64/lib" }
-		libdirs { "libsndfile.64/lib" }
-		libdirs { "openal-soft/libs/Win64" }
-
-	filter "platforms:linux*oal"
-		links { "openal", "mpg123", "sndfile", "pthread" }
-	
-	if _OPTIONS["with-opus"] then
-		filter {}
-		links { "libogg" }
-		links { "opus" }
-		links { "opusfile" }
-	end
-
-	filter "platforms:*RW33*"
-		staticruntime "on"
-		includedirs { "sdk/rwsdk/include/d3d8" }
-		libdirs { "sdk/rwsdk/lib/d3d8/release" }
-		links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtcharse" }
-		defines { "RWLIBS" }
-		linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text"
-	
-	filter "platforms:*librw*"
-		defines { "LIBRW" }
-		files { addSrcFiles("src/fakerw") }
-		includedirs { "src/fakerw" }
-		includedirs { Librw }
-		if(_OPTIONS["with-librw"]) then
-			libdirs { "lib/%{cfg.platform}/%{cfg.buildcfg}" }
-		end
-		links { "rw" }
-
-	filter "platforms:*d3d9*"
-		links { "d3d9" }
-		
-	filter "platforms:*x86*d3d*"
-		includedirs { "sdk/dx8sdk/include" }
-		libdirs { "sdk/dx8sdk/lib" }
-
-	filter "platforms:*amd64*d3d9*"
-		defines { "USE_D3D9" }
-		
-	filter "platforms:win-x86*gl3_glfw*"
-		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }
-		libdirs { path.join(_OPTIONS["glfwdir32"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
-		links { "opengl32", "glew32s", "glfw3" }
-		
-	filter "platforms:win-amd64*gl3_glfw*"
-		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") }
-		libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
-		links { "opengl32", "glew32s", "glfw3" }
-
-	filter "platforms:linux*gl3_glfw*"
-		links { "GL", "GLEW", "glfw" }
+	includedirs { "src/audio/eax" }

+	includedirs { "src/audio/oal" }

+	includedirs { "src/control" }

+	includedirs { "src/core" }

+	includedirs { "src/entities" }

+	includedirs { "src/math" }

+	includedirs { "src/modelinfo" }

+	includedirs { "src/objects" }

+	includedirs { "src/peds" }

+	includedirs { "src/render" }

+	includedirs { "src/rw" }

+	includedirs { "src/save/" }

+	includedirs { "src/skel/" }

+	includedirs { "src/skel/glfw" }

+	includedirs { "src/text" }

+	includedirs { "src/vehicles" }

+	includedirs { "src/weapons" }

+	includedirs { "src/extras" }

+	

+	if _OPTIONS["with-opus"] then

+		includedirs { "ogg/include" }

+		includedirs { "opus/include" }

+		includedirs { "opusfile/include" }

+	end

+

+	filter "platforms:*mss"

+		defines { "AUDIO_MSS" }

+		includedirs { "sdk/milessdk/include" }

+		libdirs { "sdk/milessdk/lib" }

+	

+	if _OPTIONS["with-opus"] then

+		filter "platforms:win*"

+			libdirs { "ogg/win32/VS2015/Win32/%{cfg.buildcfg}" }

+			libdirs { "opus/win32/VS2015/Win32/%{cfg.buildcfg}" }

+			libdirs { "opusfile/win32/VS2015/Win32/Release-NoHTTP" }

+		filter {}

+		defines { "AUDIO_OPUS" }

+	end

+		

+	filter "platforms:*oal"

+		defines { "AUDIO_OAL" }

+	

+	filter {}

+	if(os.getenv("GTA_III_RE_DIR")) then

+		setpaths("$(GTA_III_RE_DIR)/", "%(cfg.buildtarget.name)", "")

+	end

+	

+	filter "platforms:win*"

+		files { addSrcFiles("src/skel/win") }

+		includedirs { "src/skel/win" }

+		linkoptions "/SAFESEH:NO"

+		characterset ("MBCS")

+		targetextension ".exe"

+		

+	filter "platforms:win-x86*oal"

+		includedirs { "openal-soft/include" }

+		includedirs { "libsndfile.32/include" }

+		includedirs { "mpg123.32/include" }

+		libdirs { "mpg123.32/lib" }

+		libdirs { "libsndfile.32/lib" }

+		libdirs { "openal-soft/libs/Win32" }

+		

+	filter "platforms:win-amd64*oal"

+		includedirs { "openal-soft/include" }

+		includedirs { "libsndfile.64/include" }

+		includedirs { "mpg123.64/include" }

+		libdirs { "mpg123.64/lib" }

+		libdirs { "libsndfile.64/lib" }

+		libdirs { "openal-soft/libs/Win64" }

+

+	filter "platforms:linux*oal"

+		links { "openal", "mpg123", "sndfile", "pthread" }

+	

+	filter "platforms:linux*oal"

+		links { "openal", "mpg123", "sndfile", "pthread" }

+

+	if _OPTIONS["with-opus"] then

+		filter {}

+		links { "libogg" }

+		links { "opus" }

+		links { "opusfile" }

+	end

+

+	filter "platforms:*RW33*"

+		staticruntime "on"

+		includedirs { "sdk/rwsdk/include/d3d8" }

+		libdirs { "sdk/rwsdk/lib/d3d8/release" }

+		links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtcharse" }

+		defines { "RWLIBS" }

+		linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text"

+	

+	filter "platforms:*librw*"

+		defines { "LIBRW" }

+		files { addSrcFiles("src/fakerw") }

+		includedirs { "src/fakerw" }

+		includedirs { Librw }

+		if(_OPTIONS["with-librw"]) then

+			libdirs { "lib/%{cfg.platform}/%{cfg.buildcfg}" }

+		end

+		links { "rw" }

+

+	filter "platforms:*d3d9*"

+		links { "d3d9" }

+		

+	filter "platforms:*x86*d3d*"

+		includedirs { "sdk/dx8sdk/include" }

+		libdirs { "sdk/dx8sdk/lib" }

+

+	filter "platforms:*amd64*d3d9*"

+		defines { "USE_D3D9" }

+		

+	filter "platforms:win-x86*gl3_glfw*"

+		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }

+		libdirs { path.join(_OPTIONS["glfwdir32"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }

+		links { "opengl32", "glew32s", "glfw3" }

+		

+	filter "platforms:win-amd64*gl3_glfw*"

+		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") }

+		libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }

+		links { "opengl32", "glew32s", "glfw3" }

+

+	filter "platforms:linux*gl3_glfw*"

+		links { "GL", "GLEW", "glfw" }

+

+	filter "platforms:bsd*gl3_glfw*"

+		links { "GL", "GLEW", "glfw", "sysinfo" }

+		includedirs { "/usr/local/include" }

+		libdirs { "/usr/local/lib" }