[glib] MSVC 2008 Projects: Split the Property Sheets
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] MSVC 2008 Projects: Split the Property Sheets
- Date: Wed, 21 Aug 2013 08:05:58 +0000 (UTC)
commit 3c4ee831f74e760b65e9239bec3ad5b5ac60e6a6
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Aug 21 16:05:47 2013 +0800
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.
build/win32/vs9/Makefile.am | 7 +-
build/win32/vs9/gdbus.vcproj | 8 +-
build/win32/vs9/gio-querymodules.vcproj | 16 ++--
build/win32/vs9/gio.vcprojin | 24 +++---
build/win32/vs9/glib-build-defines.vsprops | 65 ++++++++++++++++
build/win32/vs9/glib-compile-resources.vcproj | 16 ++--
build/win32/vs9/glib-compile-schemas.vcproj | 8 +-
build/win32/vs9/glib-genmarshal.vcproj | 8 +-
.../vs9/{glib.vsprops => glib-install.vsprops} | 78 +-------------------
build/win32/vs9/glib-version-paths.vsprops | 49 ++++++++++++
build/win32/vs9/glib.vcprojin | 32 ++++----
build/win32/vs9/glibprepbuild.vsprops | 27 +++++++
build/win32/vs9/gmodule.vcproj | 21 ++---
build/win32/vs9/gobject.vcprojin | 16 ++--
build/win32/vs9/gresource.vcproj | 8 +-
build/win32/vs9/gsettings.vcproj | 8 +-
build/win32/vs9/gspawn-win32-helper-console.vcproj | 16 ++--
build/win32/vs9/gspawn-win32-helper.vcproj | 16 ++--
build/win32/vs9/gthread.vcproj | 16 ++--
build/win32/vs9/install.vcproj | 8 +-
build/win32/vs9/testglib.vcproj | 21 ++---
21 files changed, 266 insertions(+), 202 deletions(-)
---
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 5f5f32c..cdca801 100644
--- 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
--- a/build/win32/vs9/gdbus.vcproj
+++ b/build/win32/vs9/gdbus.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/gio-querymodules.vcproj b/build/win32/vs9/gio-querymodules.vcproj
index 005cd7a..6b3c130 100644
--- a/build/win32/vs9/gio-querymodules.vcproj
+++ b/build/win32/vs9/gio-querymodules.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -32,7 +32,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\gmodule"
- PreprocessorDefinitions="_DEBUG;GIO_COMPILATION"
+ PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -50,7 +50,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -58,7 +58,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\gmodule"
- PreprocessorDefinitions="_DEBUG;GIO_COMPILATION"
+ PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -79,7 +79,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -92,7 +92,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\..\gmodule"
- PreprocessorDefinitions="GIO_COMPILATION"
+ PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@@ -111,7 +111,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\gmodule"
- PreprocessorDefinitions="GIO_COMPILATION"
+ PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin
index 760a391..3697d9f 100644
--- a/build/win32/vs9/gio.vcprojin
+++ b/build/win32/vs9/gio.vcprojin
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -28,7 +28,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-
PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\"GLib-GIO\";GIO_COMPILATION;DLL_EXPORT"
+ PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -39,7 +39,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib1d.lib ws2_32.lib shlwapi.lib dnsapi.lib
iphlpapi.lib"
+ AdditionalDependencies="zlib1d.lib $(WindowsNetworkingLibs)"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -52,7 +52,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -60,7 +60,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-
PreprocessorDefinitions="G_LOG_DOMAIN=\"GLib-GIO\";GIO_COMPILATION;DLL_EXPORT"
+ PreprocessorDefinitions="$(GioBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib1.lib ws2_32.lib shlwapi.lib dnsapi.lib
iphlpapi.lib"
+ AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
GenerateDebugInformation="true"
@@ -84,7 +84,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -92,7 +92,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-
PreprocessorDefinitions="_DEBUG;G_LOG_DOMAIN=\"GLib-GIO\";GIO_COMPILATION;DLL_EXPORT"
+ PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -103,7 +103,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib1d.lib ws2_32.lib shlwapi.lib dnsapi.lib
iphlpapi.lib"
+ AdditionalDependencies="zlib1d.lib $(WindowsNetworkingLibs)"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -116,7 +116,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -124,7 +124,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-
PreprocessorDefinitions="G_LOG_DOMAIN=\"GLib-GIO\";GIO_COMPILATION;DLL_EXPORT"
+ PreprocessorDefinitions="$(GioBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -133,7 +133,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib1.lib ws2_32.lib shlwapi.lib dnsapi.lib
iphlpapi.lib"
+ AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
LinkIncremental="1"
GenerateDebugInformation="true"
diff --git a/build/win32/vs9/glib-build-defines.vsprops b/build/win32/vs9/glib-build-defines.vsprops
new file mode 100644
index 0000000..00f833b
--- /dev/null
+++ b/build/win32/vs9/glib-build-defines.vsprops
@@ -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=\"GLib\""
+ />
+ <UserMacro
+ Name="GThreadBuildDefines"
+ Value="G_LOG_DOMAIN=\"GThread\""
+ />
+ <UserMacro
+ Name="GModuleBuildDefines"
+ Value="G_LOG_DOMAIN=\"GModule\""
+ />
+ <UserMacro
+ Name="GObjectBuildDefines"
+
Value="GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN=\"GLib-GObject\";FFI_BUILDING"
+ />
+ <UserMacro
+ Name="GioBuildDefines"
+ Value="$(GioInBuildMacro);G_LOG_DOMAIN=\"GLib-GIO\";$(DllExportDefines)"
+ />
+ <UserMacro
+ Name="WindowsNetworkingLibs"
+ Value="ws2_32.lib shlwapi.lib dnsapi.lib iphlpapi.lib"
+ />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/glib-compile-resources.vcproj b/build/win32/vs9/glib-compile-resources.vcproj
index 26e83b1..e56490e 100644
--- a/build/win32/vs9/glib-compile-resources.vcproj
+++ b/build/win32/vs9/glib-compile-resources.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -32,7 +32,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
- PreprocessorDefinitions="_DEBUG;GIO_COMPILATION"
+ PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -50,7 +50,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -58,7 +58,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
- PreprocessorDefinitions="_DEBUG;GIO_COMPILATION"
+ PreprocessorDefinitions="_DEBUG;$(GioInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -79,7 +79,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -92,7 +92,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
- PreprocessorDefinitions="GIO_COMPILATION"
+ PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@@ -111,7 +111,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\gmodule;..\..\..\gio"
- PreprocessorDefinitions="GIO_COMPILATION"
+ PreprocessorDefinitions="$(GioInBuildMacro)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/build/win32/vs9/glib-compile-schemas.vcproj b/build/win32/vs9/glib-compile-schemas.vcproj
index 08b4b3e..617a4b7 100644
--- 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
--- a/build/win32/vs9/glib-genmarshal.vcproj
+++ b/build/win32/vs9/glib-genmarshal.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -49,7 +49,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -77,7 +77,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
@@ -105,7 +105,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.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
--- a/build/win32/vs9/glib.vsprops
+++ b/build/win32/vs9/glib-install.vsprops
@@ -2,57 +2,9 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="glibprops"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
+ Name="glibinstallprops"
+ 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"
- />
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="
-if exist ..\..\..\config.h goto DONE_CONFIG_H

