instructions in <root>\glib<-version>\win32\vs10, so that the required\r
headers, EXEs, DLLs and LIBs will end up in\r
<root>\vs10\<PlatformName>\include\glib-2.0 (headers)\r
-<root>\vs10\<PlatformName>\lib (LIBs, also glib-2.0/include/glibocnfig.h)\r
+<root>\vs10\<PlatformName>\lib (LIBs, also glib-2.0/include/glibconfig.h)\r
<root>\vs10\<PlatformName>\bin (EXEs/DLLs)\r
respectively.\r
\r
-Building introspection files are now integrated in the build process of the\r
-solution files. In order for this to work, ensure that PythonDir (32-bit builds)\r
+Building introspection files is now integrated in the solution files, but this is\r
+not built by default. In order for this to work, ensure that PythonDir (32-bit builds)\r
or PythonDirX64 (x64 builds) are set at the installation directory of where your\r
Python installation is. Please note the following:\r
\r
-g-ir-scanner needs to be found at <root>\vs10\<PlatformName>\bin, and the\r
other Python items needs to be under <root>\vs10\<PlatformName>\lib\gobject-introspection.\r
\r
--If this fails, the other parts of the build/"install" will still continue to proceed\r
- normally, so this is optional.\r
+-Use the rebuild command on this project, atk-introspect, to re-build or build for other\r
+ configurations.\r
\r
After the build of ATK, the "install" project will copy build results\r
and headers into their appropriate location under <root>\vs10\<PlatformName>.\r
mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk
#include "atk.vs10.headers"
-if exist ..\Atk-1.0.gir (mkdir $(CopyDir)\share\gir-1.0 & copy ..\Atk-1.0.gir $(CopyDir)\share\gir-1.0)
-if exist ..\Atk-1.0.typelib (mkdir $(CopyDir)\lib\girepository-1.0 & copy ..\Atk-1.0.gir $(CopyDir)\lib\girepository-1.0)
-
mkdir $(CopyDir)\lib\pkgconfig
copy ..\atk.pc $(CopyDir)\lib\pkgconfig
</AtkDoInstall>
<Project>{86eacd59-f69f-4aad-854b-aa03d5447360}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="atk-introspect.vcxproj">
- <Project>{7034d75b-2ac9-4ea6-97a2-db4f8526ec5a}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>\r
<PropertyGroup Label="UserMacros" />\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
- <NMakeBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>\r
- <NMakeReBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>\r
+ <NMakeBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection</NMakeBuildCommandLine>\r
+ <NMakeReBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection</NMakeReBuildCommandLine>\r
<NMakeCleanCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>\r
<NMakeOutput>$(AtkIntrospectBuiltFiles)</NMakeOutput>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
- <NMakeBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>\r
- <NMakeReBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>\r
+ <NMakeBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection</NMakeBuildCommandLine>\r
+ <NMakeReBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection</NMakeReBuildCommandLine>\r
<NMakeCleanCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>\r
<NMakeOutput>$(AtkIntrospectBuiltFiles)</NMakeOutput>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
- <NMakeBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>\r
- <NMakeReBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>\r
+ <NMakeBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection</NMakeBuildCommandLine>\r
+ <NMakeReBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection</NMakeReBuildCommandLine>\r
<NMakeCleanCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>\r
<NMakeOutput>$(AtkIntrospectBuiltFiles)</NMakeOutput>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
- <NMakeBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>\r
- <NMakeReBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>\r
+ <NMakeBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection</NMakeBuildCommandLine>\r
+ <NMakeReBuildCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection</NMakeReBuildCommandLine>\r
<NMakeCleanCommandLine>$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>\r
<NMakeOutput>$(AtkIntrospectBuiltFiles)</NMakeOutput>\r
</PropertyGroup>\r
<ItemGroup>\r
- <ProjectReference Include="atk.vcxproj">\r
- <Project>{86eacd59-f69f-4aad-854b-aa03d5447360}</Project>\r
+ <ProjectReference Include="atk-install.vcxproj">\r
+ <Project>{00702787-1566-484d-991f-3e7e459bb909}</Project>\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
</ProjectReference>\r
</ItemGroup>\r
# Visual Studio 2010\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk", "atk.vcxproj", "{86EACD59-F69F-4AAD-854B-AA03D5447360}"\r
EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcxproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}"\r
-EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcxproj", "{00702787-1566-484D-991F-3E7E459BB909}"\r
EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcxproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}"\r
+EndProject\r
Global\r
GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
Debug|Win32 = Debug|Win32\r
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|Win32.Build.0 = Release|Win32\r
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.ActiveCfg = Release|x64\r
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.Build.0 = Release|x64\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.Build.0 = Debug|Win32\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.Build.0 = Release|Win32\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.Build.0 = Debug|x64\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.Build.0 = Release|x64\r
{00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.ActiveCfg = Debug|Win32\r
{00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.Build.0 = Debug|Win32\r
{00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.ActiveCfg = Debug|x64\r
{00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.Build.0 = Release|Win32\r
{00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64\r
{00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64\r
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32\r
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64\r
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64\r
EndGlobalSection\r
GlobalSection(SolutionProperties) = preSolution\r
HideSolutionNode = FALSE\r
instructions in <root>\glib<-version>\win32\vs9, so that the required\r
headers, EXEs, DLLs and LIBs will end up in\r
<root>\vs9\<PlatformName>\include\glib-2.0 (headers)\r
-<root>\vs9\<PlatformName>\lib (LIBs, also glib-2.0/include/glibocnfig.h)\r
+<root>\vs9\<PlatformName>\lib (LIBs, also glib-2.0/include/glibconfig.h)\r
<root>\vs9\<PlatformName>\bin (EXEs/DLLs)\r
respectively.\r
\r
-Building introspection files are now integrated in the build process of the\r
-solution files. In order for this to work, ensure that PythonDir (32-bit builds)\r
-or PythonDirX64 (x64 builds) are set at the installation directory of where your\r
+Building introspection files is now integrated in the solution files, but this is\r
+not built by default. In order for this to work, ensure that PythonDir (32-bit builds)\r
+and/or PythonDirX64 (x64 builds) are set at the installation directory of where your\r
Python installation is. Please note the following:\r
\r
-This Python installation must be the same installation/configuration as the\r
-g-ir-scanner needs to be found at <root>\vs9\<PlatformName>\bin, and the\r
other Python items needs to be under <root>\vs9\<PlatformName>\lib\gobject-introspection.\r
\r
--If this fails, the other parts of the build/"install" will still continue to proceed\r
- normally, so this is optional.\r
+-Use the rebuild command on this project, atk-introspect, to re-build or build for other\r
+ configurations.\r
\r
After the build of ATK, the "install" project will copy build results\r
and headers into their appropriate location under <root>\vs9\<PlatformName>.\r
Name="GenConfigH"
Value="if not exist ..\..\config.h copy ..\..\config.h.win32 ..\..\config.h"
/>
- <UserMacroh
+ <UserMacro
Name="GenMarshalSrc"
Value="
cd ..\..\atk

mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk

#include "atk.headers"
-if exist ..\Atk-1.0.gir (mkdir $(CopyDir)\share\gir-1.0 & copy ..\Atk-1.0.gir $(CopyDir)\share\gir-1.0)

-if exist ..\Atk-1.0.typelib (mkdir $(CopyDir)\lib\girepository-1.0 & copy ..\Atk-1.0.gir $(CopyDir)\lib\girepository-1.0)

-
mkdir $(CopyDir)\lib\pkgconfig

copy ..\atk.pc $(CopyDir)\lib\pkgconfig

"
>\r
<Tool\r
Name="VCNMakeTool"\r
- BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam)"\r
- ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"\r
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection"\r
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection"\r
CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"\r
Output="$(AtkIntrospectBuiltFiles)"\r
/>\r
>\r
<Tool\r
Name="VCNMakeTool"\r
- BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"\r
- ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"\r
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection"\r
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection"\r
CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"\r
Output="$(AtkIntrospectBuiltFiles)"\r
/>\r
>\r
<Tool\r
Name="VCNMakeTool"\r
- BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam)"\r
- ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"\r
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection"\r
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection"\r
CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"\r
Output="$(AtkIntrospectBuiltFiles)"\r
/>\r
>\r
<Tool\r
Name="VCNMakeTool"\r
- BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"\r
- ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"\r
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection"\r
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection"\r
CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"\r
Output="$(AtkIntrospectBuiltFiles)"\r
/>\r
# Visual Studio 2008\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk", "atk.vcproj", "{86EACD59-F69F-4AAD-854B-AA03D5447360}"\r
EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcproj", "{00702787-1566-484D-991F-3E7E459BB909}"\r
ProjectSection(ProjectDependencies) = postProject\r
{86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360}\r
EndProjectSection\r
EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcproj", "{00702787-1566-484D-991F-3E7E459BB909}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}"\r
ProjectSection(ProjectDependencies) = postProject\r
{86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360}\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A} = {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}\r
+ {00702787-1566-484D-991F-3E7E459BB909} = {00702787-1566-484D-991F-3E7E459BB909}\r
EndProjectSection\r
EndProject\r
Global\r
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|x64.Build.0 = Debug|x64\r
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.ActiveCfg = Release|x64\r
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.Build.0 = Release|x64\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.Build.0 = Debug|Win32\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.Build.0 = Release|Win32\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.Build.0 = Debug|x64\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64\r
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.Build.0 = Release|x64\r
{00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.ActiveCfg = Debug|Win32\r
{00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.Build.0 = Debug|Win32\r
{00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.ActiveCfg = Release|Win32\r
{00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.Build.0 = Debug|x64\r
{00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64\r
{00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64\r
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32\r
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64\r
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64\r
EndGlobalSection\r
GlobalSection(SolutionProperties) = preSolution\r
HideSolutionNode = FALSE\r