[glib] Cleanup and Enhance the MSVC Project Generation
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Cleanup and Enhance the MSVC Project Generation
- Date: Thu, 3 Sep 2015 11:10:49 +0000 (UTC)
commit 041e77249af8778db1e37b3ad47c034fa7934e05
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Sep 3 15:19:48 2015 +0800
Cleanup and Enhance the MSVC Project Generation
Make use of the common autotools module that is used to generate the MSVC
project files from their respective templates so that the main build files
beccome cleaner, and enhance them in a way that the headers that should be
installed can be written to the property sheets during 'make dist', so that
the chances of missing headers for MSVC builds can be greatly reduced.
Also use this autotools module to fill in the projects for
glib-compile-schemas and glib-compile-resources.
https://bugzilla.gnome.org/show_bug.cgi?id=735429
build/win32/vs10/.gitignore | 5 +
build/win32/vs10/Makefile.am | 96 ++++++-----
build/win32/vs10/gio.vcxproj.filtersin | 4 +-
build/win32/vs10/gio.vcxprojin | 4 +-
.../vs10/glib-compile-resources.vcxproj.filtersin | 12 ++
build/win32/vs10/glib-compile-resources.vcxprojin | 180 ++++++++++++++++++++
.../vs10/glib-compile-schemas.vcxproj.filtersin | 12 ++
build/win32/vs10/glib-compile-schemas.vcxprojin | 180 ++++++++++++++++++++
build/win32/vs10/glib-install.propsin | 102 +++++++++++
build/win32/vs10/glib.vcxproj.filtersin | 4 +-
build/win32/vs10/glib.vcxprojin | 2 +-
build/win32/vs10/gobject.vcxproj.filtersin | 2 +-
build/win32/vs10/gobject.vcxprojin | 2 +-
build/win32/vs9/.gitignore | 3 +
build/win32/vs9/Makefile.am | 56 ++++---
build/win32/vs9/gio.vcprojin | 2 +-
build/win32/vs9/glib-compile-resources.vcprojin | 155 +++++++++++++++++
build/win32/vs9/glib-compile-schemas.vcprojin | 155 +++++++++++++++++
build/win32/vs9/glib-install.vspropsin | 76 ++++++++
build/win32/vs9/glib.vcprojin | 2 +-
build/win32/vs9/gobject.vcprojin | 2 +-
gio/Makefile.am | 57 +++----
glib/Makefile.am | 50 ++----
gobject/Makefile.am | 44 ++----
24 files changed, 1032 insertions(+), 175 deletions(-)
---
diff --git a/build/win32/vs10/.gitignore b/build/win32/vs10/.gitignore
index f05d126..5eb97bf 100644
--- a/build/win32/vs10/.gitignore
+++ b/build/win32/vs10/.gitignore
@@ -4,3 +4,8 @@ glib.vcxproj
glib.vcxproj.filters
gobject.vcxproj
gobject.vcxproj.filters
+glib-compile-resources.vcxproj
+glib-compile-resources.vcxproj.filters
+glib-compile-schemas.vcxproj
+glib-compile-schemas.vcxproj.filters
+glib-install.props
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index c972c03..15fbfee 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -1,42 +1,58 @@
+GENERATED_ITEMS = \
+ glib.vcxproj \
+ glib.vcxproj.filters \
+ gobject.vcxproj \
+ gobject.vcxproj.filters \
+ gio.vcxproj \
+ gio.vcxproj.filters \
+ glib-compile-schemas.vcxproj \
+ glib-compile-schemas.vcxproj.filters \
+ glib-compile-resources.vcxproj \
+ glib-compile-resources.vcxproj.filters \
+ glib-install.props
+
EXTRA_DIST = \
- README.txt \
- glib.sln \
- glib.vcxproj \
- glib.vcxproj.filters \
- glib.vcxprojin \
- glib.vcxproj.filtersin \
- glib-genmarshal.vcxproj \
- glib-genmarshal.vcxproj.filters \
- gspawn-win32-helper-console.vcxproj \
- gspawn-win32-helper-console.vcxproj.filters \
- gspawn-win32-helper.vcxproj \
- gspawn-win32-helper.vcxproj.filters \
- gmodule.vcxproj \
- gmodule.vcxproj.filters \
- gobject.vcxproj \
- gobject.vcxproj.filters \
- gobject.vcxprojin \
- gobject.vcxproj.filtersin \
- gthread.vcxproj \
- gthread.vcxproj.filters \
- gio.vcxproj \
- gio.vcxproj.filters \
- gio.vcxprojin \
- gio.vcxproj.filtersin \
- glib-compile-schemas.vcxproj \
- glib-compile-schemas.vcxproj.filters \
- gsettings.vcxproj \
- gsettings.vcxproj.filters \
- glib-compile-resources.vcxproj \
- glib-compile-resources.vcxproj.filters \
- gresource.vcxproj \
- gresource.vcxproj.filters \
- gio-querymodules.vcxproj \
- gio-querymodules.vcxproj.filters \
- gdbus.vcxproj \
- gdbus.vcxproj.filters \
- glib-install.vcxproj \
- glib-build-defines.props \
- glib-install.props \
+ README.txt \
+ glib.sln \
+ glib.vcxprojin \
+ glib.vcxproj.filtersin \
+ glib-genmarshal.vcxproj \
+ glib-genmarshal.vcxproj.filters \
+ gspawn-win32-helper-console.vcxproj \
+ gspawn-win32-helper-console.vcxproj.filters \
+ gspawn-win32-helper.vcxproj \
+ gspawn-win32-helper.vcxproj.filters \
+ gmodule.vcxproj \
+ gmodule.vcxproj.filters \
+ gobject.vcxprojin \
+ gobject.vcxproj.filtersin \
+ gthread.vcxproj \
+ gthread.vcxproj.filters \
+ gio.vcxprojin \
+ gio.vcxproj.filtersin \
+ glib-compile-schemas.vcxprojin \
+ glib-compile-schemas.vcxproj.filtersin \
+ gsettings.vcxproj \
+ gsettings.vcxproj.filters \
+ glib-compile-resources.vcxprojin \
+ glib-compile-resources.vcxproj.filtersin \
+ gresource.vcxproj \
+ gresource.vcxproj.filters \
+ gio-querymodules.vcxproj \
+ gio-querymodules.vcxproj.filters \
+ gdbus.vcxproj \
+ gdbus.vcxproj.filters \
+ glib-install.vcxproj \
+ glib-build-defines.props \
+ glib-install.propsin \
glib-version-paths.props \
- glib-gen-srcs.props
+ glib-gen-srcs.props \
+ $(GENERATED_ITEMS)
+
+glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin glib.vs10.headers
gobject.vs10.headers gio.vs10.headers
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib-install.propsin >$@
+ rm glib.vs10.headers
+ rm gobject.vs10.headers
+ rm gio.vs10.headers
+
+DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs10/gio.vcxproj.filtersin b/build/win32/vs10/gio.vcxproj.filtersin
index 155a4d9..6c1abec 100644
--- a/build/win32/vs10/gio.vcxproj.filtersin
+++ b/build/win32/vs10/gio.vcxproj.filtersin
@@ -15,7 +15,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
-#include "libgio.vs10.sourcefiles.filters"
+#include "gio.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\gio\gnetworking.h.win32"><Filter>Resource Files</Filter></CustomBuild>
@@ -25,4 +25,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin
index da49045..627a9af 100644
--- a/build/win32/vs10/gio.vcxprojin
+++ b/build/win32/vs10/gio.vcxprojin
@@ -178,7 +178,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
-#include "libgio.vs10.sourcefiles"
+#include "gio.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\gio\gnetworking.h.win32">
@@ -216,4 +216,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/glib-compile-resources.vcxproj.filtersin
b/build/win32/vs10/glib-compile-resources.vcxproj.filtersin
new file mode 100644
index 0000000..68e8a5d
--- /dev/null
+++ b/build/win32/vs10/glib-compile-resources.vcxproj.filtersin
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+#include "glib-compile-resources.vs10.sourcefiles.filters"
+ </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/glib-compile-resources.vcxprojin
b/build/win32/vs10/glib-compile-resources.vcxprojin
new file mode 100644
index 0000000..e098347
--- /dev/null
+++ b/build/win32/vs10/glib-compile-resources.vcxprojin
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}</ProjectGuid>
+ <RootNamespace>glibcompileresources</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </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="glib-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="glib-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="glib-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="glib-build-defines.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+
<AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+
<AdditionalIncludeDirectories>..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(GioInBuildMacro);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+#include "glib-compile-resources.vs10.sourcefiles"
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="gio.vcxproj">
+ <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="glib.vcxproj">
+ <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="gobject.vcxproj">
+ <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin
b/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin
new file mode 100644
index 0000000..645779d
--- /dev/null
+++ b/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+#include "glib-compile-schemas.vs10.sourcefiles.filters"
+ </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/glib-compile-schemas.vcxprojin b/build/win32/vs10/glib-compile-schemas.vcxprojin
new file mode 100644
index 0000000..fff97fb
--- /dev/null
+++ b/build/win32/vs10/glib-compile-schemas.vcxprojin
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{015D69D0-8B42-438A-ADAE-052AC036E065}</ProjectGuid>
+ <RootNamespace>glibcompileschemas</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </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="glib-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="glib-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="glib-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="glib-build-defines.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+
<AdditionalIncludeDirectories>..\..\..\gmodule;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>CompileAsC</CompileAs>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+#include "glib-compile-schemas.vs10.sourcefiles"
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="glib.vcxproj">
+ <Project>{12bca020-eabf-429e-876a-a476bc9c10c0}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="gobject.vcxproj">
+ <Project>{f172effc-e30f-4593-809e-db2024b1e753}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="gio.vcxproj">
+ <Project>{f3d1583c-5613-4809-bd98-7cc1c1276f92}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/glib-install.propsin b/build/win32/vs10/glib-install.propsin
new file mode 100644
index 0000000..484675c
--- /dev/null
+++ b/build/win32/vs10/glib-install.propsin
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="glib-build-defines.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros">
+ <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
+
<InstalledDlls>$(BinDir)\$(GlibDllPrefix)glib(GlibDllSuffix).dll;$(BinDir)\$(GlibDllPrefix)gthread(GlibDllSuffix).dll;$(BinDir)\$(GlibDllPrefix)gmodule(GlibDllSuffix).dll;$(BinDir)\$(GlibDllPrefix)gobject(GlibDllSuffix).dll;$(BinDir)\$(GlibDllPrefix)gio(GlibDllSuffix).dll</InstalledDlls>
+
<InstalledBins>$(BinDir)\glib-genmarshal.exe;$(BinDir)\glib-compile-schemas.exe;$(BinDir)\gsettings.exe;$(BinDir)\glib-compile-resources.exe;$(BinDir)\gresource.exe;$(BinDir)\gio-querymodules.exe;$(BinDir)\gdbus.exe</InstalledBins>
+
<InstalledWin32Bins>$(BinDir)\gspawn-win32-helper.exe;$(BinDir)\gspawn-win32-helper-console.exe</InstalledWin32Bins>
+
<InstalledX64Bins>$(BinDir)\gspawn-win64-helper.exe;$(BinDir)\gspawn-win64-helper-console.exe</InstalledX64Bins>
+ <GlibDoInstall>
+mkdir $(CopyDir)
+mkdir $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)glib$(GlibDllSuffix).dll $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)glib$(GlibDllSuffix).pdb $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)gthread$(GlibDllSuffix).dll $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)gthread$(GlibDllSuffix).pdb $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)gmodule$(GlibDllSuffix).dll $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)gmodule$(GlibDllSuffix).pdb $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).dll $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).pdb $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).dll $(CopyDir)\bin
+copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).pdb $(CopyDir)\bin
+copy $(BinDir)\glib-genmarshal.exe $(CopyDir)\bin
+copy $(BinDir)\glib-genmarshal.pdb $(CopyDir)\bin
+copy $(BinDir)\gspawn-win*-helper*.exe $(CopyDir)\bin
+copy $(BinDir)\gspawn-win*-helper*.pdb $(CopyDir)\bin
+copy $(BinDir)\glib-compile-schemas.exe $(CopyDir)\bin
+copy $(BinDir)\glib-compile-schemas.pdb $(CopyDir)\bin
+copy $(BinDir)\gsettings.exe $(CopyDir)\bin
+copy $(BinDir)\gsettings.pdb $(CopyDir)\bin
+copy $(BinDir)\glib-compile-resources.exe $(CopyDir)\bin
+copy $(BinDir)\glib-compile-resources.pdb $(CopyDir)\bin
+copy $(BinDir)\gresource.exe $(CopyDir)\bin
+copy $(BinDir)\gresource.pdb $(CopyDir)\bin
+copy $(BinDir)\gio-querymodules.exe $(CopyDir)\bin
+copy $(BinDir)\gio-querymodules.pdb $(CopyDir)\bin
+copy $(BinDir)\gdbus.exe $(CopyDir)\bin
+copy $(BinDir)\gdbus.pdb $(CopyDir)\bin
+copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen
+
+if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin
+
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
+copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)
+copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)
+copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)
+#include "glib.vs10.headers"
+
+copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)
+
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject
+#include "gobject.vs10.headers"
+copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject
+
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio
+#include "gio.vs10.headers"
+
+mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
+copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
+copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio
+
+mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include
+copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include
+copy $(BinDir)\glib-$(ApiVersion).lib $(CopyDir)\lib
+copy $(BinDir)\gthread-$(ApiVersion).lib $(CopyDir)\lib
+copy $(BinDir)\gmodule-$(ApiVersion).lib $(CopyDir)\lib
+copy $(BinDir)\gobject-$(ApiVersion).lib $(CopyDir)\lib
+copy $(BinDir)\gio-$(ApiVersion).lib $(CopyDir)\lib
+
+mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas
+copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas
+
+mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen
+copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen
+</GlibDoInstall>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_PropertySheetDisplayName>glibinstallprops</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemGroup>
+ <BuildMacro Include="BinDir">
+ <Value>$(BinDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="InstalledDlls">
+ <Value>$(InstalledDlls)</Value>
+ </BuildMacro>
+ <BuildMacro Include="InstalledBins">
+ <Value>$(InstalledBins)</Value>
+ </BuildMacro>
+ <BuildMacro Include="InstalledWin32Bins">
+ <Value>$(InstalledWin32Bins)</Value>
+ </BuildMacro>
+ <BuildMacro Include="InstalledX64Bins">
+ <Value>$(InstalledX64Bins)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GlibDoInstall">
+ <Value>$(GlibDoInstall)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin
index fc40dc9..e5bcdc0 100644
--- a/build/win32/vs10/glib.vcxproj.filtersin
+++ b/build/win32/vs10/glib.vcxproj.filtersin
@@ -24,7 +24,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
-#include "libglib.vs10.sourcefiles.filters"
+#include "glib.vs10.sourcefiles.filters"
<ClCompile Include="..\..\..\glib\giowin32.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -116,4 +116,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin
index 0aa9087..db5550a 100644
--- a/build/win32/vs10/glib.vcxprojin
+++ b/build/win32/vs10/glib.vcxprojin
@@ -339,7 +339,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
-#include "libglib.vs10.sourcefiles"
+#include "glib.vs10.sourcefiles"
<ClCompile Include="..\..\..\glib\giowin32.c" />
<ClCompile Include="..\..\..\glib\gspawn-win32.c" />
<ClCompile Include="..\..\..\glib\gthread-win32.c" />
diff --git a/build/win32/vs10/gobject.vcxproj.filtersin b/build/win32/vs10/gobject.vcxproj.filtersin
index 7c7350a..3174802 100644
--- a/build/win32/vs10/gobject.vcxproj.filtersin
+++ b/build/win32/vs10/gobject.vcxproj.filtersin
@@ -15,7 +15,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
-#include "libgobject.vs10.sourcefiles.filters"
+#include "gobject.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild>
diff --git a/build/win32/vs10/gobject.vcxprojin b/build/win32/vs10/gobject.vcxprojin
index 71f8a48..a909f28 100644
--- a/build/win32/vs10/gobject.vcxprojin
+++ b/build/win32/vs10/gobject.vcxprojin
@@ -177,7 +177,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
-#include "libgobject.vs10.sourcefiles"
+#include "gobject.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\gobject\glib-mkenums.in">
diff --git a/build/win32/vs9/.gitignore b/build/win32/vs9/.gitignore
index 3c5cef6..7653d60 100644
--- a/build/win32/vs9/.gitignore
+++ b/build/win32/vs9/.gitignore
@@ -1,3 +1,6 @@
glib.vcproj
gobject.vcproj
gio.vcproj
+glib-compile-resources.vcproj
+glib-compile-schemas.vcproj
+glib-install.vsprops
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 98d797a..07cd432 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,25 +1,39 @@
+GENERATED_ITEMS = \
+ glib.vcproj \
+ gobject.vcproj \
+ gio.vcproj \
+ glib-compile-schemas.vcproj \
+ glib-compile-resources.vcproj \
+ glib-install.vsprops
+
EXTRA_DIST = \
- README.txt \
- glib.sln \
- glib.vcproj \
- glib.vcprojin \
- glib-genmarshal.vcproj \
- gspawn-win32-helper-console.vcproj \
- gspawn-win32-helper.vcproj \
- gmodule.vcproj \
- gobject.vcproj \
- gobject.vcprojin \
- gthread.vcproj \
- gio.vcproj \
- gio.vcprojin \
- glib-compile-schemas.vcproj \
- gsettings.vcproj \
- glib-compile-resources.vcproj \
- gresource.vcproj \
- gio-querymodules.vcproj \
- gdbus.vcproj \
+ README.txt \
+ glib.sln \
+ glib.vcprojin \
+ glib-genmarshal.vcproj \
+ gspawn-win32-helper-console.vcproj \
+ gspawn-win32-helper.vcproj \
+ gmodule.vcproj \
+ gobject.vcprojin \
+ gthread.vcproj \
+ gio.vcprojin \
+ gsettings.vcproj \
+ gresource.vcproj \
+ gio-querymodules.vcproj \
+ gdbus.vcproj \
+ glib-compile-schemas.vcprojin \
+ glib-compile-resources.vcprojin \
glib-install.vcproj \
glib-build-defines.vsprops \
- glib-install.vsprops \
glib-version-paths.vsprops \
- glib-gen-srcs.vsprops
+ glib-gen-srcs.vsprops \
+ glib-install.vspropsin \
+ $(GENERATED_ITEMS)
+
+glib-install.vsprops: $(top_srcdir)/build/win32/vs9/glib-install.vspropsin glib.headers gobject.headers
gio.headers
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib-install.vspropsin >$@
+ rm glib.headers
+ rm gobject.headers
+ rm gio.headers
+
+DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin
index bb4a85b..db551e7 100644
--- a/build/win32/vs9/gio.vcprojin
+++ b/build/win32/vs9/gio.vcprojin
@@ -155,7 +155,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "libgio.sourcefiles"
+#include "gio.sourcefiles"
</Filter>
<Filter
Name="Header Files"
diff --git a/build/win32/vs9/glib-compile-resources.vcprojin b/build/win32/vs9/glib-compile-resources.vcprojin
new file mode 100644
index 0000000..9050265
--- /dev/null
+++ b/build/win32/vs9/glib-compile-resources.vcprojin
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="glib-compile-resources"
+ ProjectGUID="{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}"
+ RootNamespace="glibcompileresources"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
+ PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
+ PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
+ PreprocessorDefinitions="$(GioInBuildMacro)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
+ PreprocessorDefinitions="$(GioInBuildMacro)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+#include "glib-compile-resources.sourcefiles"
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/glib-compile-schemas.vcprojin b/build/win32/vs9/glib-compile-schemas.vcprojin
new file mode 100644
index 0000000..2a75095
--- /dev/null
+++ b/build/win32/vs9/glib-compile-schemas.vcprojin
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="glib-compile-schemas"
+ ProjectGUID="{015D69D0-8B42-438A-ADAE-052AC036E065}"
+ RootNamespace="glibcompileschemas"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gmodule"
+ PreprocessorDefinitions="_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\gmodule"
+ PreprocessorDefinitions="_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\..\..\gmodule"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions=""
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\gmodule"
+ PreprocessorDefinitions=""
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+#include "glib-compile-schemas.sourcefiles"
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/glib-install.vspropsin b/build/win32/vs9/glib-install.vspropsin
new file mode 100644
index 0000000..fb3f240
--- /dev/null
+++ b/build/win32/vs9/glib-install.vspropsin
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="glibinstallprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ >
+ <UserMacro
+ Name="GlibDoInstall"
+ Value="
+mkdir $(CopyDir)

+mkdir $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)glib$(GlibDllSuffix).dll
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)glib$(GlibDllSuffix).pdb
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gthread$(GlibDllSuffix).dll
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gthread$(GlibDllSuffix).pdb
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gmodule$(GlibDllSuffix).dll
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gmodule$(GlibDllSuffix).pdb
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gobject$(GlibDllSuffix).dll
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gobject$(GlibDllSuffix).pdb
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gio$(GlibDllSuffix).dll
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GlibDllPrefix)gio$(GlibDllSuffix).pdb
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.exe $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.pdb $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win*-helper*.exe
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win*-helper*.pdb
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-compile-schemas.exe
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-compile-schemas.pdb
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gsettings.exe $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gsettings.pdb $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-compile-resources.exe
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-compile-resources.pdb
$(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gresource.exe $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gresource.pdb $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio-querymodules.exe $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio-querymodules.pdb $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir)\bin

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.pdb $(CopyDir)\bin

+copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen

+if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin

+
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated

+copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)

+copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion)

+copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion)

+copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion)

+#include "glib.headers"
+
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject

+#include "gobject.headers"
+copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject

+
+mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio

+#include "gio.headers"
+
+mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio

+copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio

+copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio

+
+mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include

+copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include

+
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-$(ApiVersion).lib $(CopyDir)\lib

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gthread-$(ApiVersion).lib
$(CopyDir)\lib

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gmodule-$(ApiVersion).lib
$(CopyDir)\lib

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gobject-$(ApiVersion).lib
$(CopyDir)\lib

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio-$(ApiVersion).lib $(CopyDir)\lib

+
+mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas

+copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas

+
+mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen

+copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen

+"
+ />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin
index 7013a08..170d43e 100644
--- a/build/win32/vs9/glib.vcprojin
+++ b/build/win32/vs9/glib.vcprojin
@@ -280,7 +280,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "libglib.sourcefiles"
+#include "glib.sourcefiles"
<File RelativePath="..\..\..\glib\giowin32.c" />
<File RelativePath="..\..\..\glib\gspawn-win32.c" />
<File RelativePath="..\..\..\glib\gthread-win32.c" />
diff --git a/build/win32/vs9/gobject.vcprojin b/build/win32/vs9/gobject.vcprojin
index 92ca2aa..531e442 100644
--- a/build/win32/vs9/gobject.vcprojin
+++ b/build/win32/vs9/gobject.vcprojin
@@ -152,7 +152,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "libgobject.sourcefiles"
+#include "gobject.sourcefiles"
</Filter>
<Filter
Name="Header Files"
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 04e0ae4..b7f91cc 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -788,46 +788,35 @@ gresource_LDADD = libgio-2.0.la \
$(LIBELF_LIBS)
# ------------------------------------------------------------------------
+# ------ MSVC Project File Generation ------
+MSVCPROJS = gio glib-compile-resources glib-compile-schemas
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10/gio.vcxproj
../build/win32/vs10/gio.vcxproj.filters
+gio_FILES = $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj)
+gio_EXCLUDES = gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c|gnetworkmonitornm.c
+
+gio_HEADERS_DIR = $(includedir)/glib-2.0/gio
+gio_HEADERS_INST = $(gioinclude_HEADERS) $(nodist_gioinclude_HEADERS)
+gio_HEADERS_EXCLUDES = dummy
+
+glib_compile_resources_FILES = $(glib_compile_resources_SOURCES)
+glib_compile_resources_EXCLUDES = dummy
+
+glib_compile_schemas_FILES = $(glib_compile_schemas_SOURCES)
+glib_compile_schemas_EXCLUDES = dummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: \
+ $(BUILT_EXTRA_DIST) \
+ $(top_builddir)/build/win32/vs9/gio.vcproj \
+ $(top_builddir)/build/win32/vs9/gio.headers \
+ $(top_builddir)/build/win32/vs9/glib-compile-schemas.vcproj \
+ $(top_builddir)/build/win32/vs9/glib-compile-resources.vcproj
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done
-../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
- for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr
'/' '\\'`; do \
- case $$F in \
- gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c|gnetworkmonitornm.c) ;; \
- *.c) echo ' <File RelativePath="..\..\..\gio\'$$F'" />' \
- ;; \
- esac; \
- done | sort -u >libgio.sourcefiles
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@
- rm libgio.sourcefiles
-
-../build/win32/vs10/gio.vcxproj: $(top_srcdir)/build/win32/vs10/gio.vcxprojin
- for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr
'/' '\\'`; do \
- case $$F in \
- gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c|gnetworkmonitornm.c) ;; \
- *.c) echo ' <ClCompile Include="..\..\..\gio\'$$F'" />' \
- ;; \
- esac; \
- done | sort -u >libgio.vs10.sourcefiles
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxprojin >$@
- rm libgio.vs10.sourcefiles
-
-../build/win32/vs10/gio.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin
- for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr
'/' '\\'`; do \
- case $$F in \
- gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c|gnetworkmonitornm.c) ;; \
- *.c) echo ' <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source
Files</Filter></ClCompile>' \
- ;; \
- esac; \
- done | sort -u >libgio.vs10.sourcefiles.filters
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin >$@
- rm libgio.vs10.sourcefiles.filters
-
if HAVE_GLIB_RUNTIME_LIBDIR
install-data-hook:
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/glib/Makefile.am b/glib/Makefile.am
index c46a24d..2783b51 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -448,48 +448,24 @@ glib.def: libglib-2.0.la
glib-2.0.lib: libglib-2.0.la glib.def
$(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll
-def:$(builddir)/glib.def -out:$@
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs10/glib.vcxproj
../build/win32/vs10/glib.vcxproj.filters
+# ------ MSVC Project File Generation ------
+MSVCPROJS = glib
+
+glib_FILES = $(libglib_2_0_la_SOURCES)
+glib_EXCLUDES = *-unix.c|gthread-*.c
+
+glib_HEADERS_DIR = $(glibsubincludedir)
+glib_HEADERS_INST = $(deprecatedinclude_HEADERS) $(glibsubinclude_HEADERS)
+glib_HEADERS_EXCLUDES = dummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/glib.vcproj
$(top_builddir)/build/win32/vs9/glib.headers
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done
-../build/win32/vs9/glib.vcproj: $(top_srcdir)/build/win32/vs9/glib.vcprojin
- for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
- case $$F in \
- *-unix.c|gthread-*.c) \
- ;; \
- *.c) echo ' <File RelativePath="..\..\..\glib\'$$F'" />' \
- ;; \
- esac; \
- done >libglib.sourcefiles
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib.vcprojin >$@
- rm libglib.sourcefiles
-
-../build/win32/vs10/glib.vcxproj: $(top_srcdir)/build/win32/vs10/glib.vcxprojin
- for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
- case $$F in \
- *-unix.c|gthread-*.c) \
- ;; \
- *.c) echo ' <ClCompile Include="..\..\..\glib\'$$F'" />' \
- ;; \
- esac; \
- done >libglib.vs10.sourcefiles
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxprojin >$@
- rm libglib.vs10.sourcefiles
-
-../build/win32/vs10/glib.vcxproj.filters: $(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin
- for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
- case $$F in \
- *-unix.c|gthread-*.c) \
- ;; \
- *.c) echo ' <ClCompile Include="..\..\..\glib\'$$F'"><Filter>Source
Files</Filter></ClCompile>' \
- ;; \
- esac; \
- done >libglib.vs10.sourcefiles.filters
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin >$@
- rm libglib.vs10.sourcefiles.filters
-
# install gdb scripts
gdbdir = $(datadir)/glib-2.0/gdb
dist_gdb_SCRIPTS = glib.py
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 72ad2cd..2108caa 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -224,42 +224,24 @@ gobject.def: libgobject-2.0.la
gobject-2.0.lib: libgobject-2.0.la gobject.def
$(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll
-def:$(builddir)/gobject.def -out:$@
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gobject.vcproj ../build/win32/vs10/gobject.vcxproj
../build/win32/vs10/gobject.vcxproj.filters
+# ------ MSVC Project File Generation ------
+MSVCPROJS = gobject
+
+gobject_FILES = $(libgobject_2_0_la_SOURCES)
+gobject_EXCLUDES = dummy
+
+gobject_HEADERS_DIR = $(libgobjectincludedir)
+gobject_HEADERS_INST = $(gobject_public_h_sources)
+gobject_HEADERS_EXCLUDES = dummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/gobject.vcproj
$(top_builddir)/build/win32/vs9/gobject.headers
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done
-../build/win32/vs9/gobject.vcproj: $(top_srcdir)/build/win32/vs9/gobject.vcprojin
- for F in $(libgobject_2_0_la_SOURCES); do \
- case $$F in \
- *.c) echo ' <File RelativePath="..\..\..\gobject\'$$F'" />' \
- ;; \
- esac; \
- done >libgobject.sourcefiles
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gobject.vcprojin >$@
- rm libgobject.sourcefiles
-
-../build/win32/vs10/gobject.vcxproj: $(top_srcdir)/build/win32/vs10/gobject.vcxprojin
- for F in $(libgobject_2_0_la_SOURCES); do \
- case $$F in \
- *.c) echo ' <ClCompile Include="..\..\..\gobject\'$$F'" />' \
- ;; \
- esac; \
- done >libgobject.vs10.sourcefiles
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gobject.vcxprojin >$@
- rm libgobject.vs10.sourcefiles
-
-../build/win32/vs10/gobject.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gobject.vcxproj.filtersin
- for F in $(libgobject_2_0_la_SOURCES); do \
- case $$F in \
- *.c) echo ' <ClCompile Include="..\..\..\gobject\'$$F'"><Filter>Source
Files</Filter></ClCompile>' \
- ;; \
- esac; \
- done >libgobject.vs10.sourcefiles.filters
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gobject.vcxproj.filtersin >$@
- rm libgobject.vs10.sourcefiles.filters
-
install-data-local: install-ms-lib
uninstall-local: uninstall-ms-lib uninstall-gdb
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
