From 434fd8ec7558614a3b6eef484410dddd62c9cbbd Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 10 Feb 2022 20:06:29 -0500 Subject: Add glslang OSX (#2128) * #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. * OSX testing. * Fix pipe handling for OSX. * Enable testing on OSX. * Small fix because uname -p is not x64 on darwin. * Use glslang from slang-binaries for OSX. --- premake5.lua | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'premake5.lua') diff --git a/premake5.lua b/premake5.lua index 064253d1b..cbe062617 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1357,6 +1357,12 @@ newoption { postbuildcommands { "{COPY} ../../../external/slang-binaries/bin/" .. targetName .. "/libslang-glslang.so %{cfg.targetdir}" } + + filter { "system:macosx" } + postbuildcommands { + "{COPY} ../../../external/slang-binaries/bin/" .. targetName .. "/libslang-glslang.dylib %{cfg.targetdir}" + } + end filter {"configurations:debug"} -- cgit v1.2.3