From 15f07d14b5f048dc355536cbdf5cf9c10291b13b Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 10 Feb 2022 13:57:59 -0500 Subject: Fix MacOSX build issues (#2124) * #include an absolute path didn't work - because paths were taken to always be relative. * Small fixes. Added compiler crash with generic defined in a function. Added enum-flags test that works (by limiting backing type to int), and using __EnumType constraint. * Add comment about crash. * Disable crashing test. * Fixes to make compile on OSX. * Add github build for OSX. * Make premake generator a utility. * Fix osx compilation issue. * More fixes for OSX build. * OSX fix due to ambiguity around size_t and integer types. * Disable xlib on build on osx. * Use 'prebuildcommands' to make prebuild make utility projects do something. * Small fixes for premake so utility works on linux/osx. * Another hack to try and make generators run when 'utility' * Fix typo in macos.yml. * Revert premake to old style, and disable stdlib embedding on OSX. --- premake5.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index dc6f1a552..064253d1b 100644 --- a/premake5.lua +++ b/premake5.lua @@ -203,9 +203,10 @@ newoption { -- TODO(JS): What's the point in the enable-xlib command line option if it's just overridden here? - if targetInfo.isWindows then + if targetInfo.isWindows or os.target() == "macosx" then enableXlib = false end + -- Even if we have the nvapi path, we only want to currently enable on windows targets enableNvapi = not not (os.isdir(nvapiPath) and targetInfo.isWindows and _OPTIONS["enable-nvapi"] == "true") -- cgit v1.2.3