Skip to content

Commit 966ff77

Browse files
committed
Fix mixed path separators on Windows in getPlatformSettings (issue #3070)
1 parent 62bf8ed commit 966ff77

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

source/dub/compilers/buildsettings.d

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,14 @@ void getPlatformSettings(in BuildSettingsTemplate this_, ref BuildSettings dst,
545545
// collect source files. Note: D source from 'sourcePaths' and C sources from 'cSourcePaths' are joint into 'sourceFiles'
546546
dst.addSourceFiles(collectFiles(this_.sourcePaths, "*.d"));
547547
dst.addSourceFiles(collectFiles(this_.cSourcePaths, "*.{c,i}"));
548+
version (Windows) {
549+
import std.path : buildNormalizedPath;
550+
import std.algorithm : map;
551+
import std.array : array;
552+
dst.sourceFiles = dst.sourceFiles.map!buildNormalizedPath.array;
553+
if (!dst.mainSourceFile.empty)
554+
dst.mainSourceFile = buildNormalizedPath(dst.mainSourceFile);
555+
}
548556
auto sourceFiles = dst.sourceFiles.sort();
549557

550558
// collect import files and remove sources

0 commit comments

Comments
 (0)