projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b006f48)
Drop the "win32" part from under "dependencies" so that the same project
authorTor Lillqvist <tml@novell.com>
Mon, 15 Sep 2008 16:04:33 +0000 (16:04 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Mon, 15 Sep 2008 16:04:33 +0000 (16:04 +0000)
2008-09-15  Tor Lillqvist  <tml@novell.com>

* win32/vs8/*.vcproj: Drop the "win32" part from under
"dependencies" so that the same project files can be used also
for 64-bit compilation by just having a different
"dependencies" folder containing 64-bit packages instead. At
least, I hope it will work out some way like that. MSVS
project files really are a pain to maintain. Much information
is typically copied for four different configurations
"Debug|Win32", "Release|Win32", "Debug|x64" and "Release|x64"
instead of having common stuff listed just once and only different
parametrisations. Or am I missing something?

Make the "Release" configuration work, too. Use correct character
set for the gspawn-win32-helper programs. Use correct subsystem
for the non-console one.

svn path=/trunk/; revision=7490

build/ChangeLog patch | blob | history
build/win32/vs8/gio.vcproj patch | blob | history
build/win32/vs8/glib.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 0bea9f3..289e0da 100644 (file)
--- a/build/ChangeLog
+++ b/build/ChangeLog
@@ -13,6 +13,20 @@
        variables that aren't mentioned in glib.symbols. Add G_LOG_DOMAIN
        for gobject.
 
+       Drop the "win32" part from under "dependencies" so that the same
+       project files can be used also for 64-bit compilation by just
+       having a different "dependencies" folder containing 64-bit
+       packages instead. At least, I hope it will work out some way like
+       that. MSVS project files really are a pain to maintain.  Much
+       information is typically copied for four different configurations
+       "Debug|Win32", "Release|Win32", "Debug|x64" and "Release|x64"
+       instead of having common stuff listed just once and only different
+       parametrisations. Or am I missing something?
+       
+       Make the "Release" configuration work, too. Use correct character
+       set for the gspawn-win32-helper programs. Use correct subsystem
+       for the non-console one.
+
 2008-08-27  Tor Lillqvist  <tml@novell.com>
 
        * win32/vs8/*.vcproj: Add "win32" directory level to the
diff --git a/build/win32/vs8/gio.vcproj b/build/win32/vs8/gio.vcproj
index 7edfd06..4aff437 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/win32/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/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
@@ -64,7 +64,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/win32/proxy-libintl-20080418/lib"\r
+                               AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"\r
                                ModuleDefinitionFile="../../../gio/gio.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -121,7 +121,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/win32/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/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
@@ -144,7 +144,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/win32/proxy-libintl-20080418/lib"\r
+                               AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"\r
                                ModuleDefinitionFile="../../../gio/gio.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
diff --git a/build/win32/vs8/glib.vcproj b/build/win32/vs8/glib.vcproj
index 9d26540..2ef7a66 100644 (file)
--- a/build/win32/vs8/glib.vcproj
+++ b/build/win32/vs8/glib.vcproj
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/win32/proxy-libintl-20080418/include&quot;"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;G_DISABLE_DEPRECATED;PCRE_STATIC;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
@@ -66,7 +66,7 @@
                                AdditionalDependencies="intl.lib Ws2_32.lib"\r
                                OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;../../../../dependencies/win32/proxy-libintl-20080418/lib&quot;"\r
+                               AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"\r
                                ModuleDefinitionFile="../../../glib/glib.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -124,7 +124,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/proxy-libintl-20080418/include&quot;"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_DISABLE_DEPRECATED;PCRE_STATIC;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
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -147,7 +147,7 @@
                                AdditionalDependencies="intl.lib Ws2_32.lib"\r
                                OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;../../../../dependencies/proxy-libintl-20080418/lib&quot;"\r
+                               AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"\r
                                ModuleDefinitionFile="../../../glib/glib.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -436,6 +436,14 @@
                                                        PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                        </Filter>\r
                        <Filter\r
diff --git a/build/win32/vs8/gspawn-win32-helper-console.vcproj b/build/win32/vs8/gspawn-win32-helper-console.vcproj
index b1d7dea..5bf95af 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/win32/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -97,7 +97,7 @@
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"\r
                        IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"\r
                        ConfigurationType="1"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -117,7 +117,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/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 6c1cb36..6e34dbc 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/win32/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -97,7 +97,7 @@
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"\r
                        IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"\r
                        ConfigurationType="1"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -117,7 +117,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"\r
+                               AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"\r
                                PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -139,7 +139,7 @@
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
-                               SubSystem="1"\r
+                               SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
Domain: System / Base;