diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2018-06-22 15:06:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 15:06:41 -0400 |
| commit | 4fa0111bb35f260a06527f52f71552041827c7df (patch) | |
| tree | a3d695d0f64cf65ca10f762571191e7e99e97304 | |
| parent | d0c9571be3a2167a9f019310aca8f7cd326972c0 (diff) | |
Feature/com helper (#605)
* Added Result definitions to the slang.h
* Removed slang-result.h and added slang-com-helper.h
* Move slang-com-ptr.h to be publically available.
* Add SLANG_IUNKNOWN macros to simplify implementing interfaces.
Use the SLANG_IUNKNOWN macros to in slang.c
* Removed slang-defines.h added outstanding defines to slang.h
* Include slang-com-ptr.h and slang-com-helper.h in archives built with CI.
* Use spaces instead of tabs on appveyor.yml
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 7c167a45c..6be27eefc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ before_deploy: | export SLANG_ARCH_NAME=`uname -p` export SLANG_TAG=${TRAVIS_TAG#v} export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.zip - zip -r ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc bin/*/*/libslang.so bin/*/*/libslang-glslang.so docs/*.md README.md LICENSE slang.h + zip -r ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc bin/*/*/libslang.so bin/*/*/libslang-glslang.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h # We are going to deploy to GitHub Releases # on a successful build from a tag, but only diff --git a/appveyor.yml b/appveyor.yml index 65d444eb8..6d5265f69 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -89,6 +89,8 @@ after_build: 7z a "$env:SLANG_BINARY_ARCHIVE" bin\*\*\slangc.exe 7z a "$env:SLANG_BINARY_ARCHIVE" docs\*.md 7z a "$env:SLANG_SOURCE_ARCHIVE" slang.h + 7z a "$env:SLANG_SOURCE_ARCHIVE" slang-com-helper.h + 7z a "$env:SLANG_SOURCE_ARCHIVE" slang-com-ptr.h 7z a "$env:SLANG_SOURCE_ARCHIVE" source\*\*.h 7z a "$env:SLANG_SOURCE_ARCHIVE" source\*\*.cpp 7z a "$env:SLANG_SOURCE_ARCHIVE" docs\*.md |