diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2022-02-10 20:06:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 20:06:29 -0500 |
| commit | 434fd8ec7558614a3b6eef484410dddd62c9cbbd (patch) | |
| tree | ef5d9f11a5e8fce8a47d2b97c2c03ef5e0650204 | |
| parent | 3f86ebf1ed4908ad0735a190b239e3f3bcbf4cef (diff) | |
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.
| m--------- | external/slang-binaries | 0 | ||||
| -rw-r--r-- | premake5.lua | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/external/slang-binaries b/external/slang-binaries -Subproject 47154b7a618c8822b4e11699c213059cc2a8256 +Subproject 8324a9309a60a8f9472abd0ce91f6122c640453 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"} |