[atk] Update Visual C++ projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atk] Update Visual C++ projects
- Date: Wed, 20 Feb 2013 10:05:17 +0000 (UTC)
commit d1d92c546b11003965a55113c17e1f4c5ad13dca
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Feb 20 18:05:08 2013 +0800
Update Visual C++ projects
Make entries more consistent with the other GNOME Visual Studio projects.
build/win32/vs10/atk.props | 118 ++++++++++++++++++++++------------------
build/win32/vs10/atk.vcxprojin | 8 ++--
build/win32/vs9/atk.vcprojin | 8 ++--
build/win32/vs9/atk.vsprops | 117 +++++++++++++++++++++++----------------
build/win32/vs9/install.vcproj | 8 ++--
5 files changed, 146 insertions(+), 113 deletions(-)
---
diff --git a/build/win32/vs10/atk.props b/build/win32/vs10/atk.props
index 9ed207a..b4a4c3a 100644
--- a/build/win32/vs10/atk.props
+++ b/build/win32/vs10/atk.props
@@ -1,96 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup Label="UserMacros">
- <AtkApiVersion>1.0</AtkApiVersion>
+ <ApiVersion>1.0</ApiVersion>
<AtkDummyPrefix>\"/dummy\"</AtkDummyPrefix>
- <AtkEtcInstallRoot>..\..\..\..\vs10\$(Platform)</AtkEtcInstallRoot>
- <CopyDir>$(AtkEtcInstallRoot)</CopyDir>
+ <VSVer>10</VSVer>
+ <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
+ <CopyDir>$(GLibEtcInstallRoot)</CopyDir>
<AtkDoInstall>
mkdir $(CopyDir)\bin
copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
-mkdir $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atk.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atk.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkaction.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkaction.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkcomponent.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkcomponent.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkdocument.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkdocument.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkeditabletext.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkeditabletext.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkgobjectaccessible.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkgobjectaccessible.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkhyperlink.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkhyperlink.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkhyperlinkimpl.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkhyperlinkimpl.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkhypertext.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkhypertext.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atknoopobject.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atknoopobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atknoopobjectfactory.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atknoopobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkobject.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkobjectfactory.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkplug.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkplug.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkimage.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkimage.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkregistry.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkregistry.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkrelation.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkrelation.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkrelationtype.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkrelationtype.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkrelationset.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkrelationset.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkselection.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkselection.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atksocket.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atksocket.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkstate.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkstate.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkstateset.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkstateset.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkstreamablecontent.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkstreamablecontent.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atktable.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atktable.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atktext.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atktext.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkutil.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkutil.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkmisc.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkmisc.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkvalue.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkvalue.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkwindow.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkwindow.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atkversion.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atkversion.h $(CopyDir)\include\atk-$(ApiVersion)\atk
-copy ..\..\..\atk\atk-enum-types.h $(CopyDir)\include\atk-$(AtkApiVersion)\atk
+copy ..\..\..\atk\atk-enum-types.h $(CopyDir)\include\atk-$(ApiVersion)\atk
mkdir $(CopyDir)\lib
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(AtkApiVersion).lib $(CopyDir)\lib
+copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
</AtkDoInstall>
+<DoGenGir>
+set VSVER=$(VSVer)
+set CONF=$(Configuration)
+set PLAT=$(Platform)
+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)
+cd ..
+call gengir.bat
+
+cd vs$(VSVer)
+</DoGenGir>
<GenerateAtkDef>echo EXPORTS >"..\..\..\atk\atk.def" && cl /EP ..\..\..\atk\atk.symbols
>>"..\..\..\atk\atk.def"</GenerateAtkDef>
<AtkDefines>ATK_COMPILATION;DLL_EXPORT;ATK_LOCALEDIR="$(AtkDummyPrefix)/share/locale"</AtkDefines>
<AtkLibtoolCompatibleDllPrefix>lib</AtkLibtoolCompatibleDllPrefix>
<AtkLibtoolCompatibleDllSuffix>-1.0-0</AtkLibtoolCompatibleDllSuffix>
- <AtkSeparateVS10DllPrefix />
- <AtkSeparateVS10DllSuffix>-1-vs10</AtkSeparateVS10DllSuffix>
- <AtkDllPrefix>$(AtkSeparateVS10DllPrefix)</AtkDllPrefix>
- <AtkDllSuffix>$(AtkSeparateVS10DllSuffix)</AtkDllSuffix>
+ <AtkSeparateVSDllPrefix />
+ <AtkSeparateVSDllSuffix>-1-vs$(VSVer)</AtkSeparateVSDllSuffix>
+ <AtkDllPrefix>$(AtkSeparateVSDllPrefix)</AtkDllPrefix>
+ <AtkDllSuffix>$(AtkSeparateVSDllSuffix)</AtkDllSuffix>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>atkprops</_PropertySheetDisplayName>
@@ -99,13 +111,13 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(AtkApiVersion).lib $(Cop
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..;..\..\..\atk;$(AtkEtcInstallRoot)\include;$(AtkEtcInstallRoot)\include\glib-2.0;$(AtkEtcInstallRoot)\lib\glib-2.0\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..;..\..\..\atk;$(GLibEtcInstallRoot)\include;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
<AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;intl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>$(AtkEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+
<AdditionalLibraryDirectories>$(GLibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent>
<Command>
@@ -117,13 +129,13 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h
if exist ..\..\..\atk\atkmarshal.h goto GEN_MARS_C
-$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header
>..\..\..\atk\atkmarshal.h
+$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header
>..\..\..\atk\atkmarshal.h
:GEN_MARS_C
if exist ..\..\..\atk\atkmarshal.c goto END
-$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body
>..\..\..\atk\atkmarshal.c
+$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body
>..\..\..\atk\atkmarshal.c
:END
@@ -131,14 +143,14 @@ $(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkma
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <BuildMacro Include="AtkApiVersion">
- <Value>$(AtkApiVersion)</Value>
+ <BuildMacro Include="ApiVersion">
+ <Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="AtkDummyPrefix">
<Value>$(AtkDummyPrefix)</Value>
</BuildMacro>
- <BuildMacro Include="AtkEtcInstallRoot">
- <Value>$(AtkEtcInstallRoot)</Value>
+ <BuildMacro Include="GLibEtcInstallRoot">
+ <Value>$(GLibEtcInstallRoot)</Value>
</BuildMacro>
<BuildMacro Include="CopyDir">
<Value>$(CopyDir)</Value>
@@ -158,11 +170,11 @@ $(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkma
<BuildMacro Include="AtkLibtoolCompatibleDllSuffix">
<Value>$(AtkLibtoolCompatibleDllSuffix)</Value>
</BuildMacro>
- <BuildMacro Include="AtkSeparateVS10DllPrefix">
- <Value>$(AtkSeparateVS10DllPrefix)</Value>
+ <BuildMacro Include="AtkSeparateVSDllPrefix">
+ <Value>$(AtkSeparateVSDllPrefix)</Value>
</BuildMacro>
- <BuildMacro Include="AtkSeparateVS10DllSuffix">
- <Value>$(AtkSeparateVS10DllSuffix)</Value>
+ <BuildMacro Include="AtkSeparateVSDllSuffix">
+ <Value>$(AtkSeparateVSDllSuffix)</Value>
</BuildMacro>
<BuildMacro Include="AtkDllPrefix">
<Value>$(AtkDllPrefix)</Value>
diff --git a/build/win32/vs10/atk.vcxprojin b/build/win32/vs10/atk.vcxprojin
index f27d34c..c156087 100644
--- a/build/win32/vs10/atk.vcxprojin
+++ b/build/win32/vs10/atk.vcxprojin
@@ -92,7 +92,7 @@
<ModuleDefinitionFile>..\..\..\atk\atk.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName)-$(AtkApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -119,7 +119,7 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(OutDir)$(ProjectName)-$(AtkApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -144,7 +144,7 @@
<ModuleDefinitionFile>..\..\..\atk\atk.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(AtkApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -168,7 +168,7 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(AtkApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
diff --git a/build/win32/vs9/atk.vcprojin b/build/win32/vs9/atk.vcprojin
index 6525228..1cd6313 100644
--- a/build/win32/vs9/atk.vcprojin
+++ b/build/win32/vs9/atk.vcprojin
@@ -51,7 +51,7 @@
ModuleDefinitionFile="..\..\..\atk\atk.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\$(ProjectName)-$(AtkApiVersion).lib"
+ ImportLibrary="$(OutDir)\$(ProjectName)-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
@@ -90,7 +90,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(OutDir)\$(ProjectName)-$(AtkApiVersion).lib"
+ ImportLibrary="$(OutDir)\$(ProjectName)-$(ApiVersion).lib"
TargetMachine="1"
/>
</Configuration>
@@ -126,7 +126,7 @@
ModuleDefinitionFile="..\..\..\atk\atk.def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(AtkApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
@@ -161,7 +161,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(AtkApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
TargetMachine="17"
/>
</Configuration>
diff --git a/build/win32/vs9/atk.vsprops b/build/win32/vs9/atk.vsprops
index d16dd18..9cf21f4 100644
--- a/build/win32/vs9/atk.vsprops
+++ b/build/win32/vs9/atk.vsprops
@@ -8,14 +8,14 @@
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..;..\..\..\atk;$(AtkEtcInstallRoot)\include;$(AtkEtcInstallRoot)\include\glib-2.0;$(AtkEtcInstallRoot)\lib\glib-2.0\include\"
+
AdditionalIncludeDirectories="..\..\..;..\..\..\atk;$(GLibEtcInstallRoot)\include;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include\"
PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib intl.lib"
- AdditionalLibraryDirectories="$(AtkEtcInstallRoot)\lib"
+ AdditionalLibraryDirectories="$(GLibEtcInstallRoot)\lib"
/>
<Tool
Name="VCPreBuildEventTool"
@@ -24,15 +24,27 @@ if exist ..\..\..\config.h goto DONE_CONFIG_H

copy ..\..\..\config.h.win32 ..\..\..\config.h

:DONE_CONFIG_H

if exist ..\..\..\atk\atkmarshal.h goto GEN_MARS_C

-$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header
..\..\..\atk\atkmarshal.h

+$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header
..\..\..\atk\atkmarshal.h

:GEN_MARS_C

if exist ..\..\..\atk\atkmarshal.c goto END

-$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body
..\..\..\atk\atkmarshal.c

+$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body
..\..\..\atk\atkmarshal.c

:END

"
/>
<UserMacro
- Name="AtkApiVersion"
+ Name="VSVer"
+ Value="9"
+ />
+ <UserMacro
+ Name="GLibEtcInstallRoot"
+ Value="..\..\..\..\vs$(VSVER)\$(PlatformName)"
+ />
+ <UserMacro
+ Name="GlibEtcInstallRootFromBuildWin32"
+ Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+ />
+ <UserMacro
+ Name="ApiVersion"
Value="1.0"
/>
<UserMacro
@@ -46,45 +58,58 @@ mkdir $(OutDir)

mkdir $(OutDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin

-mkdir $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atk.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkaction.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkcomponent.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkdocument.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkeditabletext.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkgobjectaccessible.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkhyperlink.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkhyperlinkimpl.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkhypertext.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atknoopobject.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atknoopobjectfactory.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkobject.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkobjectfactory.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkplug.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkimage.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkregistry.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkrelation.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkrelationtype.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkrelationset.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkselection.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atksocket.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkstate.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkstateset.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkstreamablecontent.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atktable.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atktext.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkutil.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkmisc.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkvalue.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkwindow.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atkversion.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

-copy ..\..\..\atk\atk-enum-types.h $(OutDir)\include\atk-$(AtkApiVersion)\atk

+mkdir $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atk.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkaction.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkcomponent.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkdocument.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkeditabletext.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkgobjectaccessible.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkhyperlink.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkhyperlinkimpl.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkhypertext.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atknoopobject.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atknoopobjectfactory.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkobject.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkobjectfactory.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkplug.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkimage.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkregistry.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkrelation.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkrelationtype.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkrelationset.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkselection.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atksocket.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkstate.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkstateset.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkstreamablecontent.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atktable.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atktext.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkutil.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkmisc.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkvalue.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkwindow.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atkversion.h $(OutDir)\include\atk-$(ApiVersion)\atk

+copy ..\..\..\atk\atk-enum-types.h $(OutDir)\include\atk-$(ApiVersion)\atk

mkdir $(OutDir)\lib

-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(AtkApiVersion).lib $(OutDir)\lib

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(OutDir)\lib

"
/>
<UserMacro
+ Name="DoGenGir"
+ Value="
+set VSVER=$(VSVer)

+set CONF=$(ConfigurationName)

+set PLAT=$(PlatformName)

+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)

+
+cd ..

+call gengir.bat

+cd vs$(VSVer)

+ "
+ />
+ <UserMacro
Name="GenerateAtkDef"
Value="echo EXPORTS >"..\..\..\atk\atk.def" && cl /EP
..\..\..\atk\atk.symbols >>"..\..\..\atk\atk.def""
/>
@@ -101,25 +126,21 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(AtkApiVersion).l
Value="-1.0-0"
/>
<UserMacro
- Name="AtkSeparateVS9DllPrefix"
+ Name="AtkSeparateVSDllPrefix"
Value=""
/>
<UserMacro
- Name="AtkSeparateVS9DllSuffix"
- Value="-1-vs9"
+ Name="AtkSeparateVSDllSuffix"
+ Value="-1-vs$(VSVER)"
/>
<!-- Change these two to AtkLibtoolCompatibleDllPrefix and
AtkLibtoolCompatibleDllSuffix if that is what you want -->
<UserMacro
Name="AtkDllPrefix"
- Value="$(AtkSeparateVS9DllPrefix)"
+ Value="$(AtkSeparateVSDllPrefix)"
/>
<UserMacro
Name="AtkDllSuffix"
- Value="$(AtkSeparateVS9DllSuffix)"
- />
- <UserMacro
- Name="AtkEtcInstallRoot"
- Value="..\..\..\..\vs9\$(PlatformName)"
+ Value="$(AtkSeparateVSDllSuffix)"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 45325ee..8ed4e1a 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(AtkEtcInstallRoot)"
+ OutputDirectory="$(GLibEtcInstallRoot)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
InheritedPropertySheets=".\atk.vsprops"
@@ -33,7 +33,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(AtkEtcInstallRoot)"
+ OutputDirectory="$(GLibEtcInstallRoot)"
InheritedPropertySheets=".\atk.vsprops"
ConfigurationType="10"
CharacterSet="2"
@@ -46,7 +46,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(AtkEtcInstallRoot)"
+ OutputDirectory="$(GLibEtcInstallRoot)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
InheritedPropertySheets=".\atk.vsprops"
@@ -60,7 +60,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(AtkEtcInstallRoot)"
+ OutputDirectory="$(GLibEtcInstallRoot)"
InheritedPropertySheets=".\atk.vsprops"
ConfigurationType="10"
CharacterSet="2"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
