diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-04-25 16:15:55 -0400 |
|---|---|---|
| committer | Tim Foley <tfoleyNV@users.noreply.github.com> | 2019-04-25 13:15:55 -0700 |
| commit | d3709c0a58eae582d3750310a9a19b5593876e3b (patch) | |
| tree | 724a14e47262a4d87b22e8e2fe0aca258a65b2b2 /premake5.lua | |
| parent | b5ca6352416995b5edd358623a6ae5db38d5e634 (diff) | |
Feature/build osx (#955)
* * Moved CPU determination macros to slang.h
* Determine SlangUInt/SlangInt from the pointer width (determined from CPU macros)
* Removed the UnambiguousInt and UnambigousUInt types - as a previous fragile work around
* Removed UInt/Int definition from smart-pointer.h as now in common.h
* * Remove ambiguity for PrettyWriter and ints
* Improve comment around SlangInt/UInt
* More fixes around ambiguity with PrettyWriter and integral types.
* Disable VK on OSX.
* Define guids with inner braces.
* For glslang use linux ossource for macosx.
* Pull is ossource for OSX.
* Fix dll loading for OSX.
* Added how to build for OSX to building.md.
* Force CI to rebuild as spurious error.
* Improvements to the building.md documentation.
* Small doc fix.
Diffstat (limited to 'premake5.lua')
| -rw-r--r-- | premake5.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/premake5.lua b/premake5.lua index e6c0ea069..fcd83eb4f 100644 --- a/premake5.lua +++ b/premake5.lua @@ -704,7 +704,7 @@ standardProject "slang-glslang" addSourceDir( "external/glslang/glslang/OSDependent/Windows" ) removefiles { "external/glslang/glslang/OSDependent/Windows/main.cpp" } - filter { "system:linux" } + filter { "system:linux or macosx" } links { "dl", "pthread" } addSourceDir("external/glslang/glslang/OSDependent/Unix") buildoptions{"-fPIC", "-pthread"} |