-copy ..\..\..\config.h.win32 ..\..\..\config.h

-:DONE_CONFIG_H

-
-if exist ..\..\..\glib\glibconfig.h goto DONE_GLIBCONFIG_H

-copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h

-:DONE_GLIBCONFIG_H

-
-if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H

-copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h

-:DONE_GMODULECONF_H

-
-if exist ..\..\..\gio\gnetworking.h goto DONE_GNETWORKING_H

-copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h

-:DONE_GNETWORKING_H

-"
- />
- <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
Name="GlibDoInstall"
Value="
@@ -331,30 +283,4 @@ mkdir $(CopyDir)\lib\gdbus-$(ApiVersion)\codegen

copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\lib\gdbus-$(ApiVersion)\codegen

"
/>
- <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>
diff --git a/build/win32/vs9/glib-version-paths.vsprops b/build/win32/vs9/glib-version-paths.vsprops
new file mode 100644
index 0000000..216177d
--- /dev/null
+++ b/build/win32/vs9/glib-version-paths.vsprops
@@ -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>
\ No newline at end of file
diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin
index a72bd45..16db864 100644
--- 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=\"GLib\";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=\"GLib\";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=\"GLib\";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=\"GLib\";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=\"GLib\";$(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=\"GLib\";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=\"GLib\";$(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=\"GLib\";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
index 0000000..4bb12f6
--- /dev/null
+++ b/build/win32/vs9/glibprepbuild.vsprops
@@ -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

