1 files changed, 27 insertions, 9 deletions

diff --git a/premake5.lua b/premake5.lua
index 64b12d3a..c8494884 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -23,6 +23,22 @@ 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" }
@@ -40,6 +56,8 @@ workspace "re3"
 	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"
@@ -58,6 +76,12 @@ workspace "re3"
 	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
@@ -68,17 +92,12 @@ workspace "re3"
 		defines { "RW_GL3" }
 		includedirs { path.join(_OPTIONS["glfwdir"], "include") }
 		includedirs { path.join(_OPTIONS["glewdir"], "include") }
-
-	filter "platforms:win*librw_gl3_glfw*"
-		defines { "GLEW_STATIC" }
 		if(not _OPTIONS["with-librw"]) then
-			libdirs { path.join(Librw, "lib/win-x86-gl3/%{cfg.buildcfg}") }
+			libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
 		end
 
-	filter "platforms:linux*librw_gl3_glfw*"
-		if(not _OPTIONS["with-librw"]) then
-			libdirs { path.join(Librw, "lib/linux-x86-gl3/%{cfg.buildcfg}") }
-		end
+	filter "platforms:win*librw_gl3_glfw*"
+		defines { "GLEW_STATIC" }
 
 	filter  {}
 		
@@ -181,7 +200,6 @@ project "re3"
 		targetextension ".exe"
 
 	filter "platforms:linux*"
-		targetextension ".elf"
 		defines { "OPENAL" }
 		links { "openal", "mpg123", "sndfile", "pthread" }