Update to project settings for pkggen (#33)

* Set default owner to OEM_NAME in package manifest * Update to vc project and pkg xml files VC projects updated to use common bsp.props pkg xml file updated to use symbols to customize pkggen parameters updated to use /onecore flag * Renaming gpio package for consistency Renaming gpio package for consistency * Fixing vchip projects to output to build folder Fixing vchip projects to output to build folder * Project files for creating the FFU and packages required for FFU Project files for creating the FFU and packages required for FFU * Script file to export required binaries Script to export minimum required binaries for image creation * Adding SV.PlatExtensions to export Adding the missing pkgxml for export * Removing FFU related files Removing FFU related files * Fixing binexport.cmd Fixing bin export to export the required files Adding build command to the exported bin folder * Adding signing step for binaries Adding signing step for binaries. * Fixing signing flags Fixing signing flags * Review rework items Review rework items
ms-iot · Feb 2, 2017 · 6ce7df4 · 6ce7df4
1 parent a3c42af
commit 6ce7df4
Show file tree

Hide file tree

Showing 32 changed files with 233 additions and 139 deletions.
diff --git a/boards/bcm2836/pkgs/SV.PlatExtensions.pkg.xml b/boards/bcm2836/pkgs/SV.PlatExtensions.pkg.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <Package xmlns="urn:Microsoft.WindowsPhone/PackageSchema.v8.00"
+    Owner="SV"
+    OwnerType="OEM"
+    ReleaseType="Production"
+    Platform="arm"
+    Component="PlatExtensions"
+    SubComponent="UpdateOS"
+    Partition="UPDATEOS">
+
+    <Components>
+        <Driver InfSource="$(_RELEASEDIR)bcm2836sdhc.inf">
+          <Reference Source="$(_RELEASEDIR)bcm2836sdhc.sys" />
+          <Files>
+            <File Source="$(_RELEASEDIR)bcm2836sdhc.sys" DestinationDir="$(runtime.system32)\drivers" />
+          </Files>
+        </Driver>
+        <Driver InfSource="$(_RELEASEDIR)rpisdhc.inf">
+          <Reference Source="$(_RELEASEDIR)rpisdhc.sys" />
+          <Files>
+            <File Source="$(_RELEASEDIR)rpisdhc.sys" DestinationDir="$(runtime.system32)\drivers" />
+          </Files>
+        </Driver>
+    </Components>
+ </Package>
+
diff --git a/boards/bcm2836/pkgs/build.txt b/boards/bcm2836/pkgs/build.txt
@@ -0,0 +1,19 @@
+@echo off
+
+REM Run this command from the IoTCoreShell prompt only
+set RELEASE_DIR=%~dp0
+REM signing of binaries
+for /f "delims=" %%i in ('dir /s /b %RELEASE_DIR%\*.sys') do (
+    echo signing %%i
+    call sign.cmd %%i >> %RELEASE_DIR%\signlog.txt
+)
+for /f "delims=" %%i in ('dir /s /b %RELEASE_DIR%\*.dll') do (
+    echo signing %%i    
+	call sign.cmd %%i >> %RELEASE_DIR%\signlog.txt
+)
+
+echo Building packages in %RELEASE_DIR%
+buildpkg %RELEASE_DIR%
+echo Done.
+
+
diff --git a/build/bsp.props b/build/bsp.props
@@ -2,13 +2,21 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup Label="PropertySheets">
+    <ConversionToolVersion>1.0</ConversionToolVersion>
+    <IntDir Condition="'$(Platform)'!='Win32'">$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)\Out\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <WppEnabled>true</WppEnabled>
       <WppRecorderEnabled>true</WppRecorderEnabled>
       <DisableSpecificWarnings>4595;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
+    <PkgGen>
+      <Variables>"OEMNAME=Contoso;BSPARCH=$(Platform);_RELEASEDIR=$(SolutionDir)$(Platform)\$(Configuration)\;TARGETNAME=$(TargetName);TARGETEXT=$(TargetExt);$(PkgGen_DefaultDriverDest)"</Variables>
+      <AdditionalOptions>/onecore %(AdditionalOptions)</AdditionalOptions>
+    </PkgGen>	
    </ItemDefinitionGroup>
    <PropertyGroup>
     <SignMode>Off</SignMode>

diff --git a/drivers/audio/bcm2836/EndpointsCommon/EndpointsCommon.vcxproj b/drivers/audio/bcm2836/EndpointsCommon/EndpointsCommon.vcxproj
@@ -26,8 +26,6 @@
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
-    <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
     <Import Project="$(VCTargetsPath)\WDKConversion\PreConfiguration.props" />
@@ -54,11 +52,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />

