Add "win32" directory level to the references to the dependencies folder

2008-08-27  Tor Lillqvist  <tml@novell.com>

	* win32/vs8/*.vcproj: Add "win32" directory level to the
	references to the dependencies folder (which each actual user of
	the project file probably needs to edit anyway depending on their
	directory structure). Add missing files, remove nonexistent files.


svn path=/trunk/; revision=7404
This commit is contained in:
Tor Lillqvist 2008-08-27 13:20:28 +00:00 committed by Tor Lillqvist
parent 194493f3f8
commit 82c17ccf4f
4 changed files with 49 additions and 16 deletions

View File

@ -1,13 +1,14 @@
2008-08-27 Tor Lillqvist <tml@novell.com> 2008-08-27 Tor Lillqvist <tml@novell.com>
* win32/vs8/*.vcproj: Add "win32" directory level to the
references to the dependencies folder (which each actual user of
the project file probably needs to edit anyway depending on their
directory structure). Add missing files, remove nonexistent files.
* win32/vs8/glib.vcproj: Don't needlessly copy localcharset.c, but * win32/vs8/glib.vcproj: Don't needlessly copy localcharset.c, but
compile it where it is in libcharset. Add "win32" directory level compile it where it is in libcharset. Drop dirent as gdir.c
to the references to the dependencies folder (which each actual includes dirent.h and wdirent.c directly. Handle also
user of the project file probably needs to edit anyway depending G_GNUC_FORMAT in the custom build step for glib.symbols.
on their directory structure). Drop the nonexistent gi18n.c
file. Drop dirent as gdir.c includes dirent.h and wdirent.c
directly. Handle also G_GNUC_FORMAT in the custom build step for
glib.symbols.
2008-08-02 Tor Lillqvist <tml@novell.com> 2008-08-02 Tor Lillqvist <tml@novell.com>

View File

@ -39,7 +39,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include" AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/win32/proxy-libintl-20080418/include"
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="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -65,7 +65,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib" AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll" OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib" AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../gio/gio.def" ModuleDefinitionFile="../../../gio/gio.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -122,7 +122,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include" AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/win32/proxy-libintl-20080418/include"
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="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -146,7 +146,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib" AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll" OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib" AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../gio/gio.def" ModuleDefinitionFile="../../../gio/gio.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -233,6 +233,14 @@
RelativePath="..\..\..\gio\gdummyfile.c" RelativePath="..\..\..\gio\gdummyfile.c"
> >
</File> </File>
<File
RelativePath="..\..\..\gio\gemblem.c"
>
</File>
<File
RelativePath="..\..\..\gio\gemblemedicon.c"
>
</File>
<File <File
RelativePath="..\..\..\gio\gfile.c" RelativePath="..\..\..\gio\gfile.c"
> >
@ -405,10 +413,34 @@
RelativePath="..\..\..\gio\gwin32appinfo.c" RelativePath="..\..\..\gio\gwin32appinfo.c"
> >
</File> </File>
<File
RelativePath="..\..\..\gio\gwin32mount.c"
>
</File>
<File
RelativePath="..\..\..\gio\gwin32volumemonitor.c"
>
</File>
<File <File
RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c" RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"
> >
</File> </File>
<File
RelativePath="..\..\..\gio\win32\gwinhttpvfs.c"
>
</File>
<File
RelativePath="..\..\..\gio\win32\gwinhttpfile.c"
>
</File>
<File
RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c"
>
</File>
<File
RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"

View File

@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include" AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -118,7 +118,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include" AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

View File

@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include" AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -118,7 +118,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include" AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"