diff options
| -rw-r--r-- | .github/workflows/macos.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/release-macos.yml | 4 | ||||
| -rw-r--r-- | github_macos_build.sh | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7651f14a9..c795a06bd 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -50,6 +50,7 @@ jobs: 7z a ${SLANG_BINARY_ARCHIVE} slang-gfx.h 7z a ${SLANG_BINARY_ARCHIVE} prelude/*.h 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang.dylib + 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang-glslang.dylib 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libgfx.dylib 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangd diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 7f6fbc1a0..bd3751e81 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -66,6 +66,7 @@ jobs: IDENTITY_ID: d6ada82a113e4204aaad914e1013e9548ffd30d0 run: | /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/libslang.dylib -v + /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/libslang-glslang.dylib -v /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/libgfx.dylib -v /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/slangd -v /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/slangc -v @@ -87,6 +88,7 @@ jobs: 7z a ${SLANG_BINARY_ARCHIVE} slang-gfx.h 7z a ${SLANG_BINARY_ARCHIVE} prelude/*.h 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang.dylib + 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang-glslang.dylib 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libgfx.dylib 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangd @@ -106,10 +108,12 @@ jobs: AC_USERNAME: ${{secrets.APPLE_ID_USERNAME}} run: | cp ./bin/macosx-${{matrix.targetPlatform}}/release/libslang.dylib libslang.dylib + cp ./bin/macosx-${{matrix.targetPlatform}}/release/libslang-glslang.dylib libslang-glslang.dylib cp ./bin/macosx-${{matrix.targetPlatform}}/release/libslang.dylib libgfx.dylib cp ./bin/macosx-${{matrix.targetPlatform}}/release/slangd slangd cp ./bin/macosx-${{matrix.targetPlatform}}/release/slangc slangc 7z a slang-macos-dist.zip libslang.dylib + 7z a slang-macos-dist.zip libslang-glslang.dylib 7z a slang-macos-dist.zip libgfx.dylib 7z a slang-macos-dist.zip slangd 7z a slang-macos-dist.zip slangc diff --git a/github_macos_build.sh b/github_macos_build.sh index 1e8548239..9c3dcda25 100644 --- a/github_macos_build.sh +++ b/github_macos_build.sh @@ -23,7 +23,7 @@ rm -rf ./bin ARCH="arm64" # Create the makefile -./premake5 gmake2 --cc=${CC} --enable-xlib=false --enable-embed-stdlib=true --arch=${TARGETARCH} --deps=true --no-progress=true --skip-source-generation=true --deploy-slang-llvm=false --deploy-slang-glslang=false +./premake5 gmake2 --cc=${CC} --enable-xlib=false --enable-embed-stdlib=true --arch=${TARGETARCH} --deps=true --build-glslang=true --no-progress=true --skip-source-generation=true --deploy-slang-llvm=false --deploy-slang-glslang=false make config=${CONFIGURATION}_${TARGETARCH} -j`sysctl -n hw.ncpu` else # Create the makefile |