diff --git a/drivers/audio/bcm2836/rpiwav/rpiwav.pkg.xml b/drivers/audio/bcm2836/rpiwav/rpiwav.pkg.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- TODO: Make sure to set the Package attributes -->
 <Package xmlns="urn:Microsoft.WindowsPhone/PackageSchema.v8.00"
-  Owner="OEM_NAME"
+  Owner="$(OEMNAME)"
   OwnerType="OEM"
-  Platform="RaspberryPi"
-  Component="RaspberryPi"
+  Platform="$(BSPARCH)"
+  Component="RPi"
   SubComponent="rpiwav"
   ReleaseType="Production" >
 
   <Components>
-    <Driver InfSource="$(_RELEASEDIR)$(TARGETNAME).inf">
-      <Reference Source="$(_RELEASEDIR)$(TARGETNAME)$(TARGETEXT)" />
+    <Driver InfSource="$(_RELEASEDIR)rpiwav.inf">
+      <Reference Source="$(_RELEASEDIR)rpiwav.sys" />
       <Files>
         <!-- For kernel mode drivers, $(DRIVER_DEST) evaluates to "drivers" by default -->
         <!-- For user mode drivers, $(DRIVER_DEST) evaluates to "drivers\umdf" by default -->
-        <File Source="$(_RELEASEDIR)$(TARGETNAME)$(TARGETEXT)" DestinationDir="$(runtime.system32)\$(DRIVER_DEST)" />
+        <File Source="$(_RELEASEDIR)rpiwav.sys" DestinationDir="$(runtime.system32)\drivers" />
       </Files>
     </Driver>
 

diff --git a/drivers/audio/bcm2836/rpiwav/rpiwav.vcxproj b/drivers/audio/bcm2836/rpiwav/rpiwav.vcxproj
@@ -24,8 +24,6 @@
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
-    <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
     <Import Project="$(VCTargetsPath)\WDKConversion\PreConfiguration.props" />
@@ -52,11 +50,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />

diff --git a/drivers/gpio/bcm2836/bcmgpio.pkg.xml b/drivers/gpio/bcm2836/bcmgpio.pkg.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- TODO: Make sure to set the Package attributes -->
 <Package xmlns="urn:Microsoft.WindowsPhone/PackageSchema.v8.00"
-  Owner="RASPBERRYPI"
+  Owner="$(OEMNAME)"
   OwnerType="OEM"
-  Component="RaspberryPi"
-  SubComponent="GPIO"
+  Component="RPi"
+  SubComponent="bcmgpio"
   ReleaseType="Production"
-  Platform="RaspberryPi">
+  Platform="$(BSPARCH)">
 
 
   <Components>
-    <Driver InfSource="$(_RELEASEDIR)$(TARGETNAME).inf">
-      <Reference Source="$(_RELEASEDIR)$(TARGETNAME)$(TARGETEXT)" />
+    <Driver InfSource="$(_RELEASEDIR)bcmgpio.inf">
+      <Reference Source="$(_RELEASEDIR)bcmgpio.sys" />
       <Files>
         <!-- For kernel mode drivers, $(DRIVER_DEST) evaluates to "drivers" by default -->
         <!-- For user mode drivers, $(DRIVER_DEST) evaluates to "drivers\umdf" by default -->
-        <File Source="$(_RELEASEDIR)$(TARGETNAME)$(TARGETEXT)" DestinationDir="$(runtime.system32)\$(DRIVER_DEST)" />
+        <File Source="$(_RELEASEDIR)bcmgpio.sys" DestinationDir="$(runtime.system32)\drivers" />
       </Files>
     </Driver>
 

diff --git a/drivers/gpio/bcm2836/bcmgpio.vcxproj b/drivers/gpio/bcm2836/bcmgpio.vcxproj
@@ -21,15 +21,14 @@
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
-    <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
     <Import Project="$(VCTargetsPath)\WDKConversion\PreConfiguration.props" />
   </ImportGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{381A9C49-78D7-4B6F-98CD-5084F70B1207}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
+    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
@@ -52,11 +51,11 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <!-- The WrappedTaskItems label is used by the conversion tool to identify the location where items 

diff --git a/drivers/i2c/bcm2836/bcmi2c.pkg.xml b/drivers/i2c/bcm2836/bcmi2c.pkg.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- TODO: Make sure to set the Package attributes -->
 <Package xmlns="urn:Microsoft.WindowsPhone/PackageSchema.v8.00"
-  Owner="OEM_NAME"
+  Owner="$(OEMNAME)"
   OwnerType="OEM"
-  Platform="RaspberryPi"
-  Component="RaspberryPi"
+  Platform="$(BSPARCH)"
+  Component="RPi"
   SubComponent="bcmi2c"
   ReleaseType="Production" >
 
   <Components>