+copy ..\..\..\config.h.win32 ..\..\..\config.h

+:DONE_CONFIG_H

+
+if exist ..\..\..\glib\glibconfig.h goto DONE_GLIBCONFIG_H

+copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h

+:DONE_GLIBCONFIG_H

+
+if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H

+copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h

+:DONE_GMODULECONF_H

+
+if exist ..\..\..\gio\gnetworking.h goto DONE_GNETWORKING_H

+copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h

+:DONE_GNETWORKING_H

+"
+ />
+</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
--- 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=\"GModule\""
+ 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=\"GModule\""
+ 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=\"GModule\""
+ 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=\"GModule\""
+ 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
--- 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=\"GLib-GObject\";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=\"GLib-GObject\";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=\"GLib-GObject\";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=\"GLib-GObject\";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
--- a/build/win32/vs9/gresource.vcproj
+++ b/build/win32/vs9/gresource.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/gsettings.vcproj b/build/win32/vs9/gsettings.vcproj
index 34f58ce..4804581 100644
--- 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
--- a/build/win32/vs9/gspawn-win32-helper-console.vcproj
+++ b/build/win32/vs9/gspawn-win32-helper-console.vcproj
@@ -21,14 +21,14 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION"
+ PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -49,14 +49,14 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="GLIB_COMPILATION"
+ PreprocessorDefinitions="$(GLibInBuildMacro)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -77,14 +77,14 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION"
+ PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -106,14 +106,14 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="GLIB_COMPILATION"
+ PreprocessorDefinitions="$(GLibInBuildMacro)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/build/win32/vs9/gspawn-win32-helper.vcproj b/build/win32/vs9/gspawn-win32-helper.vcproj
index 99c2598..eb94744 100644
--- a/build/win32/vs9/gspawn-win32-helper.vcproj
+++ b/build/win32/vs9/gspawn-win32-helper.vcproj
@@ -21,14 +21,14 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION"
+ PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -49,14 +49,14 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG;GLIB_COMPILATION"
+ PreprocessorDefinitions="_DEBUG;$(GLibInBuildMacro)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -78,14 +78,14 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="GLIB_COMPILATION"
+ PreprocessorDefinitions="$(GLibInBuildMacro)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -106,14 +106,14 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="GLIB_COMPILATION"
+ PreprocessorDefinitions="$(GLibInBuildMacro)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/build/win32/vs9/gthread.vcproj b/build/win32/vs9/gthread.vcproj
index 7a6c1d9..7c50d9b 100644
--- a/build/win32/vs9/gthread.vcproj
+++ b/build/win32/vs9/gthread.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=\"GThread\""
+ PreprocessorDefinitions="_DEBUG;$(GThreadBuildDefines)"
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=\"GThread\""
+ PreprocessorDefinitions="$(GThreadBuildDefines)"
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=\"GThread\""
+ PreprocessorDefinitions="_DEBUG;$(GThreadBuildDefines)"
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=\"GThread\""
+ PreprocessorDefinitions="$(GThreadBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 6f30f58..6d0161d 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -34,7 +34,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -47,7 +47,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -61,7 +61,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
diff --git a/build/win32/vs9/testglib.vcproj b/build/win32/vs9/testglib.vcproj
index 420a7c5..0c17401 100644
--- a/build/win32/vs9/testglib.vcproj
+++ b/build/win32/vs9/testglib.vcproj
@@ -21,14 +21,14 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG"
+
PreprocessorDefinitions="_DEBUG;GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN=\"GLib\""
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -49,14 +49,14 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
+
PreprocessorDefinitions="GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN=\"GLib\""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -77,14 +77,14 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_DEBUG"
+
PreprocessorDefinitions="_DEBUG;GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN=\"GLib\""
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -105,14 +105,14 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\glib.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
+
PreprocessorDefinitions="GLIB_DISABLE_DEPRECATION_WARNINGS;G_LOG_DOMAIN=\"GLib\""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -140,10 +140,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File
- RelativePath="..\..\..\tests\testglib.c"
- >
- </File>
+ <File RelativePath="..\..\..\tests\testglib.c" />
</Filter>
<Filter
Name="Header Files"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
