diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-08-27 13:20:28 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-08-27 13:20:28 +0000 |
| commit | 82c17ccf4ffd70b1ab15db9ec57ae14e6c093f60 (patch) | |
| tree | 49b79edaacaeb5a1cbb3adafcb60e98e227a4112 /build | |
| parent | 194493f3f8718b10ffc16f9e1b863a1b7f57cbc9 (diff) | |
| download | glib-82c17ccf4ffd70b1ab15db9ec57ae14e6c093f60.tar.gz | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/ChangeLog | 15 | ||||
| -rw-r--r-- | build/win32/vs8/gio.vcproj | 42 | ||||
| -rw-r--r-- | build/win32/vs8/gspawn-win32-helper-console.vcproj | 4 | ||||
| -rw-r--r-- | build/win32/vs8/gspawn-win32-helper.vcproj | 4 |
4 files changed, 49 insertions, 16 deletions
diff --git a/build/ChangeLog b/build/ChangeLog index 8ae924e43..1ba8ae2bc 100644 --- a/build/ChangeLog +++ b/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> diff --git a/build/win32/vs8/gio.vcproj b/build/win32/vs8/gio.vcproj index 039572ad3..90c22ac3d 100644 --- a/build/win32/vs8/gio.vcproj +++ b/build/win32/vs8/gio.vcproj @@ -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=\"GLib-GIO\";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\"gio/modules\""
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -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"
@@ -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=\"GLib-GIO\";G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\"gio/modules\""
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -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"
@@ -234,6 +234,14 @@ >
</File>
<File
+ RelativePath="..\..\..\gio\gemblem.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\gio\gemblemedicon.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\gio\gfile.c"
>
</File>
@@ -406,10 +414,34 @@ >
</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"
diff --git a/build/win32/vs8/gspawn-win32-helper-console.vcproj b/build/win32/vs8/gspawn-win32-helper-console.vcproj index 1df7c6036..d6bc12029 100644 --- a/build/win32/vs8/gspawn-win32-helper-console.vcproj +++ b/build/win32/vs8/gspawn-win32-helper-console.vcproj @@ -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"
@@ -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"
diff --git a/build/win32/vs8/gspawn-win32-helper.vcproj b/build/win32/vs8/gspawn-win32-helper.vcproj index 624a2ee90..fd7259ac4 100644 --- a/build/win32/vs8/gspawn-win32-helper.vcproj +++ b/build/win32/vs8/gspawn-win32-helper.vcproj @@ -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"
@@ -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"
|