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 /source | |
| 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 'source')
| -rw-r--r-- | source/core/platform.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/core/platform.cpp b/source/core/platform.cpp index e7575d21e..238fccd08 100644 --- a/source/core/platform.cpp +++ b/source/core/platform.cpp @@ -153,10 +153,17 @@ SLANG_COMPILE_TIME_ASSERT(E_OUTOFMEMORY == SLANG_E_OUT_OF_MEMORY); #if __CYGWIN__ dst.Append(name); dst.Append(".dll"); -#else +#elif SLANG_APPLE_FAMILY + dst.Append("lib"); + dst.Append(name); + dst.Append(".dylib"); +#elif SLANG_LINUX_FAMILY dst.Append("lib"); dst.Append(name); dst.Append(".so"); +#else + // Just guess we can do with the name on it's own + dst.Append(name); #endif } |