|
334 | 334 | <_Args Include="-x;$(_Language)" Condition=" '$(_Language)' != '' " /> |
335 | 335 |
|
336 | 336 | <_SystemRootDirectories Remove="@(_SystemRootDirectories)" /> |
337 | | - <_SystemRootDirectories Include="%(Compile.SystemRootDirectories)" /> |
338 | 337 | <_SystemRootDirectories Include="@(SystemRootDirectories)" /> |
339 | 338 | <_SystemRootDirectories Include="$(SystemRootDirectories)" /> |
| 339 | + <_SystemRootDirectories Include="%(Compile.SystemRootDirectories)" /> |
340 | 340 | <_SystemRootDirectoriesTemp Remove="@(_SystemRootDirectoriesTemp)" /> |
341 | 341 | <_SystemRootDirectoriesTemp Include="@(_SystemRootDirectories->Distinct())" /> |
342 | 342 | <_SystemRootDirectoriesArgs Remove="@(_SystemRootDirectoriesArgs)" /> |
343 | 343 | <_SystemRootDirectoriesArgs Include="@(_SystemRootDirectoriesTemp->'--sysroot')" Value="%(_SystemRootDirectoriesTemp.Identity)" Separator=" " /> |
344 | 344 | <_Args Include="@(_SystemRootDirectoriesArgs)" /> |
345 | 345 |
|
346 | 346 | <_IncludeSystemRootDirectories Remove="@(_IncludeSystemRootDirectories)" /> |
347 | | - <_IncludeSystemRootDirectories Include="%(Compile.IncludeSystemRootDirectories)" /> |
348 | 347 | <_IncludeSystemRootDirectories Include="@(IncludeSystemRootDirectories)" /> |
349 | 348 | <_IncludeSystemRootDirectories Include="$(IncludeSystemRootDirectories)" /> |
| 349 | + <_IncludeSystemRootDirectories Include="%(Compile.IncludeSystemRootDirectories)" /> |
350 | 350 | <_IncludeSystemRootDirectoriesTemp Remove="@(_IncludeSystemRootDirectoriesTemp)" /> |
351 | 351 | <_IncludeSystemRootDirectoriesTemp Include="@(_IncludeSystemRootDirectories->Distinct())" /> |
352 | 352 | <_IncludeSystemRootDirectoriesArgs Remove="@(_IncludeSystemRootDirectoriesArgs)" /> |
353 | 353 | <_IncludeSystemRootDirectoriesArgs Include="@(_IncludeSystemRootDirectoriesTemp->'-isysroot')" Value="%(_IncludeSystemRootDirectoriesTemp.Identity)" Separator=" " /> |
354 | 354 | <_Args Include="@(_IncludeSystemRootDirectoriesArgs)" /> |
355 | 355 |
|
356 | 356 | <_SystemIncludeDirectories Remove="@(_SystemIncludeDirectories)" /> |
357 | | - <_SystemIncludeDirectories Include="%(Compile.SystemIncludeDirectories)" /> |
358 | 357 | <_SystemIncludeDirectories Include="@(SystemIncludeDirectories)" /> |
359 | 358 | <_SystemIncludeDirectories Include="$(SystemIncludeDirectories)" /> |
| 359 | + <_SystemIncludeDirectories Include="%(Compile.SystemIncludeDirectories)" /> |
360 | 360 | <_SystemIncludeDirectoriesTemp Remove="@(_SystemIncludeDirectoriesTemp)" /> |
361 | 361 | <_SystemIncludeDirectoriesTemp Include="@(_SystemIncludeDirectories->Distinct())" /> |
362 | 362 | <_SystemIncludeDirectoriesArgs Remove="@(_SystemIncludeDirectoriesArgs)" /> |
363 | 363 | <_SystemIncludeDirectoriesArgs Include="@(_SystemIncludeDirectoriesTemp->'-isystem')" Value="%(_SystemIncludeDirectoriesTemp.Identity)" Separator=" " /> |
364 | 364 | <_Args Include="@(_SystemIncludeDirectoriesArgs)" /> |
365 | 365 |
|
366 | 366 | <_IncludeDirectories Remove="@(_IncludeDirectories)" /> |
367 | | - <_IncludeDirectories Include="%(Compile.IncludeDirectories)" /> |
368 | 367 | <_IncludeDirectories Include="@(IncludeDirectories)" /> |
369 | 368 | <_IncludeDirectories Include="$(IncludeDirectories)" /> |
| 369 | + <_IncludeDirectories Include="%(Compile.IncludeDirectories)" /> |
370 | 370 | <_IncludeDirectoriesTemp Remove="@(_IncludeDirectoriesTemp)" /> |
371 | 371 | <_IncludeDirectoriesTemp Include="@(_IncludeDirectories->Distinct())" /> |
372 | 372 | <_IncludeDirectoriesArgs Remove="@(_IncludeDirectoriesArgs)" /> |
373 | 373 | <_IncludeDirectoriesArgs Include="@(_IncludeDirectoriesTemp->'-I')" Value="%(_IncludeDirectoriesTemp.Identity)" Separator="" /> |
374 | 374 | <_Args Include="@(_IncludeDirectoriesArgs)" /> |
375 | 375 |
|
376 | 376 | <_PreprocessorDefinitions Remove="@(_PreprocessorDefinitions)" /> |
377 | | - <_PreprocessorDefinitions Include="%(Compile.PreprocessorDefinitions)" /> |
378 | 377 | <_PreprocessorDefinitions Include="@(PreprocessorDefinitions)" /> |
379 | 378 | <_PreprocessorDefinitions Include="$(PreprocessorDefinitions)" /> |
| 379 | + <_PreprocessorDefinitions Include="%(Compile.PreprocessorDefinitions)" /> |
380 | 380 | <_PreprocessorDefinitionsArgs Remove="@(_PreprocessorDefinitionsArgs)" /> |
381 | 381 | <_PreprocessorDefinitionsArgs Include="@(_PreprocessorDefinitions->'-D')" Value="%(_PreprocessorDefinitions.Identity)" Separator="" Value2="%(_PreprocessorDefinitions.Value)" Separator2="=" /> |
382 | 382 | <_Args Include="@(_PreprocessorDefinitionsArgs)" /> |
383 | 383 |
|
384 | 384 | <_AdditionalOptions Remove="@(_AdditionalOptions)" /> |
385 | | - <_AdditionalOptions Include="%(Compile.AdditionalCompileOptions)" /> |
386 | 385 | <_AdditionalOptions Include="@(AdditionalCompileOptions)" /> |
387 | 386 | <_AdditionalOptions Include="$(AdditionalCompileOptions)" /> |
| 387 | + <_AdditionalOptions Include="%(Compile.AdditionalCompileOptions)" /> |
388 | 388 | <_Args Include="@(_AdditionalOptions)" /> |
389 | 389 |
|
390 | 390 | <_Args Include="$(_SourcePath)" /> |
|
431 | 431 | <_Args Include="-Wl,/subsystem:$(Subsystem)" Condition=" '$(Subsystem)' != '' " /> |
432 | 432 |
|
433 | 433 | <_SystemRootDirectories Remove="@(_SystemRootDirectories)" /> |
434 | | - <_SystemRootDirectories Include="%(Compile.SystemRootDirectories)" /> |
435 | 434 | <_SystemRootDirectories Include="@(SystemRootDirectories)" /> |
436 | 435 | <_SystemRootDirectories Include="$(SystemRootDirectories)" /> |
437 | 436 | <_SystemRootDirectoriesTemp Remove="@(_SystemRootDirectoriesTemp)" /> |
|
441 | 440 | <_Args Include="@(_SystemRootDirectoriesArgs)" /> |
442 | 441 |
|
443 | 442 | <_IncludeSystemRootDirectories Remove="@(_IncludeSystemRootDirectories)" /> |
444 | | - <_IncludeSystemRootDirectories Include="%(Compile.IncludeSystemRootDirectories)" /> |
445 | 443 | <_IncludeSystemRootDirectories Include="@(IncludeSystemRootDirectories)" /> |
446 | 444 | <_IncludeSystemRootDirectories Include="$(IncludeSystemRootDirectories)" /> |
447 | 445 | <_IncludeSystemRootDirectoriesTemp Remove="@(_IncludeSystemRootDirectoriesTemp)" /> |
|
0 commit comments