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.

diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 5f5f32c..cdca801 100644 (file)
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,7 +1,6 @@
 EXTRA_DIST = \
        README.txt \
        glib.sln \
-       glib.vsprops \
        glib.vcproj \
        glib.vcprojin \
        glib-genmarshal.vcproj \
@@ -20,4 +19,8 @@ EXTRA_DIST = \
        gresource.vcproj \
        gio-querymodules.vcproj \
        gdbus.vcproj \
-       install.vcproj
+       install.vcproj  \
+       glib-build-defines.vsprops      \
+       glib-install.vsprops    \
+       glib-version-paths.vsprops      \
+       glibprepbuild.vsprops

diff --git a/build/win32/vs9/gdbus.vcproj b/build/win32/vs9/gdbus.vcproj
index 09f6c51..bdd8b1b 100644 (file)
--- a/build/win32/vs9/gdbus.vcproj
+++ b/build/win32/vs9/gdbus.vcproj
@@ -21,7 +21,7 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -50,7 +50,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -79,7 +79,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
@@ -111,7 +111,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r

diff --git a/build/win32/vs9/gio-querymodules.vcproj b/build/win32/vs9/gio-querymodules.vcproj
index 005cd7a..6b3c130 100644 (file)
--- a/build/win32/vs9/gio-querymodules.vcproj
+++ b/build/win32/vs9/gio-querymodules.vcproj
@@ -21,7 +21,7 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -32,7 +32,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\gmodule"\r
-                               PreprocessorDefinitions="_DEBUG;GIO_COMPILATION"\r
+                               PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -50,7 +50,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -58,7 +58,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\gmodule"\r
-                               PreprocessorDefinitions="_DEBUG;GIO_COMPILATION"\r
+                               PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -79,7 +79,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
@@ -92,7 +92,7 @@
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\..\..\gmodule"\r
-                               PreprocessorDefinitions="GIO_COMPILATION"\r
+                               PreprocessorDefinitions="$(GioInBuildMacro)"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
@@ -111,7 +111,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
@@ -119,7 +119,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\..\..\gmodule"\r
-                               PreprocessorDefinitions="GIO_COMPILATION"\r
+                               PreprocessorDefinitions="$(GioInBuildMacro)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

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

diff --git a/build/win32/vs9/glib-build-defines.vsprops b/build/win32/vs9/glib-build-defines.vsprops
new file mode 100644 (file)
index 0000000..00f833b
--- /dev/null
+++ b/build/win32/vs9/glib-build-defines.vsprops
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="glibbuilddefinesprops"\r
+       OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
+       IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"\r
+       InheritedPropertySheets=".\glib-version-paths.vsprops"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include"\r
+               PreprocessorDefinitions="HAVE_CONFIG_H"\r
+               ForcedIncludeFiles="msvc_recommended_pragmas.h"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               AdditionalDependencies="intl.lib"\r
+               AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"\r
+       />\r
+       <UserMacro\r
+               Name="GLibBundledPCREDefines"\r
+               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"\r
+       />\r
+       <UserMacro\r
+               Name="DllExportDefines"\r
+               Value="DLL_EXPORT"\r
+       />\r
+       <UserMacro\r
+               Name="UseSystemPCREDefines"\r
+               Value="USE_SYSTEM_PCRE"\r
+       />\r
+       <UserMacro\r
+               Name="GLibInBuildMacro"\r
+               Value="GLIB_COMPILATION"\r
+       />\r
+       <UserMacro\r
+               Name="GioInBuildMacro"\r
+               Value="GIO_COMPILATION"\r
+       />\r
+       <UserMacro\r
+               Name="GLibBuildDefines"\r
+               Value="$(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN=\&quot;GLib\&quot;"\r
+       />\r
+       <UserMacro\r
+               Name="GThreadBuildDefines"\r
+               Value="G_LOG_DOMAIN=\&quot;GThread\&quot;"\r
+       />\r
+       <UserMacro\r
+               Name="GModuleBuildDefines"\r
+               Value="G_LOG_DOMAIN=\&quot;GModule\&quot;"\r
+       />\r
+       <UserMacro\r
+               Name="GObjectBuildDefines"\r
+               Value="GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN=\&quot;GLib-GObject\&quot;;FFI_BUILDING"\r
+       />\r
+       <UserMacro\r
+               Name="GioBuildDefines"\r
+               Value="$(GioInBuildMacro);G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;$(DllExportDefines)"\r
+       />\r
+       <UserMacro\r
+               Name="WindowsNetworkingLibs"\r
+               Value="ws2_32.lib shlwapi.lib dnsapi.lib iphlpapi.lib"\r
+       />\r
+</VisualStudioPropertySheet>\r

