diff options
Diffstat (limited to 'win32/vs9')
| -rw-r--r-- | win32/vs9/README.txt | 12 | ||||
| -rw-r--r-- | win32/vs9/atk-gen-src.vsprops | 2 | ||||
| -rw-r--r-- | win32/vs9/atk-install.vspropsin | 3 | ||||
| -rw-r--r-- | win32/vs9/atk-introspect.vcproj | 16 | ||||
| -rw-r--r-- | win32/vs9/atk.sln | 18 |
5 files changed, 22 insertions, 29 deletions
diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt index 472e419..b517104 100644 --- a/win32/vs9/README.txt +++ b/win32/vs9/README.txt @@ -79,13 +79,13 @@ your GLib sources in <root>\ and build it from there, following the instructions in <root>\glib<-version>\win32\vs9, so that the required
headers, EXEs, DLLs and LIBs will end up in
<root>\vs9\<PlatformName>\include\glib-2.0 (headers)
-<root>\vs9\<PlatformName>\lib (LIBs, also glib-2.0/include/glibocnfig.h)
+<root>\vs9\<PlatformName>\lib (LIBs, also glib-2.0/include/glibconfig.h)
<root>\vs9\<PlatformName>\bin (EXEs/DLLs)
respectively.
-Building introspection files are now integrated in the build process of the
-solution files. In order for this to work, ensure that PythonDir (32-bit builds)
-or PythonDirX64 (x64 builds) are set at the installation directory of where your
+Building introspection files is now integrated in the solution files, but this is
+not built by default. In order for this to work, ensure that PythonDir (32-bit builds)
+and/or PythonDirX64 (x64 builds) are set at the installation directory of where your
Python installation is. Please note the following:
-This Python installation must be the same installation/configuration as the
@@ -94,8 +94,8 @@ Python installation is. Please note the following: -g-ir-scanner needs to be found at <root>\vs9\<PlatformName>\bin, and the
other Python items needs to be under <root>\vs9\<PlatformName>\lib\gobject-introspection.
--If this fails, the other parts of the build/"install" will still continue to proceed
- normally, so this is optional.
+-Use the rebuild command on this project, atk-introspect, to re-build or build for other
+ configurations.
After the build of ATK, the "install" project will copy build results
and headers into their appropriate location under <root>\vs9\<PlatformName>.
diff --git a/win32/vs9/atk-gen-src.vsprops b/win32/vs9/atk-gen-src.vsprops index aef02e4..e7ffb6c 100644 --- a/win32/vs9/atk-gen-src.vsprops +++ b/win32/vs9/atk-gen-src.vsprops @@ -9,7 +9,7 @@ Name="GenConfigH" Value="if not exist ..\..\config.h copy ..\..\config.h.win32 ..\..\config.h" /> - <UserMacroh + <UserMacro Name="GenMarshalSrc" Value=" cd ..\..\atk
 diff --git a/win32/vs9/atk-install.vspropsin b/win32/vs9/atk-install.vspropsin index 958cd1a..dcb22d4 100644 --- a/win32/vs9/atk-install.vspropsin +++ b/win32/vs9/atk-install.vspropsin @@ -19,9 +19,6 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\atk-$(ApiVersion).li 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
 " diff --git a/win32/vs9/atk-introspect.vcproj b/win32/vs9/atk-introspect.vcproj index a7b7cae..49805d7 100644 --- a/win32/vs9/atk-introspect.vcproj +++ b/win32/vs9/atk-introspect.vcproj @@ -25,8 +25,8 @@ >
<Tool
Name="VCNMakeTool"
- BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
- ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection"
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection"
CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
Output="$(AtkIntrospectBuiltFiles)"
/>
@@ -38,8 +38,8 @@ >
<Tool
Name="VCNMakeTool"
- BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
- ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection"
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection"
CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
Output="$(AtkIntrospectBuiltFiles)"
/>
@@ -53,8 +53,8 @@ >
<Tool
Name="VCNMakeTool"
- BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
- ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection"
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection"
CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
Output="$(AtkIntrospectBuiltFiles)"
/>
@@ -66,8 +66,8 @@ >
<Tool
Name="VCNMakeTool"
- BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
- ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection"
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection"
CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
Output="$(AtkIntrospectBuiltFiles)"
/>
diff --git a/win32/vs9/atk.sln b/win32/vs9/atk.sln index 4880737..06ed938 100644 --- a/win32/vs9/atk.sln +++ b/win32/vs9/atk.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk", "atk.vcproj", "{86EACD59-F69F-4AAD-854B-AA03D5447360}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcproj", "{00702787-1566-484D-991F-3E7E459BB909}"
ProjectSection(ProjectDependencies) = postProject
{86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcproj", "{00702787-1566-484D-991F-3E7E459BB909}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}"
ProjectSection(ProjectDependencies) = postProject
{86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360}
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A} = {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}
+ {00702787-1566-484D-991F-3E7E459BB909} = {00702787-1566-484D-991F-3E7E459BB909}
EndProjectSection
EndProject
Global
@@ -30,14 +30,6 @@ Global {86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|x64.Build.0 = Debug|x64
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.ActiveCfg = Release|x64
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.Build.0 = Release|x64
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.Build.0 = Debug|Win32
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.Build.0 = Release|Win32
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.Build.0 = Debug|x64
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64
- {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.Build.0 = Release|x64
{00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.ActiveCfg = Debug|Win32
{00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.Build.0 = Debug|Win32
{00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.ActiveCfg = Release|Win32
@@ -46,6 +38,10 @@ Global {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.Build.0 = Debug|x64
{00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64
{00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
|