-    <Driver InfSource="$(_RELEASEDIR)$(TARGETNAME).inf">
-      <Reference Source="$(_RELEASEDIR)$(TARGETNAME)$(TARGETEXT)" />
+    <Driver InfSource="$(_RELEASEDIR)bcmi2c.inf">
+      <Reference Source="$(_RELEASEDIR)bcmi2c.sys" />
       <Files>
         <!-- For kernel mode drivers, $(DRIVER_DEST) evaluates to "drivers" by default -->
         <!-- For user mode drivers, $(DRIVER_DEST) evaluates to "drivers\umdf" by default -->
-        <File Source="$(_RELEASEDIR)$(TARGETNAME)$(TARGETEXT)" DestinationDir="$(runtime.system32)\$(DRIVER_DEST)" />
+        <File Source="$(_RELEASEDIR)bcmi2c.sys" DestinationDir="$(runtime.system32)\drivers" />
       </Files>
     </Driver>
 

diff --git a/drivers/i2c/bcm2836/bcmi2c.vcxproj b/drivers/i2c/bcm2836/bcmi2c.vcxproj
@@ -21,8 +21,6 @@
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
-    <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
     <Import Project="$(VCTargetsPath)\WDKConversion\PreConfiguration.props" />
@@ -45,11 +43,11 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <!-- The WrappedTaskItems label is used by the conversion tool to identify the location where items 

diff --git a/drivers/mailbox/bcm2836/rpiq.pkg.xml b/drivers/mailbox/bcm2836/rpiq.pkg.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- TODO: Make sure to set the Package attributes -->
 <Package xmlns="urn:Microsoft.WindowsPhone/PackageSchema.v8.00"
-  Owner="OEM_NAME"
+  Owner="$(OEMNAME)"
   OwnerType="OEM"
-  Platform="RaspberryPi"
-  Component="RaspberryPi"
+  Platform="$(BSPARCH)"
+  Component="RPi"
   SubComponent="rpiq"
   ReleaseType="Production" >
 
   <Components>
-    <Driver InfSource="$(_RELEASEDIR)$(TARGETNAME).inf">
-      <Reference Source="$(_RELEASEDIR)$(TARGETNAME)$(TARGETEXT)" />
+    <Driver InfSource="$(_RELEASEDIR)rpiq.inf">
+      <Reference Source="$(_RELEASEDIR)rpiq.sys" />
       <Files>
         <!-- For kernel mode drivers, $(DRIVER_DEST) evaluates to "drivers" by default -->
         <!-- For user mode drivers, $(DRIVER_DEST) evaluates to "drivers\umdf" by default -->
-        <File Source="$(_RELEASEDIR)$(TARGETNAME)$(TARGETEXT)" DestinationDir="$(runtime.system32)\$(DRIVER_DEST)" />
+        <File Source="$(_RELEASEDIR)rpiq.sys" DestinationDir="$(runtime.system32)\drivers" />
       </Files>
     </Driver>
 

diff --git a/drivers/mailbox/bcm2836/rpiq.vcxproj b/drivers/mailbox/bcm2836/rpiq.vcxproj
@@ -24,8 +24,6 @@
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
-    <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
     <Import Project="$(VCTargetsPath)\WDKConversion\PreConfiguration.props" />
@@ -52,11 +50,11 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-    <Import Project="..\..\..\build\bsp.props" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <!-- The WrappedTaskItems label is used by the conversion tool to identify the location where items 

diff --git a/drivers/misc/userland/interface/vchiq_arm/vchiq_arm_kern.vcxproj b/drivers/misc/userland/interface/vchiq_arm/vchiq_arm_kern.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
+    <IntDir Condition="'$(Platform)'!='Win32'">$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)\Out\</IntDir>
     <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
@@ -42,7 +42,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup>
-    <OutDir>..\..\..\vchiq</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Link>

diff --git a/drivers/misc/userland/interface/vcos/generic/vcos_win32_kern_generic.vcxproj b/drivers/misc/userland/interface/vcos/generic/vcos_win32_kern_generic.vcxproj
@@ -20,7 +20,7 @@
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
+    <IntDir Condition="'$(Platform)'!='Win32'">$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)\Out\</IntDir>
     <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
@@ -29,6 +29,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{824BAE1C-53BC-4137-A07F-AF6582316A7C}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
+    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
@@ -41,7 +42,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup>
-    <OutDir>$(IntDir)</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)</OutDir>
   </PropertyGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />

diff --git a/drivers/misc/userland/interface/vcos/win32/vcos_win32_kern.vcxproj b/drivers/misc/userland/interface/vcos/win32/vcos_win32_kern.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
+    <IntDir Condition="'$(Platform)'!='Win32'">$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)\Out\</IntDir>
     <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
@@ -43,7 +43,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup>
-    <OutDir>..\..\..\..\vchiq</OutDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Link>