Merge branch 'nazara-next' into graphics-next

build/scripts/common.lua

@@ -158,7 +158,8 @@ function NazaraBuild:Execute()
 				"../include",
 				"../src/"
 			})
-			sysincludedirs("../thirdparty/include")
+
+			sysincludedirs("../thirdparty/include", "/usr/local/include/")
 
 			files(moduleTable.Files)
 			excludes(moduleTable.FilesExcluded)
@@ -173,6 +174,14 @@ function NazaraBuild:Execute()
 				"../thirdparty/lib/common",
 				"../lib"
 			})
+			
+			if (os.ishost("macosx")) then
+				libdirs({
+					"../thirdparty/lib/common",
+					"../lib",
+					"/usr/local/lib" --brew
+				})
+			end
 
 			-- Output to lib/conf/arch
 			self:FilterLibDirectory("../lib/", targetdir)
@@ -932,7 +941,10 @@ end
 
 function NazaraBuild:PostconfigGenericProject()
 	-- Add options required for C++17 thread and filesystem (have to be linked last)
-	filter("action:gmake*")
+	filter({"action:gmake*", "system:macosx"})
+		links("pthread")
+		
+	filter({"action:gmake*", "system:not macosx"})
 		links("stdc++fs")
 		links("pthread")
 

build/scripts/modules/physics3d.lua

@@ -21,4 +21,10 @@ MODULE.Custom = function()
 
 	filter({"architecture:x86", "system:linux"})
 		defines("_POSIX_VER")
+	
+	filter({"architecture:x86_64", "system:macosx"})
+		defines("_POSIX_VER_64")
+
+	filter({"architecture:x86", "system:macosx"})
+		defines("_POSIX_VER")
 end

build/scripts/modules/platform.lua

@@ -21,11 +21,15 @@ MODULE.OsDefines.Windows = {
 	"SDL_VIDEO_DRIVER_WINDOWS=1"
 }
 
-MODULE.OsDefines.Posix = {
-	"SDL_VIDEO_DRIVER_X11=1",
-	"SDL_VIDEO_DRIVER_WAYLAND=1",
-}
-
 MODULE.DynLib = {
 	"SDL2"
 }
+
+MODULE.Custom = function()
+	filter("system:linux")
+		defines("SDL_VIDEO_DRIVER_X11=1")
+		defines("SDL_VIDEO_DRIVER_WAYLAND=1")
+
+	filter("system:macosx")
+		defines("SDL_VIDEO_DRIVER_COCOA=1")
+end