@@ -148,7 +148,7 @@ static bool QueryQt(QtVersion qt, bool debug)
148
148
149
149
string emptyFile = Platform . IsWindows ? "NUL" : "/dev/null" ;
150
150
string output ;
151
- ProcessHelper . Run ( "gcc" , string . Format ( "-v -E -x c++ {0}" , emptyFile ) , out output ) ;
151
+ ProcessHelper . Run ( "gcc" , string . Format ( "-v -E -x c++ {0}" , emptyFile ) , out output , waitForExit : ! Platform . IsWindows ) ;
152
152
qt . Target = Regex . Match ( output , @"Target:\s*(?<target>[^\r\n]+)" ) . Groups [ "target" ] . Value ;
153
153
154
154
const string includeDirsRegex = @"#include <\.\.\.> search starts here:(?<includes>.+)End of search list" ;
@@ -200,7 +200,7 @@ static Dictionary<string, IList<string>> GetDependencies(QtVersion qt)
200
200
var dependencies = new Dictionary < string , IList < string > > ( ) ;
201
201
202
202
var parserOptions = new ParserOptions ( ) ;
203
- parserOptions . addLibraryDirs ( qt . Libs ) ;
203
+ parserOptions . addLibraryDirs ( Platform . IsWindows ? qt . Bins : qt . Libs ) ;
204
204
205
205
foreach ( var libFile in qt . LibFiles )
206
206
{
@@ -216,7 +216,7 @@ static Dictionary<string, IList<string>> GetDependencies(QtVersion qt)
216
216
}
217
217
else
218
218
{
219
- var path = Path . Combine ( qt . Libs , libFile ) ;
219
+ var path = Path . Combine ( Platform . IsWindows ? qt . Bins : qt . Libs , libFile ) ;
220
220
dependencies [ libFile ] = ParseDependenciesFromLibtool ( path ) . ToList ( ) ;
221
221
}
222
222
}
@@ -318,8 +318,8 @@ public static int Main(string[] args)
318
318
logredirect . Start ( ) ;
319
319
}
320
320
321
- var qtSharp = new QtSharp ( new QtModuleInfo ( qt . QMake , qt . Make , qt . Headers , qt . Libs , libFile ,
322
- qt . Target , qt . SystemIncludeDirs , qt . FrameworkDirs , qt . Docs ) ) ;
321
+ var qtSharp = new QtSharp ( new QtModuleInfo ( qt . QMake , qt . Make , qt . Headers , Platform . IsWindows ? qt . Bins : qt . Libs ,
322
+ libFile , qt . Target , qt . SystemIncludeDirs , qt . FrameworkDirs , qt . Docs ) ) ;
323
323
ConsoleDriver . Run ( qtSharp ) ;
324
324
325
325
if ( File . Exists ( qtSharp . LibraryName ) && File . Exists ( Path . Combine ( "release" , qtSharp . InlinesLibraryName ) ) )
0 commit comments