diff options
Diffstat (limited to 'win32/vs9')
| -rw-r--r-- | win32/vs9/README.txt | 2 | ||||
| -rw-r--r-- | win32/vs9/atk-gen-src.vsprops | 10 | ||||
| -rw-r--r-- | win32/vs9/atk-install.vspropsin | 4 | ||||
| -rw-r--r-- | win32/vs9/atk-version-paths.vsprops.in | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt index 1798877..6f2cfec 100644 --- a/win32/vs9/README.txt +++ b/win32/vs9/README.txt @@ -19,7 +19,7 @@ and ZLib. You will also need a Python 2.7.x or 3.x installation, as Python will be
used to run glib-genmarshal, which was converted into a Python script from
a compiled C program, in addition to generating the atk.pc pkg-config
-file for the build. See PythonPath (32-bit builds) or PythonPathX64 (x64
+file for the build. See PythonDir (32-bit builds) or PythonDirX64 (x64
builds) in atk-version-paths.vsprops to see that they point to the correct paths.
a) look for all of the dependencies (except GLib*) under
diff --git a/win32/vs9/atk-gen-src.vsprops b/win32/vs9/atk-gen-src.vsprops index 727811e..aef02e4 100644 --- a/win32/vs9/atk-gen-src.vsprops +++ b/win32/vs9/atk-gen-src.vsprops @@ -9,13 +9,13 @@ Name="GenConfigH" Value="if not exist ..\..\config.h copy ..\..\config.h.win32 ..\..\config.h" /> - <UserMacro + <UserMacroh Name="GenMarshalSrc" Value=" cd ..\..\atk
 -if exist $(GLibEtcInstallRoot)\bin\glib-genmarshal $(PythonPath)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --header --output=atkmarshal.h atkmarshal.list
 +if exist $(GLibEtcInstallRoot)\bin\glib-genmarshal $(PythonDir)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --header --output=atkmarshal.h atkmarshal.list
 if not exist atkmarshal.h $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --header > atkmarshal.h
 -if exist $(GLibEtcInstallRoot)\bin\glib-genmarshal $(PythonPath)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --body --output=atkmarshal.c atkmarshal.list
 +if exist $(GLibEtcInstallRoot)\bin\glib-genmarshal $(PythonDir)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --body --output=atkmarshal.c atkmarshal.list
 if not exist atkmarshal.c $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --body > atkmarshal.c
 cd $(SolutionDir)
 " @@ -24,9 +24,9 @@ cd $(SolutionDir)
 Name="GenMarshalSrcX64" Value=" cd ..\..\atk
 -if exist $(GLibEtcInstallRoot)\bin\glib-genmarshal $(PythonPathX64)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --header --output=atkmarshal.h atkmarshal.list
 +if exist $(GLibEtcInstallRoot)\bin\glib-genmarshal $(PythonDirX64)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --header --output=atkmarshal.h atkmarshal.list
 if not exist atkmarshal.h $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --header > atkmarshal.h
 -if exist $(GLibEtcInstallRoot)\bin\glib-genmarshal $(PythonPathX64)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --body --output=atkmarshal.c atkmarshal.list
 +if exist $(GLibEtcInstallRoot)\bin\glib-genmarshal $(PythonDirX64)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --body --output=atkmarshal.c atkmarshal.list
 if not exist atkmarshal.c $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --body > atkmarshal.c
 cd $(SolutionDir)
 " diff --git a/win32/vs9/atk-install.vspropsin b/win32/vs9/atk-install.vspropsin index 880dad5..dcb22d4 100644 --- a/win32/vs9/atk-install.vspropsin +++ b/win32/vs9/atk-install.vspropsin @@ -25,10 +25,10 @@ copy ..\atk.pc $(CopyDir)\lib\pkgconfig
 /> <UserMacro Name="AtkGenPC" - Value="$(PythonPath)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion)" + Value="$(PythonDir)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion)" /> <UserMacro Name="AtkGenPCX64" - Value="$(PythonPathX64)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion)" + Value="$(PythonDirX64)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion)" /> </VisualStudioPropertySheet> diff --git a/win32/vs9/atk-version-paths.vsprops.in b/win32/vs9/atk-version-paths.vsprops.in index e916d53..401bd24 100644 --- a/win32/vs9/atk-version-paths.vsprops.in +++ b/win32/vs9/atk-version-paths.vsprops.in @@ -59,11 +59,11 @@ Value="$(AtkSeparateVSDllSuffix)" /> <UserMacro - Name="PythonPath" - Value="c:\python27" + Name="PythonDir" + Value="c:\\python27" /> <UserMacro - Name="PythonPathX64" - Value="$(PythonPath).x64" + Name="PythonDirX64" + Value="$(PythonDir).x64" /> </VisualStudioPropertySheet> |