diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-03-17 15:23:50 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-03-17 15:23:50 +0800 |
| commit | 73e2a3300a92a53d3c8c49c148655093ae642afb (patch) | |
| tree | 1627b22fc24155e368871a92f755a5aa23ec5880 /build/win32/vs10/_giscanner.vcxproj | |
| parent | 8d651e4d90377e71c3804032e33f6f6d97587d8b (diff) | |
| download | gobject-introspection-73e2a3300a92a53d3c8c49c148655093ae642afb.tar.gz | |
MSVC builds: Re-integrate introspection build in projects
GLib has been recently updated to optionally generate the .pc files
within the MSVC builds, which is needed to build the introspection
files, if Python is available. As we are looking for the .pc files from a
common location as a result, we can build the introspection files within
the project files, so that the build process does not have to be split
into 2 stages.
This is done by using wrapper projects that calls the NMake Makefiles that
is used to build the introspection files.
Note that although the IDE claims that the introspection
files failed to build, but they are really generated-so some investigation
is needed to see whether we can silence those false-positive errors.
Also clean up the property sheets a bit.
Diffstat (limited to 'build/win32/vs10/_giscanner.vcxproj')
| -rw-r--r-- | build/win32/vs10/_giscanner.vcxproj | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/win32/vs10/_giscanner.vcxproj b/build/win32/vs10/_giscanner.vcxproj index 9543bc72..d6894e7b 100644 --- a/build/win32/vs10/_giscanner.vcxproj +++ b/build/win32/vs10/_giscanner.vcxproj @@ -51,19 +51,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="gi-extra-paths.props" /> + <Import Project="gi-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="gi-extra-paths.props" /> + <Import Project="gi-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="gi-extra-paths.props" /> + <Import Project="gi-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="gi-extra-paths.props" /> + <Import Project="gi-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> |