build/win32/vs9/gio.vcprojin: Use UNIX Line endings

[platform/upstream/glib.git] / build / win32 / vs9 / gio.vcprojin

diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin
index 4304aa6..0b9308a 100644 (file)
--- 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="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
+                               PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -39,10 +39,9 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
+                               AdditionalDependencies="zlib1d.lib $(WindowsNetworkingLibs)"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="2"
-                               ModuleDefinitionFile="$(IntDir)\gio.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
@@ -53,7 +52,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -61,7 +60,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
+                               PreprocessorDefinitions="$(GioBuildDefines)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -70,10 +69,9 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
+                               AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="1"
-                               ModuleDefinitionFile="$(IntDir)\gio.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
@@ -86,7 +84,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -94,7 +92,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
+                               PreprocessorDefinitions="_DEBUG;$(GioBuildDefines)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -105,10 +103,9 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
+                               AdditionalDependencies="zlib1d.lib $(WindowsNetworkingLibs)"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="2"
-                               ModuleDefinitionFile="$(IntDir)\gio.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
@@ -119,7 +116,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\glib.vsprops"
+                       InheritedPropertySheets=".\glib-build-defines.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
@@ -127,7 +124,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="../../../gio,../../../gmodule"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
+                               PreprocessorDefinitions="$(GioBuildDefines)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -136,10 +133,9 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="zdll.lib ws2_32.lib shlwapi.lib dnsapi.lib"
+                               AdditionalDependencies="zlib1.lib $(WindowsNetworkingLibs)"
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"
                                LinkIncremental="1"
-                               ModuleDefinitionFile="$(IntDir)\gio.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
@@ -160,13 +156,6 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
 #include "libgio.sourcefiles"
-                       <File RelativePath="..\..\..\gio\gregistrysettingsbackend.c" />
-                       <File RelativePath="..\..\..\gio\gwin32appinfo.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwinhttpfile.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c" />
-                       <File RelativePath="..\..\..\gio\win32\gwinhttpvfs.c" />
                </Filter>
                <Filter
                        Name="Header Files"
@@ -179,54 +168,7 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
-                       <File
-                               RelativePath="..\..\..\gio\gio.rc"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\..\gio\gio.symbols"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Generating gio.def"
-                                               CommandLine="$(GlibGenerateGioDef)"
-                                               Outputs="$(IntDir)/gio.def"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Generating gio.def"
-                                               CommandLine="$(GlibGenerateGioDef)"
-                                               Outputs="$(IntDir)/gio.def"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Generating gio.def"
-                                               CommandLine="$(GlibGenerateGioDef)"
-                                               Outputs="$(IntDir)/gio.def"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCustomBuildTool"
-                                               Description="Generating gio.def"
-                                               CommandLine="$(GlibGenerateGioDef)"
-                                               Outputs="$(IntDir)/gio.def"
-                                       />
-                               </FileConfiguration>
-                       </File>
+                       <File RelativePath="..\..\..\gio\gio.rc" />
                </Filter>
        </Files>
 </VisualStudioProject>