diff options
author | Bob Arnson <bob@joyofsetup.com> | 2017-12-29 15:12:24 -0500 |
---|---|---|
committer | Bob Arnson <bob@joyofsetup.com> | 2017-12-29 15:12:24 -0500 |
commit | 59004832767115df136c553169e992577e5981d6 (patch) | |
tree | 09bc208c63c06820f86cee24e9fe0022f638a132 /src/WixToolset.Core/CommandLine/CommandLineParser.cs | |
parent | ab4ee36c182b67a80ca3404fdc344bf948192740 (diff) | |
download | wix-59004832767115df136c553169e992577e5981d6.tar.gz wix-59004832767115df136c553169e992577e5981d6.tar.bz2 wix-59004832767115df136c553169e992577e5981d6.zip |
Pass along include search paths to those that need it.
Diffstat (limited to 'src/WixToolset.Core/CommandLine/CommandLineParser.cs')
-rw-r--r-- | src/WixToolset.Core/CommandLine/CommandLineParser.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/WixToolset.Core/CommandLine/CommandLineParser.cs b/src/WixToolset.Core/CommandLine/CommandLineParser.cs index 3c7f3d1e..500bed08 100644 --- a/src/WixToolset.Core/CommandLine/CommandLineParser.cs +++ b/src/WixToolset.Core/CommandLine/CommandLineParser.cs | |||
@@ -171,6 +171,10 @@ namespace WixToolset.Core.CommandLine | |||
171 | case "-version": | 171 | case "-version": |
172 | showVersion = true; | 172 | showVersion = true; |
173 | return true; | 173 | return true; |
174 | |||
175 | case "sval": | ||
176 | // todo: implement | ||
177 | return true; | ||
174 | } | 178 | } |
175 | 179 | ||
176 | return false; | 180 | return false; |
@@ -207,7 +211,7 @@ namespace WixToolset.Core.CommandLine | |||
207 | var variables = this.GatherPreprocessorVariables(defines); | 211 | var variables = this.GatherPreprocessorVariables(defines); |
208 | var bindPathList = this.GatherBindPaths(bindPaths); | 212 | var bindPathList = this.GatherBindPaths(bindPaths); |
209 | var type = CalculateOutputType(outputType, outputFile); | 213 | var type = CalculateOutputType(outputType, outputFile); |
210 | return new BuildCommand(this.ServiceProvider, sourceFiles, variables, locFiles, libraryFiles, outputFile, type, cabCachePath, cultures, bindFiles, bindPathList, intermediateFolder, contentsFile, outputsFile, builtOutputsFile); | 214 | return new BuildCommand(this.ServiceProvider, sourceFiles, variables, locFiles, libraryFiles, outputFile, type, cabCachePath, cultures, bindFiles, bindPathList, includePaths, intermediateFolder, contentsFile, outputsFile, builtOutputsFile); |
211 | } | 215 | } |
212 | 216 | ||
213 | case Commands.Compile: | 217 | case Commands.Compile: |