diff --git a/build/win32/vs9/glib-compile-resources.vcproj b/build/win32/vs9/glib-compile-resources.vcproj
index 26e83b1..e56490e 100644 (file)
--- a/build/win32/vs9/glib-compile-resources.vcproj
+++ b/build/win32/vs9/glib-compile-resources.vcproj
@@ -21,7 +21,7 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -32,7 +32,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"\r
-                               PreprocessorDefinitions="_DEBUG;GIO_COMPILATION"\r
+                               PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -50,7 +50,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -58,7 +58,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"\r
-                               PreprocessorDefinitions="_DEBUG;GIO_COMPILATION"\r
+                               PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -79,7 +79,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
@@ -92,7 +92,7 @@
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"\r
-                               PreprocessorDefinitions="GIO_COMPILATION"\r
+                               PreprocessorDefinitions="$(GioInBuildMacro)"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
@@ -111,7 +111,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
@@ -119,7 +119,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"\r
-                               PreprocessorDefinitions="GIO_COMPILATION"\r
+                               PreprocessorDefinitions="$(GioInBuildMacro)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

diff --git a/build/win32/vs9/glib-compile-schemas.vcproj b/build/win32/vs9/glib-compile-schemas.vcproj
index 08b4b3e..617a4b7 100644 (file)
--- a/build/win32/vs9/glib-compile-schemas.vcproj
+++ b/build/win32/vs9/glib-compile-schemas.vcproj
@@ -21,7 +21,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        >
@@ -50,7 +50,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        >
@@ -79,7 +79,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -111,7 +111,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        WholeProgramOptimization="1"

diff --git a/build/win32/vs9/glib-genmarshal.vcproj b/build/win32/vs9/glib-genmarshal.vcproj
index 0ce4c39..edb3466 100644 (file)
--- a/build/win32/vs9/glib-genmarshal.vcproj
+++ b/build/win32/vs9/glib-genmarshal.vcproj
@@ -21,7 +21,7 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -49,7 +49,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
@@ -77,7 +77,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -105,7 +105,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r

diff --git a/build/win32/vs9/glib.vsprops b/build/win32/vs9/glib-install.vsprops
similarity index 89%
rename from build/win32/vs9/glib.vsprops
rename to build/win32/vs9/glib-install.vsprops
index 514bf51..a5c5245 100644 (file)
--- a/build/win32/vs9/glib.vsprops
+++ b/build/win32/vs9/glib-install.vsprops
@@ -2,57 +2,9 @@
 <VisualStudioPropertySheet\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="glibprops"\r
-       OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"\r
-       IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"\r
+       Name="glibinstallprops"\r
+       InheritedPropertySheets=".\glib-version-paths.vsprops"\r
        >\r
