diff options
| -rw-r--r-- | build/win32/vs10/atk-install.propsin | 12 | ||||
| -rw-r--r-- | build/win32/vs10/install.vcxproj | 31 |
2 files changed, 26 insertions, 17 deletions
diff --git a/build/win32/vs10/atk-install.propsin b/build/win32/vs10/atk-install.propsin index f952345..d7df041 100644 --- a/build/win32/vs10/atk-install.propsin +++ b/build/win32/vs10/atk-install.propsin @@ -4,15 +4,17 @@ <Import Project="atk-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros"> + <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir> + <InstalledDlls>$(BinDir)\$(AtkDllPrefix)atk(AtkDllSuffix).dll</InstalledDlls> <AtkDoInstall> mkdir $(CopyDir)\bin -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin +copy $(BinDir)\*.dll $(CopyDir)\bin mkdir $(CopyDir)\lib -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib +copy $(BinDir)\*-$(ApiVersion).lib $(CopyDir)\lib mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk @@ -21,6 +23,12 @@ mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk </AtkDoInstall> </PropertyGroup> <ItemGroup> + <BuildMacro Include="BinDir"> + <Value>$(BinDir)</Value> + </BuildMacro> + <BuildMacro Include="InstalledDlls"> + <Value>$(InstalledDlls)</Value> + </BuildMacro> <BuildMacro Include="AtkDoInstall"> <Value>$(AtkDoInstall)</Value> </BuildMacro> diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index f2b4c39..8068ddb 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -77,29 +77,30 @@ <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <PostBuildEvent> - <Command>$(AtkDoInstall)</Command> - </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <PostBuildEvent> - <Command>$(AtkDoInstall)</Command> - </PostBuildEvent> - <PreBuildEvent> - <Command>$(AtkDoInstall)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <PostBuildEvent> - <Command>$(AtkDoInstall)</Command> - </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <PreBuildEvent> - <Command>$(AtkDoInstall)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemGroup> + <CustomBuild Include="..\..\..\config.h.win32"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(AtkDoInstall)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(AtkDoInstall)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(AtkDoInstall)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(AtkDoInstall)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);%(Outputs)</Outputs> + </CustomBuild> + </ItemGroup> + <ItemGroup> <ProjectReference Include="atk.vcxproj"> <Project>{86eacd59-f69f-4aad-854b-aa03d5447360}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> |