diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt index 27d9ab8b55..10caaae8f1 100644 --- a/build/win32/vs10/README.txt +++ b/build/win32/vs10/README.txt @@ -20,10 +20,14 @@ ATK and GLib. External dependencies are at least Cairo gettext-runtime, fontconfig*, freetype*, expat*. See the build/win32/vs10/README.txt file in glib for details where to unpack them. -You will also need a Python 2.x/3.x interpretor installed on your system, +You will also need a Python 2.6+/3.x interpretor installed on your system, which can be obtained from the official installers available from http://www.python.org. Please note that the Python interpretor (python.exe) -needs to be in your PATH before attempting the build of GTK+. +either needs to be in your PATH before attempting the build of GTK+, or it +can be found in the path specified by PythonPath in gtk-version-paths.props. +If you happen to change the PythonPath setting in gtk-version-paths.props after +opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution, +delete all the *.sdf, *.suo and *.user files before re-attempting the build. It is recommended that one builds the dependencies with VS10 as far as possible, especially those from and using the GTK+ stack (i.e. GLib, diff --git a/build/win32/vs10/gtk-gen-srcs.props b/build/win32/vs10/gtk-gen-srcs.props index 30c3d40c7b..7afca8a2a7 100644 --- a/build/win32/vs10/gtk-gen-srcs.props +++ b/build/win32/vs10/gtk-gen-srcs.props @@ -58,6 +58,8 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration) :DONE_GDKCONFIG_H +set PATH=$(PATH);$(PythonPath) + cd ..\..\..\gtk python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml diff --git a/build/win32/vs10/gtk-version-paths.props b/build/win32/vs10/gtk-version-paths.props index 77f3d01c3f..4947225f98 100644 --- a/build/win32/vs10/gtk-version-paths.props +++ b/build/win32/vs10/gtk-version-paths.props @@ -12,6 +12,7 @@ -3-vs$(VSVer) $(GtkSeparateVSDllPrefix) $(GtkSeparateVSDllSuffix) + c:\python27 <_PropertySheetDisplayName>gtkversionpathsprops @@ -50,5 +51,8 @@ $(GtkDllSuffix) + + $(PythonPath) + \ No newline at end of file diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt index 31ecd7617c..f2f0067a92 100644 --- a/build/win32/vs9/README.txt +++ b/build/win32/vs9/README.txt @@ -19,10 +19,14 @@ ATK and GLib. External dependencies are at least Cairo gettext-runtime, fontconfig*, freetype*, expat*. See the build/win32/vs9/README.txt file in glib for details where to unpack them. -You will also need a Python 2.x/3.x interpretor installed on your system, +You will also need a Python 2.6+/3.x interpretor installed on your system, which can be obtained from the official installers available from http://www.python.org. Please note that the Python interpretor (python.exe) -needs to be in your PATH before attempting the build of GTK+. +either needs to be in your PATH before attempting the build of GTK+, or it +can be found in the path specified by PythonPath in gtk-version-paths.vsprops. +If you happen to change the PythonPath setting in gtk-version-paths.vsprops after +opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution, +delete all the *.ncb, *.suo and *.user files before re-attempting the build. It is recommended that one builds the dependencies with VS9 as far as possible, especially those from and using the GTK+ stack (i.e. GLib, diff --git a/build/win32/vs9/gtk-gen-srcs.vsprops b/build/win32/vs9/gtk-gen-srcs.vsprops index e0361141cd..7b1d0db234 100644 --- a/build/win32/vs9/gtk-gen-srcs.vsprops +++ b/build/win32/vs9/gtk-gen-srcs.vsprops @@ -57,6 +57,8 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName) + \ No newline at end of file