-       <Tool\r
-               Name="VCCLCompilerTool"\r
-               AdditionalIncludeDirectories="..\..\..;..\..\..\glib;$(GlibEtcInstallRoot)\include"\r
-               PreprocessorDefinitions="HAVE_CONFIG_H"\r
-               ForcedIncludeFiles="msvc_recommended_pragmas.h"\r
-       />\r
-       <Tool\r
-               Name="VCLinkerTool"\r
-               AdditionalDependencies="intl.lib"\r
-               AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"\r
-       />\r
-       <Tool\r
-               Name="VCPreBuildEventTool"\r
-               CommandLine="\r
-if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;\r
-copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;\r
-:DONE_CONFIG_H&#x0D;&#x0A;\r
-\r
-if exist ..\..\..\glib\glibconfig.h goto DONE_GLIBCONFIG_H&#x0D;&#x0A;\r
-copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h&#x0D;&#x0A;\r
-:DONE_GLIBCONFIG_H&#x0D;&#x0A;\r
-\r
-if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H&#x0D;&#x0A;\r
-copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;\r
-:DONE_GMODULECONF_H&#x0D;&#x0A;\r
-\r
-if exist ..\..\..\gio\gnetworking.h goto DONE_GNETWORKING_H&#x0D;&#x0A;\r
-copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h&#x0D;&#x0A;\r
-:DONE_GNETWORKING_H&#x0D;&#x0A;\r
-"\r
-       />\r
-       <UserMacro\r
-               Name="GlibEtcInstallRoot"\r
-               Value="..\..\..\..\vs9\$(PlatformName)"\r
-       />\r
-       <UserMacro\r
-               Name="CopyDir"\r
-               Value="$(GlibEtcInstallRoot)"\r
-       />\r
-       <UserMacro\r
-               Name="ApiVersion"\r
-               Value="2.0"\r
-       />\r
-       <UserMacro\r
-               Name="GLibBundledPCREDefines"\r
-               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"\r
-       />\r
        <UserMacro\r
                Name="GlibDoInstall"\r
                Value="\r
@@ -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;\r
 "\r
        />\r
-       <UserMacro\r
-               Name="GlibLibtoolCompatibleDllPrefix"\r
-               Value="lib"\r
-       />\r
-       <UserMacro\r
-               Name="GlibLibtoolCompatibleDllSuffix"\r
-               Value="-$(ApiVersion)-0"\r
-       />\r
-       <UserMacro\r
-               Name="GlibSeparateVS9DllPrefix"\r
-               Value=""\r
-       />\r
-       <UserMacro\r
-               Name="GlibSeparateVS9DllSuffix"\r
-               Value="-2-vs9"\r
-       />\r
-       <!-- Change these two to GlibLibtoolCompatibleDllPrefix and\r
-       GlibLibtoolCompatibleDllSuffix if that is what you want -->\r
-       <UserMacro\r
-               Name="GlibDllPrefix"\r
-               Value="$(GlibSeparateVS9DllPrefix)"\r
-       />\r
-       <UserMacro\r
-               Name="GlibDllSuffix"\r
-               Value="$(GlibSeparateVS9DllSuffix)"\r
-       />\r
 </VisualStudioPropertySheet>\r

diff --git a/build/win32/vs9/glib-version-paths.vsprops b/build/win32/vs9/glib-version-paths.vsprops
new file mode 100644 (file)
index 0000000..216177d
--- /dev/null
+++ b/build/win32/vs9/glib-version-paths.vsprops
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="glibversionpathsprops"\r
+       >\r
+       <UserMacro\r
+               Name="VSVer"\r
+               Value="9"\r
+       />\r
+       <UserMacro\r
+               Name="GlibEtcInstallRoot"\r
+               Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"\r
+       />\r
+       <UserMacro\r
+               Name="CopyDir"\r
+               Value="$(GlibEtcInstallRoot)"\r
+       />\r
+       <UserMacro\r
+               Name="ApiVersion"\r
+               Value="2.0"\r
+       />\r
+       <UserMacro\r
+               Name="GlibLibtoolCompatibleDllPrefix"\r
+               Value="lib"\r
+       />\r
+       <UserMacro\r
+               Name="GlibLibtoolCompatibleDllSuffix"\r
+               Value="-$(ApiVersion)-0"\r
+       />\r
+       <UserMacro\r
+               Name="GlibSeparateVSDllPrefix"\r
+               Value=""\r
+       />\r
+       <UserMacro\r
+               Name="GlibSeparateVSDllSuffix"\r
+               Value="-2-vs$(VSVer)"\r
+       />\r
+       <!-- Change these two to GlibLibtoolCompatibleDllPrefix and\r
+       GlibLibtoolCompatibleDllSuffix if that is what you want -->\r
+       <UserMacro\r
+               Name="GlibDllPrefix"\r
+               Value="$(GlibSeparateVSDllPrefix)"\r
+       />\r
+       <UserMacro\r
+               Name="GlibDllSuffix"\r
+               Value="$(GlibSeparateVSDllSuffix)"\r
+       />\r
+</VisualStudioPropertySheet>
\ No newline at end of file

diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin
index a72bd45..16db864 100644 (file)
--- a/build/win32/vs9/glib.vcprojin
+++ b/build/win32/vs9/glib.vcprojin
@@ -21,14 +21,14 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                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"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -52,7 +52,7 @@
                </Configuration>
                <Configuration
                        Name="Debug_ExtPCRE|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
                        OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
@@ -60,7 +60,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                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"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -84,14 +84,14 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                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"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -115,7 +115,7 @@
                </Configuration>
                <Configuration
                        Name="Debug_ExtPCRE|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
                        OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
@@ -123,7 +123,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                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"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -147,14 +147,14 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;$(GLibBundledPCREDefines)"
+                               PreprocessorDefinitions="$(GLibBuildDefines);$(GLibBundledPCREDefines)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -178,7 +178,7 @@
                </Configuration>
                <Configuration
                        Name="Release_ExtPCRE|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
                        OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
@@ -186,7 +186,7 @@
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;USE_SYSTEM_PCRE"
+                               PreprocessorDefinitions="$(GLibBuildDefines);$(UseSystemPCREDefines)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -210,14 +210,14 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;$(GLibBundledPCREDefines)"
+                               PreprocessorDefinitions="$(GLibBuildDefines);$(GLibBundledPCREDefines)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -241,7 +241,7 @@
                </Configuration>
                <Configuration
                        Name="Release_ExtPCRE|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glibprepbuild.vsprops;.\glib-build-defines.vsprops"
                        OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
                        ConfigurationType="2"
                        CharacterSet="2"
@@ -249,7 +249,7 @@
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;GLib\&quot;;USE_SYSTEM_PCRE"
+                               PreprocessorDefinitions="$(GLibBuildDefines);$(UseSystemPCREDefines)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"

diff --git a/build/win32/vs9/glibprepbuild.vsprops b/build/win32/vs9/glibprepbuild.vsprops
new file mode 100644 (file)
index 0000000..4bb12f6
--- /dev/null
+++ b/build/win32/vs9/glibprepbuild.vsprops
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="glibprepbuildprops"\r
+       >\r
+       <Tool\r
+               Name="VCPreBuildEventTool"\r
+               CommandLine="\r
+if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;\r
+copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;\r
+:DONE_CONFIG_H&#x0D;&#x0A;\r
+\r
+if exist ..\..\..\glib\glibconfig.h goto DONE_GLIBCONFIG_H&#x0D;&#x0A;\r
+copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h&#x0D;&#x0A;\r
+:DONE_GLIBCONFIG_H&#x0D;&#x0A;\r
+\r
+if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H&#x0D;&#x0A;\r
+copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;\r
+:DONE_GMODULECONF_H&#x0D;&#x0A;\r
+\r
+if exist ..\..\..\gio\gnetworking.h goto DONE_GNETWORKING_H&#x0D;&#x0A;\r
+copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h&#x0D;&#x0A;\r
+:DONE_GNETWORKING_H&#x0D;&#x0A;\r
+"\r
+       />\r
+</VisualStudioPropertySheet>
\ No newline at end of file

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

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

