Merge branch 'main' of https://github.com/EpicGames/zen

1 files changed, 16 insertions, 6 deletions

diff --git a/xmake.lua b/xmake.lua
index 10118d13f..deb541590 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -76,8 +76,12 @@ if is_os("windows") then
         "WIN32_LEAN_AND_MEAN",  -- cut down Windows.h
         "_WIN32_WINNT=0x0A00"
     )
-    add_cxxflags("/d1trimfile:$(curdir)\\")
-    add_cxxflags("/Zc:preprocessor") -- Enable preprocessor conformance mode
+    -- Make builds more deterministic and portable
+    add_cxxflags("/d1trimfile:$(curdir)\\")     -- eliminates the base path from __FILE__ paths
+    add_cxxflags("/experimental:deterministic") -- (more) deterministic compiler output
+    add_ldflags("/PDBALTPATH:%_PDB%")           -- deterministic pdb reference in exe
+
+    add_cxxflags("/Zc:preprocessor") -- Enable preprocessor conformance mode    
     -- add_ldflags("/MAP")
 end
 
@@ -186,11 +190,17 @@ task("precommit")
 task("sln")
     set_menu {
         usage = "xmake sln",
-        description = "Generate Visual Studio project files",
+        description = "Generate IDE project files",
     }
-    on_run(function ()
-        print(os.exec("xmake project --yes --kind=vsxmake2022 -m release,debug -a x64"))
-    end)
+    if is_os("windows") then
+        on_run(function ()
+                print(os.exec("xmake project --yes --kind=vsxmake2022 -m release,debug -a x64"))
+        end)
+    elseif is_os("macosx") then
+        on_run(function ()
+                print(os.exec("xmake project --yes --kind=xcode -m release,debug -a x64,arm64"))
+        end)
+    end
 
 task("test")
     set_menu {