Output builds to top-level obj and bin folder. Change-Id: I1444a3d15977c2617866f293e0ac0ccbd253d878 Reviewed-on: https://swiftshader-review.googlesource.com/5353 Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj index 95b0101..d9fbfe3 100644 --- a/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj +++ b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
@@ -90,20 +90,20 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)obj\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)obj\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(Platform)\$(Configuration)\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">$(Platform)\$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(Platform)\$(Configuration)\</IntDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">$(Platform)\$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(SolutionDir)bin\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">$(SolutionDir)bin\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)obj\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)obj\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(SolutionDir)obj\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">$(SolutionDir)obj\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">false</LinkIncremental> @@ -143,10 +143,10 @@ <TargetMachine>MachineX86</TargetMachine> </Link> <PostBuildEvent> - <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> + <Command>mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -169,10 +169,10 @@ <SubSystem>Windows</SubSystem> </Link> <PostBuildEvent> - <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> + <Command>mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> </PostBuildEvent> <ResourceCompile> <PreprocessorDefinitions>WIN64</PreprocessorDefinitions> @@ -207,10 +207,10 @@ <TargetMachine>MachineX86</TargetMachine> </Link> <PostBuildEvent> - <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> + <Command>mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -241,10 +241,10 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> <PostBuildEvent> - <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> + <Command>mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> </PostBuildEvent> <ResourceCompile> <PreprocessorDefinitions>WIN64</PreprocessorDefinitions> @@ -278,10 +278,10 @@ <TargetMachine>MachineX86</TargetMachine> </Link> <PostBuildEvent> - <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> + <Command>mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> @@ -311,10 +311,10 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> <PostBuildEvent> - <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" -mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" -copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> + <Command>mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\" +mkdir "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\" +copy "$(OutDir)libGLES_CM.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> </PostBuildEvent> <ResourceCompile> <PreprocessorDefinitions>WIN64</PreprocessorDefinitions>