Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Tor Lillqvist authored and Tor Lillqvist committed Aug 27, 2008
1 parent 194493f commit 82c17cc
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 16 deletions.
15 changes: 8 additions & 7 deletions build/ChangeLog
@@ -1,13 +1,14 @@
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
compile it where it is in libcharset. 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). 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.
compile it where it is in libcharset. 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>

Expand Down
42 changes: 37 additions & 5 deletions build/win32/vs8/gio.vcproj
Expand Up @@ -39,7 +39,7 @@
<Tool
Name="VCCLCompilerTool"
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;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Expand All @@ -65,7 +65,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../gio/gio.def"
GenerateDebugInformation="true"
SubSystem="2"
Expand Down Expand Up @@ -122,7 +122,7 @@
/>
<Tool
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;"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Expand All @@ -146,7 +146,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../gio/gio.def"
GenerateDebugInformation="true"
SubSystem="2"
Expand Down Expand Up @@ -233,6 +233,14 @@
RelativePath="..\..\..\gio\gdummyfile.c"
>
</File>
<File
RelativePath="..\..\..\gio\gemblem.c"
>
</File>
<File
RelativePath="..\..\..\gio\gemblemedicon.c"
>
</File>
<File
RelativePath="..\..\..\gio\gfile.c"
>
Expand Down Expand Up @@ -405,11 +413,35 @@
RelativePath="..\..\..\gio\gwin32appinfo.c"
>
</File>
<File
RelativePath="..\..\..\gio\gwin32mount.c"
>
</File>
<File
RelativePath="..\..\..\gio\gwin32volumemonitor.c"
>
</File>
<File
RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"
>
</File>
</Filter>
<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
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
Expand Down
4 changes: 2 additions & 2 deletions build/win32/vs8/gspawn-win32-helper-console.vcproj
Expand Up @@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
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"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Expand Down Expand Up @@ -118,7 +118,7 @@
/>
<Tool
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"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Expand Down
4 changes: 2 additions & 2 deletions build/win32/vs8/gspawn-win32-helper.vcproj
Expand Up @@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
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"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Expand Down Expand Up @@ -118,7 +118,7 @@
/>
<Tool
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"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Expand Down

0 comments on commit 82c17cc

Please sign in to comment.