diff options
author | Jocelyn Turcotte <jturcotte@woboq.com> | 2016-07-26 15:53:14 +0300 |
---|---|---|
committer | Jocelyn Turcotte <jturcotte@woboq.com> | 2016-07-26 15:53:14 +0300 |
commit | ff7b2381e91be69a870c92f061975523654c1e89 (patch) | |
tree | b5a66cfb9d4477a7709f4e4e3d391e0c78304a62 /shell_integration | |
parent | 24cd8041a85b39d28a12a2105d67426e76ef9ecc (diff) |
shell/windows: Add missing Win32 configuration changes
The changes in build location were only done on the x64 configuration.
Diffstat (limited to 'shell_integration')
3 files changed, 22 insertions, 10 deletions
diff --git a/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj b/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj index a4be1c242..74830e71b 100644 --- a/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj +++ b/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj @@ -59,12 +59,12 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir> + <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir> <IntDir>$(Configuration)\$(Platform)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir> + <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir> <IntDir>$(Configuration)\$(Platform)\</IntDir> <TargetName>$(ProjectName)_x86</TargetName> </PropertyGroup> @@ -89,10 +89,13 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> <AdditionalDependencies>OCUtil_x86.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile> </Link> + <ResourceCompile> + <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -108,10 +111,13 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> <AdditionalDependencies>OCUtil_x86.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>OCContextMenu.def</ModuleDefinitionFile> </Link> + <ResourceCompile> + <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Link> diff --git a/shell_integration/windows/OCOverlays/OCOverlays.vcxproj b/shell_integration/windows/OCOverlays/OCOverlays.vcxproj index 8efa96166..432831fce 100644 --- a/shell_integration/windows/OCOverlays/OCOverlays.vcxproj +++ b/shell_integration/windows/OCOverlays/OCOverlays.vcxproj @@ -66,7 +66,7 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir> + <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir> <IntDir>$(Configuration)\$(Platform)\</IntDir> <TargetName>$(ProjectName)_x86</TargetName> <TargetExt>.dll</TargetExt> @@ -78,7 +78,7 @@ <TargetExt>.dll</TargetExt> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir> + <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir> <IntDir>$(Configuration)\$(Platform)\</IntDir> <TargetName>$(ProjectName)_x86</TargetName> <TargetExt>.dll</TargetExt> @@ -99,11 +99,14 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> <AdditionalDependencies>OCUtil_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile> <SubSystem>Windows</SubSystem> </Link> + <ResourceCompile> + <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> @@ -136,11 +139,14 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> <AdditionalDependencies>OCUtil_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <ModuleDefinitionFile>OCOverlays.def</ModuleDefinitionFile> <SubSystem>Windows</SubSystem> </Link> + <ResourceCompile> + <AdditionalIncludeDirectories>..\OCUtil</AdditionalIncludeDirectories> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> diff --git a/shell_integration/windows/OCUtil/OCUtil.vcxproj b/shell_integration/windows/OCUtil/OCUtil.vcxproj index ae620a1fb..4ea28d6b3 100644 --- a/shell_integration/windows/OCUtil/OCUtil.vcxproj +++ b/shell_integration/windows/OCUtil/OCUtil.vcxproj @@ -67,7 +67,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <TargetExt>.dll</TargetExt> - <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir> + <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir> <IntDir>$(Configuration)\$(Platform)\</IntDir> <TargetName>$(ProjectName)_x86</TargetName> </PropertyGroup> @@ -86,7 +86,7 @@ <TargetExt>.dll</TargetExt> <TargetName>$(ProjectName)_x86</TargetName> <IntDir>$(Configuration)\$(Platform)\</IntDir> - <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir> + <OutDir>$(SolutionDir)..\..\binary\shell_integration\windows\$(Configuration)\$(Platform)\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> |