MSVC 2008 Projects: Split the Property Sheets

Split the property sheet into four sheets, to make maintainance of the
build files easier, and also to prepare for using autotools to fill in
the parts for the "installation" of headers.

Also put more of the items that are repeated in the projects into the
property sheets, also to improve ease of maintenance.

Updates to the Visual Studio 2010 projects will come later, as the script
to update them to Visual Studio 2012 must also be taken into account during'
the process.
This commit is contained in:
Chun-wei Fan 2013-08-21 16:05:47 +08:00
parent 716ec71ece
commit 3c4ee831f7
21 changed files with 266 additions and 202 deletions

View File

@ -1,7 +1,6 @@
EXTRA_DIST = \ EXTRA_DIST = \
README.txt \ README.txt \
glib.sln \ glib.sln \
glib.vsprops \
glib.vcproj \ glib.vcproj \
glib.vcprojin \ glib.vcprojin \
glib-genmarshal.vcproj \ glib-genmarshal.vcproj \
@ -20,4 +19,8 @@ EXTRA_DIST = \
gresource.vcproj \ gresource.vcproj \
gio-querymodules.vcproj \ gio-querymodules.vcproj \
gdbus.vcproj \ gdbus.vcproj \
install.vcproj install.vcproj \
glib-build-defines.vsprops \
glib-install.vsprops \
glib-version-paths.vsprops \
glibprepbuild.vsprops

View File

@ -21,7 +21,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -50,7 +50,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -79,7 +79,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -111,7 +111,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"

View File

@ -21,7 +21,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -32,7 +32,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\gmodule" AdditionalIncludeDirectories="..\..\..\gmodule"
PreprocessorDefinitions="_DEBUG;GIO_COMPILATION" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -50,7 +50,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -58,7 +58,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\gmodule" AdditionalIncludeDirectories="..\..\..\gmodule"
PreprocessorDefinitions="_DEBUG;GIO_COMPILATION" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -79,7 +79,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -92,7 +92,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\..\gmodule" AdditionalIncludeDirectories="..\..\..\gmodule"
PreprocessorDefinitions="GIO_COMPILATION" PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -111,7 +111,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -119,7 +119,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\gmodule" AdditionalIncludeDirectories="..\..\..\gmodule"
PreprocessorDefinitions="GIO_COMPILATION" PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

View File

