diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-04-20 16:36:43 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-04-20 16:36:43 +0800 |
| commit | 03fe9395290be5b49a17594e918f062cab45655e (patch) | |
| tree | b9af89f9980cab67445f28adb2bd7e38610a8ac6 | |
| parent | 3e7f2b9bdb2c3e70f90450cde7b8728c911deaf4 (diff) | |
| download | atk-03fe9395290be5b49a17594e918f062cab45655e.tar.gz | |
Visual Studio builds: Include version info in property sheets
This is needed so that we can generate the .pc file from the .pc.in file.
| -rw-r--r-- | build/win32/vs10/atk-version-paths.props.in (renamed from build/win32/vs10/atk-version-paths.props) | 18 | ||||
| -rw-r--r-- | build/win32/vs9/atk-version-paths.vsprops.in (renamed from build/win32/vs9/atk-version-paths.vsprops) | 24 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 31 insertions, 13 deletions
diff --git a/build/win32/vs10/atk-version-paths.props b/build/win32/vs10/atk-version-paths.props.in index 4298972..6ea7baf 100644 --- a/build/win32/vs10/atk-version-paths.props +++ b/build/win32/vs10/atk-version-paths.props.in @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> - <ApiVersion>1.0</ApiVersion> <VSVer>10</VSVer> + <ApiVersion>1.0</ApiVersion> + <AtkMajorVersion>@ATK_MAJOR_VERSION@</AtkMajorVersion> + <AtkMinorVersion>@ATK_MINOR_VERSION@</AtkMinorVersion> + <AtkMicroVersion>@ATK_MICRO_VERSION@</AtkMicroVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GLibEtcInstallRoot)</CopyDir> - <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir> <AtkLibtoolCompatibleDllPrefix>lib</AtkLibtoolCompatibleDllPrefix> <AtkLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</AtkLibtoolCompatibleDllSuffix> <AtkSeparateVSDllPrefix /> @@ -20,15 +22,21 @@ <BuildMacro Include="ApiVersion"> <Value>$(ApiVersion)</Value> </BuildMacro> + <BuildMacro Include="AtkMajorVersion"> + <Value>$(AtkMajorVersion)</Value> + </BuildMacro> + <BuildMacro Include="AtkMinorVersion"> + <Value>$(AtkMinorVersion)</Value> + </BuildMacro> + <BuildMacro Include="AtkMicroVersion"> + <Value>$(AtkMicroVersion)</Value> + </BuildMacro> <BuildMacro Include="GLibEtcInstallRoot"> <Value>$(GLibEtcInstallRoot)</Value> </BuildMacro> <BuildMacro Include="CopyDir"> <Value>$(CopyDir)</Value> </BuildMacro> - <BuildMacro Include="DefDir"> - <Value>$(DefDir)</Value> - </BuildMacro> <BuildMacro Include="AtkLibtoolCompatibleDllPrefix"> <Value>$(AtkLibtoolCompatibleDllPrefix)</Value> </BuildMacro> diff --git a/build/win32/vs9/atk-version-paths.vsprops b/build/win32/vs9/atk-version-paths.vsprops.in index 0feaded..c7c570a 100644 --- a/build/win32/vs9/atk-version-paths.vsprops +++ b/build/win32/vs9/atk-version-paths.vsprops.in @@ -9,20 +9,28 @@ Value="9" /> <UserMacro - Name="GLibEtcInstallRoot" - Value="$(SolutionDir)\..\..\..\..\vs$(VSVER)\$(PlatformName)" + Name="ApiVersion" + Value="1.0" /> <UserMacro - Name="CopyDir" - Value="$(GLibEtcInstallRoot)" + Name="AtkMajorVersion" + Value="@ATK_MAJOR_VERSION@" /> <UserMacro - Name="DefDir" - Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)" + Name="AtkMinorVersion" + Value="@ATK_MINOR_VERSION@" /> <UserMacro - Name="ApiVersion" - Value="1.0" + Name="AtkMicroVersion" + Value="@ATK_MICRO_VERSION@" + /> + <UserMacro + Name="GLibEtcInstallRoot" + Value="$(SolutionDir)\..\..\..\..\vs$(VSVER)\$(PlatformName)" + /> + <UserMacro + Name="CopyDir" + Value="$(GLibEtcInstallRoot)" /> <UserMacro Name="AtkLibtoolCompatibleDllPrefix" diff --git a/configure.ac b/configure.ac index b671f1b..de76ec9 100644 --- a/configure.ac +++ b/configure.ac @@ -257,7 +257,9 @@ tests/Makefile build/Makefile build/win32/Makefile build/win32/vs9/Makefile +build/win32/vs9/atk-version-paths.vsprops build/win32/vs10/Makefile +build/win32/vs10/atk-version-paths.props build/win32/vs11/Makefile build/win32/vs12/Makefile build/win32/vs14/Makefile |