Skip to content

Commit 1a72d00

Browse files
committed
Try to fix Unix build issue in slang dependency
1 parent 2d08a96 commit 1a72d00

File tree

1 file changed

+26
-3
lines changed

1 file changed

+26
-3
lines changed

Dependencies/slang/slang.lua

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,23 @@ Slang.SetupCore = function()
155155
{
156156
sourceDir .. "/*.h",
157157
sourceDir .. "/*.cpp",
158-
sourceDir .. "/windows/*.cpp"
158+
159159
}
160+
161+
if os.target() == "windows" then
162+
local platformFiles =
163+
{
164+
sourceDir .. "/windows/*.cpp"
165+
}
166+
Solution.Util.MergeIntoTable(files, platformFiles)
167+
else
168+
local platformFiles =
169+
{
170+
sourceDir .. "/unix/*.cpp"
171+
}
172+
Solution.Util.MergeIntoTable(files, platformFiles)
173+
end
174+
160175
Solution.Util.SetFiles(files)
161176
Solution.Util.SetIncludes(includeDir)
162177
Solution.Util.SetDefines(defines)
@@ -182,9 +197,17 @@ Slang.SetupCompilerCore = function()
182197
local files =
183198
{
184199
sourceDir .. "/*.h",
185-
sourceDir .. "/*.cpp",
186-
sourceDir .. "/windows/*.cpp"
200+
sourceDir .. "/*.cpp"
187201
}
202+
203+
if os.target() == "windows" then
204+
local platformFiles =
205+
{
206+
sourceDir .. "/windows/*.cpp"
207+
}
208+
Solution.Util.MergeIntoTable(files, platformFiles)
209+
end
210+
188211
Solution.Util.SetFiles(files)
189212
Solution.Util.SetIncludes(includeDir)
190213
Solution.Util.SetDefines(defines)

0 commit comments

Comments
 (0)