@ -20,7 +20,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
@ -28,7 +28,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../../gio,../../../gmodule" AdditionalIncludeDirectories="../../../gio,../../../gmodule"
PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;DLL_EXPORT" PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -39,7 +39,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="zlib1d.lib ws2_32.lib shlwapi.lib dnsapi.lib iphlpapi.lib" AdditionalDependencies="zlib1d.lib $(WindowsNetworkingLibs)"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -52,7 +52,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -60,7 +60,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../gio,../../../gmodule" AdditionalIncludeDirectories="../../../gio,../../../gmodule"
PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;DLL_EXPORT" PreprocessorDefinitions="$(GioBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -69,7 +69,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="zlib1.lib ws2_32.lib shlwapi.lib dnsapi.lib iphlpapi.lib" AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -84,7 +84,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
@ -92,7 +92,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../../gio,../../../gmodule" AdditionalIncludeDirectories="../../../gio,../../../gmodule"
PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;DLL_EXPORT" PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -103,7 +103,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="zlib1d.lib ws2_32.lib shlwapi.lib dnsapi.lib iphlpapi.lib" AdditionalDependencies="zlib1d.lib $(WindowsNetworkingLibs)"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -116,7 +116,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -124,7 +124,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../gio,../../../gmodule" AdditionalIncludeDirectories="../../../gio,../../../gmodule"
PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;GIO_COMPILATION;DLL_EXPORT" PreprocessorDefinitions="$(GioBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -133,7 +133,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="zlib1.lib ws2_32.lib shlwapi.lib dnsapi.lib iphlpapi.lib" AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"

View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="glibbuilddefinesprops"
OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
InheritedPropertySheets=".\glib-version-paths.vsprops"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include"
PreprocessorDefinitions="HAVE_CONFIG_H"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="intl.lib"
AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
/>
<UserMacro
Name="GLibBundledPCREDefines"
Value="PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8"
/>
<UserMacro
Name="DllExportDefines"
Value="DLL_EXPORT"
/>
<UserMacro
Name="UseSystemPCREDefines"
Value="USE_SYSTEM_PCRE"
/>
<UserMacro
Name="GLibInBuildMacro"
Value="GLIB_COMPILATION"
/>
<UserMacro
Name="GioInBuildMacro"
Value="GIO_COMPILATION"
/>
<UserMacro
Name="GLibBuildDefines"
Value="$(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN=\&quot;GLib\&quot;"
/>
<UserMacro
Name="GThreadBuildDefines"
Value="G_LOG_DOMAIN=\&quot;GThread\&quot;"
/>
<UserMacro
Name="GModuleBuildDefines"
Value="G_LOG_DOMAIN=\&quot;GModule\&quot;"
/>
<UserMacro
Name="GObjectBuildDefines"
Value="GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN=\&quot;GLib-GObject\&quot;;FFI_BUILDING"
/>
<UserMacro
Name="GioBuildDefines"
Value="$(GioInBuildMacro);G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;$(DllExportDefines)"
/>
<UserMacro
Name="WindowsNetworkingLibs"
Value="ws2_32.lib shlwapi.lib dnsapi.lib iphlpapi.lib"
/>
</VisualStudioPropertySheet>

View File

@ -21,7 +21,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -32,7 +32,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio" AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
PreprocessorDefinitions="_DEBUG;GIO_COMPILATION" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -50,7 +50,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -58,7 +58,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio" AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
PreprocessorDefinitions="_DEBUG;GIO_COMPILATION" PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -79,7 +79,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -92,7 +92,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio" AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
PreprocessorDefinitions="GIO_COMPILATION" PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -111,7 +111,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -119,7 +119,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio" AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
PreprocessorDefinitions="GIO_COMPILATION" PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

View File

@ -21,7 +21,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -50,7 +50,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -79,7 +79,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -111,7 +111,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"

View File

@ -21,7 +21,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -49,7 +49,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -77,7 +77,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -105,7 +105,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"

View File

@ -2,57 +2,9 @@
<VisualStudioPropertySheet <VisualStudioPropertySheet
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="glibprops" Name="glibinstallprops"
OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin" InheritedPropertySheets=".\glib-version-paths.vsprops"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
> >
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include"
PreprocessorDefinitions="HAVE_CONFIG_H"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="intl.lib"
AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
/>
<Tool
Name="VCPreBuildEventTool"
CommandLine="
if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
:DONE_CONFIG_H&#x0D;&#x0A;
if exist ..\..\..\glib\glibconfig.h goto DONE_GLIBCONFIG_H&#x0D;&#x0A;
copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h&#x0D;&#x0A;
:DONE_GLIBCONFIG_H&#x0D;&#x0A;
if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H&#x0D;&#x0A;
copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;
:DONE_GMODULECONF_H&#x0D;&#x0A;
if exist ..\..\..\gio\gnetworking.h goto DONE_GNETWORKING_H&#x0D;&#x0A;
copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h&#x0D;&#x0A;
:DONE_GNETWORKING_H&#x0D;&#x0A;
"
/>
<UserMacro
Name="GlibEtcInstallRoot"
Value="..\..\..\..\vs9\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
Value="$(GlibEtcInstallRoot)"
/>
<UserMacro
Name="ApiVersion"
Value="2.0"
/>
<UserMacro
Name="GLibBundledPCREDefines"
Value="PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8"
/>
<UserMacro <UserMacro
Name="GlibDoInstall" Name="GlibDoInstall"
Value=" Value="
@ -331,30 +283,4 @@ mkdir $(CopyDir)\lib\gdbus-$(ApiVersion)\codegen&#x0D;&#x0A;
copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\lib\gdbus-$(ApiVersion)\codegen&#x0D;&#x0A; copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\lib\gdbus-$(ApiVersion)\codegen&#x0D;&#x0A;
" "
/> />
<UserMacro
Name="GlibLibtoolCompatibleDllPrefix"
Value="lib"
/>
<UserMacro
Name="GlibLibtoolCompatibleDllSuffix"
Value="-$(ApiVersion)-0"
/>
<UserMacro
Name="GlibSeparateVS9DllPrefix"
Value=""
/>
<UserMacro
Name="GlibSeparateVS9DllSuffix"
Value="-2-vs9"
/>
<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
GlibLibtoolCompatibleDllSuffix if that is what you want -->
<UserMacro
Name="GlibDllPrefix"
Value="$(GlibSeparateVS9DllPrefix)"
/>
<UserMacro
Name="GlibDllSuffix"
Value="$(GlibSeparateVS9DllSuffix)"
/>
</VisualStudioPropertySheet> </VisualStudioPropertySheet>

View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="glibversionpathsprops"
>
<UserMacro
Name="VSVer"
Value="9"
/>
<UserMacro
Name="GlibEtcInstallRoot"
Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
Value="$(GlibEtcInstallRoot)"
/>
<UserMacro
Name="ApiVersion"
Value="2.0"
/>
<UserMacro
Name="GlibLibtoolCompatibleDllPrefix"
Value="lib"
/>
<UserMacro
Name="GlibLibtoolCompatibleDllSuffix"
Value="-$(ApiVersion)-0"
/>
<UserMacro
Name="GlibSeparateVSDllPrefix"
Value=""
/>
<UserMacro
Name="GlibSeparateVSDllSuffix"
Value="-2-vs$(VSVer)"
/>
<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
GlibLibtoolCompatibleDllSuffix if that is what you want -->
<UserMacro
Name="GlibDllPrefix"
Value="$(GlibSeparateVSDllPrefix)"
/>
<UserMacro
Name="GlibDllSuffix"
Value="$(GlibSeparateVSDllSuffix)"
/>
</VisualStudioPropertySheet>

View File

@ -21,14 +21,14 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;G_ENABLE_DEBUG;$(GLibBundledPCREDefines)" PreprocessorDefinitions="_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(GLibBundledPCREDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -52,7 +52,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_ExtPCRE|Win32" Name="Debug_ExtPCRE|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin" OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
@ -60,7 +60,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;G_ENABLE_DEBUG;USE_SYSTEM_PCRE" PreprocessorDefinitions="_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -84,14 +84,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;G_ENABLE_DEBUG;$(GLibBundledPCREDefines)" PreprocessorDefinitions="_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(GLibBundledPCREDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -115,7 +115,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_ExtPCRE|x64" Name="Debug_ExtPCRE|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin" OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
@ -123,7 +123,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;G_ENABLE_DEBUG;USE_SYSTEM_PCRE" PreprocessorDefinitions="_DEBUG;$(GLibBuildDefines);G_ENABLE_DEBUG;$(UseSystemPCREDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -147,14 +147,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;$(GLibBundledPCREDefines)" PreprocessorDefinitions="$(GLibBuildDefines);$(GLibBundledPCREDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -178,7 +178,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release_ExtPCRE|Win32" Name="Release_ExtPCRE|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin" OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
@ -186,7 +186,7 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;USE_SYSTEM_PCRE" PreprocessorDefinitions="$(GLibBuildDefines);$(UseSystemPCREDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -210,14 +210,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;$(GLibBundledPCREDefines)" PreprocessorDefinitions="$(GLibBuildDefines);$(GLibBundledPCREDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -241,7 +241,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release_ExtPCRE|x64" Name="Release_ExtPCRE|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin" OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
@ -249,7 +249,7 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;USE_SYSTEM_PCRE" PreprocessorDefinitions="$(GLibBuildDefines);$(UseSystemPCREDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="glibprepbuildprops"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="
if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
:DONE_CONFIG_H&#x0D;&#x0A;
if exist ..\..\..\glib\glibconfig.h goto DONE_GLIBCONFIG_H&#x0D;&#x0A;
copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h&#x0D;&#x0A;
:DONE_GLIBCONFIG_H&#x0D;&#x0A;
if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H&#x0D;&#x0A;
copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;
:DONE_GMODULECONF_H&#x0D;&#x0A;
if exist ..\..\..\gio\gnetworking.h goto DONE_GNETWORKING_H&#x0D;&#x0A;
copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h&#x0D;&#x0A;
:DONE_GNETWORKING_H&#x0D;&#x0A;
"
/>
</VisualStudioPropertySheet>

View File

@ -21,14 +21,14 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GModule\&quot;" PreprocessorDefinitions="_DEBUG;$(GModuleBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -51,14 +51,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GModule\&quot;" PreprocessorDefinitions="$(GModuleBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -81,14 +81,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GModule\&quot;" PreprocessorDefinitions="_DEBUG;$(GModuleBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -111,14 +111,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GModule\&quot;" PreprocessorDefinitions="$(GModuleBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -148,10 +148,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File RelativePath="..\..\..\gmodule\gmodule.c" />
RelativePath="..\..\..\gmodule\gmodule.c"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"

View File

@ -21,14 +21,14 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib-GObject\&quot;;FFI_BUILDING" PreprocessorDefinitions="_DEBUG;$(GObjectBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -51,7 +51,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -59,7 +59,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
WholeProgramOptimization="false" WholeProgramOptimization="false"
PreprocessorDefinitions="GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib-GObject\&quot;;FFI_BUILDING" PreprocessorDefinitions="$(GObjectBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -83,14 +83,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib-GObject\&quot;;FFI_BUILDING" PreprocessorDefinitions="_DEBUG;$(GObjectBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -113,7 +113,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -121,7 +121,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
WholeProgramOptimization="false" WholeProgramOptimization="false"
PreprocessorDefinitions="GOBJECT_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib-GObject\&quot;;FFI_BUILDING" PreprocessorDefinitions="$(GObjectBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

View File

@ -21,7 +21,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -50,7 +50,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -79,7 +79,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -111,7 +111,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"

View File

@ -21,7 +21,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -50,7 +50,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
@ -79,7 +79,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
@ -112,7 +112,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"

View File

@ -21,14 +21,14 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION" PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -49,14 +49,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="GLIB_COMPILATION" PreprocessorDefinitions="$(GLibInBuildMacro)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -77,14 +77,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION" PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -106,14 +106,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="GLIB_COMPILATION" PreprocessorDefinitions="$(GLibInBuildMacro)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

View File

@ -21,14 +21,14 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION" PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -49,14 +49,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION" PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -78,14 +78,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="GLIB_COMPILATION" PreprocessorDefinitions="$(GLibInBuildMacro)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -106,14 +106,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="GLIB_COMPILATION" PreprocessorDefinitions="$(GLibInBuildMacro)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

View File

@ -21,14 +21,14 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GThread\&quot;" PreprocessorDefinitions="_DEBUG;$(GThreadBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -51,14 +51,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GThread\&quot;" PreprocessorDefinitions="$(GThreadBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -81,14 +81,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GThread\&quot;" PreprocessorDefinitions="_DEBUG;$(GThreadBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -111,14 +111,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GThread\&quot;" PreprocessorDefinitions="$(GThreadBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

View File

@ -21,7 +21,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"
@ -34,7 +34,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"
@ -47,7 +47,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"
@ -61,7 +61,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)" OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10" ConfigurationType="10"
CharacterSet="2" CharacterSet="2"

View File

@ -21,14 +21,14 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="_DEBUG;GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN=\&quot;GLib\&quot;"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -49,14 +49,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="" PreprocessorDefinitions="GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN=\&quot;GLib\&quot;"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -77,14 +77,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="_DEBUG;GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN=\&quot;GLib\&quot;"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -105,14 +105,14 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
InheritedPropertySheets=".\glib.vsprops" InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="" PreprocessorDefinitions="GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN=\&quot;GLib\&quot;"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
@ -140,10 +140,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File RelativePath="..\..\..\tests\testglib.c" />
RelativePath="..\..\..\tests\testglib.c"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"