diff --git a/build/win32/vs9/gresource.vcproj b/build/win32/vs9/gresource.vcproj
index 31238f5..bf3326d 100644 (file)
--- a/build/win32/vs9/gresource.vcproj
+++ b/build/win32/vs9/gresource.vcproj
@@ -21,7 +21,7 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -50,7 +50,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
@@ -79,7 +79,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
@@ -111,7 +111,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r

diff --git a/build/win32/vs9/gsettings.vcproj b/build/win32/vs9/gsettings.vcproj
index 34f58ce..4804581 100644 (file)
--- a/build/win32/vs9/gsettings.vcproj
+++ b/build/win32/vs9/gsettings.vcproj
@@ -21,7 +21,7 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        >
@@ -50,7 +50,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        >
@@ -79,7 +79,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -112,7 +112,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="1"
                        CharacterSet="2"
                        WholeProgramOptimization="1"

diff --git a/build/win32/vs9/gspawn-win32-helper-console.vcproj b/build/win32/vs9/gspawn-win32-helper-console.vcproj
index 8f77add..a05d61a 100644 (file)
--- a/build/win32/vs9/gspawn-win32-helper-console.vcproj
+++ b/build/win32/vs9/gspawn-win32-helper-console.vcproj
@@ -21,14 +21,14 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION"\r
+                               PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -49,14 +49,14 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="GLIB_COMPILATION"\r
+                               PreprocessorDefinitions="$(GLibInBuildMacro)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -77,14 +77,14 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION"\r
+                               PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -106,14 +106,14 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="GLIB_COMPILATION"\r
+                               PreprocessorDefinitions="$(GLibInBuildMacro)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

diff --git a/build/win32/vs9/gspawn-win32-helper.vcproj b/build/win32/vs9/gspawn-win32-helper.vcproj
index 99c2598..eb94744 100644 (file)
--- a/build/win32/vs9/gspawn-win32-helper.vcproj
+++ b/build/win32/vs9/gspawn-win32-helper.vcproj
@@ -21,14 +21,14 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION"\r
+                               PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -49,14 +49,14 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION"\r
+                               PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -78,14 +78,14 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="GLIB_COMPILATION"\r
+                               PreprocessorDefinitions="$(GLibInBuildMacro)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -106,14 +106,14 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="GLIB_COMPILATION"\r
+                               PreprocessorDefinitions="$(GLibInBuildMacro)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

diff --git a/build/win32/vs9/gthread.vcproj b/build/win32/vs9/gthread.vcproj
index 7a6c1d9..7c50d9b 100644 (file)
--- a/build/win32/vs9/gthread.vcproj
+++ b/build/win32/vs9/gthread.vcproj
@@ -21,14 +21,14 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GThread\&quot;"\r
+                               PreprocessorDefinitions="_DEBUG;$(GThreadBuildDefines)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -51,14 +51,14 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GThread\&quot;"\r
+                               PreprocessorDefinitions="$(GThreadBuildDefines)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -81,14 +81,14 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\&quot;GThread\&quot;"\r
+                               PreprocessorDefinitions="_DEBUG;$(GThreadBuildDefines)"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -111,14 +111,14 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"\r
                        ConfigurationType="2"\r
                        CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="G_LOG_DOMAIN=\&quot;GThread\&quot;"\r
+                               PreprocessorDefinitions="$(GThreadBuildDefines)"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 6f30f58..6d0161d 100644 (file)
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -21,7 +21,7 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-install.vsprops"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
                        CharacterSet="2"\r
@@ -34,7 +34,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-install.vsprops"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
                        CharacterSet="2"\r
@@ -47,7 +47,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-install.vsprops"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
                        CharacterSet="2"\r
@@ -61,7 +61,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       InheritedPropertySheets=".\glib.vsprops"\r
+                       InheritedPropertySheets=".\glib-install.vsprops"\r
                        OutputDirectory="$(GlibEtcInstallRoot)"\r
                        ConfigurationType="10"\r
                        CharacterSet="2"\r

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