Don't needlessly copy localcharset.c, but compile it where it is in

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

	* 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.

svn path=/trunk/; revision=7401

diff --git a/build/ChangeLog b/build/ChangeLog
index b6f06007ee1e4875402be748f8112af7442dd4df..f2d958199aad2535bbc0f161528161d0b4ca55ef 100644 (file)
--- a/build/ChangeLog
+++ b/build/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-27  Tor Lillqvist  <tml@novell.com>
+
+       * 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.
+
 2008-08-02  Tor Lillqvist  <tml@novell.com>
 
        Bug 545954 - 64-bit issue in dirent

diff --git a/build/win32/vs8/glib.vcproj b/build/win32/vs8/glib.vcproj
index f9d26b052520fcdd5889db3a79cda39038e81b2b..ff0d7a75e28e6fd1da5913d869e18c91c4787c47 100644 (file)
--- a/build/win32/vs8/glib.vcproj
+++ b/build/win32/vs8/glib.vcproj
@@ -24,7 +24,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="if exist ..\..\..\config.h goto GLIB_CONFIG&#x0D;&#x0A;copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;:GLIB_CONFIG&#x0D;&#x0A;if exist ..\..\..\glibconfig.h goto CHARSET&#x0D;&#x0A;copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h&#x0D;&#x0A;:CHARSET&#x0D;&#x0A;if exist ..\..\..\glib\localcharset.c goto END&#x0D;&#x0A;copy ..\..\..\glib\libcharset\localcharset.c ..\..\..\glib\localcharset.c&#x0D;&#x0A;:END&#x0D;&#x0A;"\r
+                               CommandLine="if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;:DONE_CONFIG_H&#x0D;&#x0A;if exist ..\..\..\glibconfig.h goto DONE_GLIBCONFIG_H&#x0D;&#x0A;copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h&#x0D;&#x0A;:DONE_GLIBCONFIG_H&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/proxy-libintl-20080418/include&quot;"\r
+                               AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/win32/proxy-libintl-20080418/include&quot;"\r
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;WIN32;HAVE_CONFIG_H;GLIB_COMPILATION;GLIB_EXPORTS;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -67,7 +67,7 @@
                                AdditionalDependencies="intl.lib Ws2_32.lib"\r
                                OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;../../../../dependencies/proxy-libintl-20080418/lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../../../dependencies/win32/proxy-libintl-20080418/lib&quot;"\r
                                ModuleDefinitionFile="../../../glib/glib.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -260,10 +260,6 @@
                                RelativePath="..\..\..\glib\ghook.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\..\glib\gi18n.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\glib\giochannel.c"\r
                                >\r
@@ -434,18 +430,14 @@
                                <File\r
                                        RelativePath="..\..\..\glib\libcharset\localcharset.c"\r
                                        >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="dirent"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\dirent\dirent.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\dirent\wdirent.c"\r
-                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                        </Filter>\r
                        <Filter\r