diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-07-12 12:27:44 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-07-12 12:37:19 +0800 |
| commit | cd55690be5d0e7f62f656494d1c36954ac677ce9 (patch) | |
| tree | 3708ea161779e16e5018ed9a066979bf4911e06f /win32/vs9/atk-install.vspropsin | |
| parent | dc009fa2c87e3f3e0bdcd7068057e7c5a5cd991f (diff) | |
| download | atk-cd55690be5d0e7f62f656494d1c36954ac677ce9.tar.gz | |
Visual Studio builds: Adapt to the Python-fied glib-genmarshal
glib-genmarshal is used for the Visual Studio builds, and has been
recently converted to a Python script instead of a compiled C program.
Since Visual Studio calls cmd.exe to run Custom Build steps, we need
to call Python explicitly to run glib-genmarshal as shebang lines
are not supported in cmd.exe, which means that Python will become a
hard build-time requirement instead of being optional. This also means
that the atk.pc pkg-config file will always be generated.
However, since ATK does not yet require a really recent GLib, maintain
compatibility with older GLib by calling glib-genmarshal.exe when the
glib-genmarshal Python script is not found.
Diffstat (limited to 'win32/vs9/atk-install.vspropsin')
| -rw-r--r-- | win32/vs9/atk-install.vspropsin | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/win32/vs9/atk-install.vspropsin b/win32/vs9/atk-install.vspropsin index aed8fd5..880dad5 100644 --- a/win32/vs9/atk-install.vspropsin +++ b/win32/vs9/atk-install.vspropsin @@ -19,15 +19,16 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\atk-$(ApiVersion).li mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk
 #include "atk.headers" -if exist ..\atk.pc (mkdir $(CopyDir)\lib\pkgconfig & copy ..\atk.pc $(CopyDir)\lib\pkgconfig)
 +mkdir $(CopyDir)\lib\pkgconfig
 +copy ..\atk.pc $(CopyDir)\lib\pkgconfig
 " /> <UserMacro Name="AtkGenPC" - Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion)" + Value="$(PythonPath)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion)" /> <UserMacro Name="AtkGenPCX64" - Value="if exist $(PythonPathX64)\python.exe $(PythonPathX64)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion)" + Value="$(PythonPathX64)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion)" /> </VisualStudioPropertySheet> |