diff options
| author | Yong He <yonghe@outlook.com> | 2021-09-30 17:51:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 17:51:56 -0700 |
| commit | 122d701513e116856bd59c999221ce36a373d7db (patch) | |
| tree | 95c2358708246deeebd63f773a9446b59334efbf /premake5.lua | |
| parent | aa8f7b899b7b562b3d3c6e25c3da41569505e70c (diff) | |
Fix GitHub release (#1956)
* Fix aarch64 release build config.
* Fix for WinAarch64 build.
* Update premake for embed-std-lib build on aarch64.
* `platform` fix for aarach64 build.
* Try revert back to use absolute output path for slang-stdlib-generated.h
* Fix
* fix
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'premake5.lua')
| -rw-r--r-- | premake5.lua | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/premake5.lua b/premake5.lua index 56094f0c1..32760d25e 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1184,6 +1184,7 @@ if enableEmbedStdLib then "source/slang/slang-stdlib-api.cpp", } + defines { "SLANG_DYNAMIC_EXPORT" } -- Only produce the embedded stdlib if that option is enabled local executableSuffix = getExecutableSuffix() @@ -1195,16 +1196,19 @@ if enableEmbedStdLib then local absOutputPath = absDirectory .. "/slang-stdlib-generated.h" -- I don't know why I need a filter, but without it nothing works (!) - filter "files:source/slang/slang-stdlib-api.cpp" - - -- Note! Has to be an absolute path else doesn't work(!) - buildoutputs { absOutputPath } - + filter("files:source/slang/slang-stdlib-api.cpp") + -- Note! Has to be an absolute path else doesn't work(!) + buildoutputs { absOutputPath } + local f = getWinArm64Filter(true) + table.insert(f, "files:source/slang/slang-stdlib-api.cpp") + filter(f) + buildinputs { '"' .. getWinArm64BuildDir(true) .. '/slangc-bootstrap"' .. executableSuffix } + buildcommands {'"' .. getWinArm64BuildDir(true) .. '/slangc-bootstrap" -archive-type riff-lz4 -save-stdlib-bin-source "%{file.directory}/slang-stdlib-generated.h"' } + f = getWinArm64Filter(false) + table.insert(f, "files:source/slang/slang-stdlib-api.cpp") + filter(f) buildinputs { "%{cfg.targetdir}/slangc-bootstrap" .. executableSuffix } - - local buildcmd = '"%{cfg.targetdir}/slangc-bootstrap" -archive-type riff-lz4 -save-stdlib-bin-source %{file.directory}/slang-stdlib-generated.h' - - buildcommands { buildcmd } + buildcommands { '"%{cfg.targetdir}/slangc-bootstrap" -archive-type riff-lz4 -save-stdlib-bin-source "%{file.directory}/slang-stdlib-generated.h"' } end |