projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 194493f)
Add "win32" directory level to the references to the dependencies folder
authorTor Lillqvist <tml@novell.com>
Wed, 27 Aug 2008 13:20:28 +0000 (13:20 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Wed, 27 Aug 2008 13:20:28 +0000 (13:20 +0000)
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

build/ChangeLog patch | blob | history
build/win32/vs8/gio.vcproj patch | blob | history
build/win32/vs8/gspawn-win32-helper-console.vcproj patch | blob | history
build/win32/vs8/gspawn-win32-helper.vcproj patch | blob | history

diff --git a/build/ChangeLog b/build/ChangeLog
index 8ae924e4312e9804e3ee62da4333fb25153bbb1f..1ba8ae2bc5c8074b4b90dde251f44fe9b83982cb 100644 (file)
--- 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 039572ad3050da37116f96c8ccad3eee413a2d0f..90c22ac3d03a4846db4e1e42557ffba6bd9ee355 100644 (file)
--- a/build/win32/vs8/gio.vcproj
+++ b/build/win32/vs8/gio.vcproj
@@ -39,7 +39,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/win32/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -65,7 +65,7 @@
                                AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"\r
                                OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"\r
+                               AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"\r
                                ModuleDefinitionFile="../../../gio/gio.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -122,7 +122,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/win32/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -146,7 +146,7 @@
                                AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"\r
                                OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"\r
+                               AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"\r
                                ModuleDefinitionFile="../../../gio/gio.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -233,6 +233,14 @@
                                RelativePath="..\..\..\gio\gdummyfile.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\gio\gemblem.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\gio\gemblemedicon.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\gio\gfile.c"\r
                                >\r
@@ -405,11 +413,35 @@
                                RelativePath="..\..\..\gio\gwin32appinfo.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\gio\gwin32mount.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\gio\gwin32volumemonitor.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"\r
                                >\r
                        </File>\r
-               </Filter>\r
+                       <File\r
+                               RelativePath="..\..\..\gio\win32\gwinhttpvfs.c"\r
+                               >\r
+                       </File> \r
+                       <File\r
+                               RelativePath="..\..\..\gio\win32\gwinhttpfile.c"\r
+                               >\r
+                       </File> \r
+                       <File\r
+                               RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c"\r
+                               >\r
+                       </File> \r
+                       <File\r
+                               RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c"\r
+                               >\r
+                       </File> \r
+       </Filter>\r
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
diff --git a/build/win32/vs8/gspawn-win32-helper-console.vcproj b/build/win32/vs8/gspawn-win32-helper-console.vcproj
index 1df7c603601cb723da315efe21ec6deeab20cdef..d6bc120291176a8477b1a259ba3b77c7c5b962fd 100644 (file)
--- a/build/win32/vs8/gspawn-win32-helper-console.vcproj
+++ b/build/win32/vs8/gspawn-win32-helper-console.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -118,7 +118,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
diff --git a/build/win32/vs8/gspawn-win32-helper.vcproj b/build/win32/vs8/gspawn-win32-helper.vcproj
index 624a2ee90aecfb803a1d86b2cb46366e7dbd8989..fd7259ac4cd0a1afccb01fb3e81ba35f78999fe4 100644 (file)
--- a/build/win32/vs8/gspawn-win32-helper.vcproj
+++ b/build/win32/vs8/gspawn-win32-helper.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -118,7 +118,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
Domain: System / Base;