diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-01-21 15:26:50 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-01-21 15:26:50 +0800 |
| commit | a24c80dbc8632ce7c38f32f991c9998381c5de54 (patch) | |
| tree | 40fc52a7edfb5599abb52c82f8a581049f46ea9f /build/win32/vs10/regress.vcxproj | |
| parent | c2876dfc7c395c51226f98501832951856e984ff (diff) | |
| download | gobject-introspection-a24c80dbc8632ce7c38f32f991c9998381c5de54.tar.gz | |
Rework The Visual Studio 2010 Build Process
This patch makes the build of G-I on Visual Studio 2010 into a two-step
process, as it would make it clearer and easier to the one building G-I by:
-Splitting up the property sheets into multiple parts, where pre-configured
code (which is currently shipped with the tarball) is copied using custom
build steps, so that they can be re-copied when they are updated. This
also removes the need for setting environment variables before launching
the Visual Studio Project to build the G-I DLL, the tools written in C and
the _giscanner Python2 module. The Python2 paths (set to Python 2.7.x)
are now set in a property sheet, which can be updated quite easily, if
needed.
-Directing people to use the set of NMake Makefiles to build the
introspection files for GLib, and also the .gir's that are shipped with
G-I, which was added in a previous commit, as it would make it clearer
what are needed to build the introspection files.
Diffstat (limited to 'build/win32/vs10/regress.vcxproj')
| -rw-r--r-- | build/win32/vs10/regress.vcxproj | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/build/win32/vs10/regress.vcxproj b/build/win32/vs10/regress.vcxproj index 052bf0f7..a3b4b48f 100644 --- a/build/win32/vs10/regress.vcxproj +++ b/build/win32/vs10/regress.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="gir.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="gir.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="gir.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="gir.props" /> + <Import Project="gi-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -173,6 +173,12 @@ <ItemGroup> <ClCompile Include="..\..\..\tests\scanner\regress.c" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="gi-prebuild.vcxproj"> + <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> |