From d1d92c546b11003965a55113c17e1f4c5ad13dca Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 20 Feb 2013 18:05:08 +0800 Subject: [PATCH] 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 @@  - 1.0 + 1.0 \"/dummy\" - ..\..\..\..\vs10\$(Platform) - $(AtkEtcInstallRoot) + 10 + ..\..\..\..\vs$(VSVer)\$(Platform) + ..\..\..\vs$(VSVer)\$(Platform) + $(GLibEtcInstallRoot) 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 + +set VSVER=$(VSVer) +set CONF=$(Configuration) +set PLAT=$(Platform) +set BASEDIR=$(GlibEtcInstallRootFromBuildWin32) +cd .. +call gengir.bat + +cd vs$(VSVer) + echo EXPORTS >"..\..\..\atk\atk.def" && cl /EP ..\..\..\atk\atk.symbols >>"..\..\..\atk\atk.def" ATK_COMPILATION;DLL_EXPORT;ATK_LOCALEDIR="$(AtkDummyPrefix)/share/locale" lib -1.0-0 - - -1-vs10 - $(AtkSeparateVS10DllPrefix) - $(AtkSeparateVS10DllSuffix) + + -1-vs$(VSVer) + $(AtkSeparateVSDllPrefix) + $(AtkSeparateVSDllSuffix) <_PropertySheetDisplayName>atkprops @@ -99,13 +111,13 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(AtkApiVersion).lib $(Cop - ..\..\..;..\..\..\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\;%(AdditionalIncludeDirectories) HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) msvc_recommended_pragmas.h;%(ForcedIncludeFiles) glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;intl.lib;%(AdditionalDependencies) - $(AtkEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + $(GLibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) @@ -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 - - $(AtkApiVersion) + + $(ApiVersion) $(AtkDummyPrefix) - - $(AtkEtcInstallRoot) + + $(GLibEtcInstallRoot) $(CopyDir) @@ -158,11 +170,11 @@ $(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkma $(AtkLibtoolCompatibleDllSuffix) - - $(AtkSeparateVS10DllPrefix) + + $(AtkSeparateVSDllPrefix) - - $(AtkSeparateVS10DllSuffix) + + $(AtkSeparateVSDllSuffix) $(AtkDllPrefix) 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 @@ ..\..\..\atk\atk.def true Windows - $(OutDir)$(ProjectName)-$(AtkApiVersion).lib + $(OutDir)$(ProjectName)-$(ApiVersion).lib MachineX86 @@ -119,7 +119,7 @@ Windows true true - $(OutDir)$(ProjectName)-$(AtkApiVersion).lib + $(OutDir)$(ProjectName)-$(ApiVersion).lib MachineX86 @@ -144,7 +144,7 @@ ..\..\..\atk\atk.def true Windows - $(TargetDir)$(ProjectName)-$(AtkApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib MachineX64 @@ -168,7 +168,7 @@ Windows true true - $(TargetDir)$(ProjectName)-$(AtkApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib MachineX64 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" /> @@ -90,7 +90,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)\$(ProjectName)-$(AtkApiVersion).lib" + ImportLibrary="$(OutDir)\$(ProjectName)-$(ApiVersion).lib" TargetMachine="1" /> @@ -126,7 +126,7 @@ ModuleDefinitionFile="..\..\..\atk\atk.def" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(AtkApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> @@ -161,7 +161,7 @@ SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" - ImportLibrary="$(TargetDir)$(ProjectName)-$(AtkApiVersion).lib" + ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" TargetMachine="17" /> 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 @@ > ..\..\..\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 " /> + + + + @@ -101,25 +126,21 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(AtkApiVersion).l Value="-1.0-0" /> - 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 @@