glib r7490 - in trunk/build: . win32/vs8
- From: tml svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r7490 - in trunk/build: . win32/vs8
- Date: Mon, 15 Sep 2008 16:04:33 +0000 (UTC)
Author: tml
Date: Mon Sep 15 16:04:33 2008
New Revision: 7490
URL: http://svn.gnome.org/viewvc/glib?rev=7490&view=rev
Log:
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.
Modified:
trunk/build/ChangeLog
trunk/build/win32/vs8/gio.vcproj
trunk/build/win32/vs8/glib.vcproj
trunk/build/win32/vs8/gspawn-win32-helper-console.vcproj
trunk/build/win32/vs8/gspawn-win32-helper.vcproj
Modified: trunk/build/win32/vs8/gio.vcproj
==============================================================================
--- trunk/build/win32/vs8/gio.vcproj (original)
+++ trunk/build/win32/vs8/gio.vcproj Mon Sep 15 16:04:33 2008
@@ -39,7 +39,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/win32/proxy-libintl-20080418/include"
+ AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/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"
@@ -64,7 +64,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
+ AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../gio/gio.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -121,7 +121,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/win32/proxy-libintl-20080418/include"
+ AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/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"
@@ -144,7 +144,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
+ AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../gio/gio.def"
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/build/win32/vs8/glib.vcproj
==============================================================================
--- trunk/build/win32/vs8/glib.vcproj (original)
+++ trunk/build/win32/vs8/glib.vcproj Mon Sep 15 16:04:33 2008
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../..;../dirent;../../../glib;"../../../../dependencies/win32/proxy-libintl-20080418/include""
+ AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\"Glib\";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"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -66,7 +66,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories=""../../../../dependencies/win32/proxy-libintl-20080418/lib""
+ AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../glib/glib.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..;../dirent;../../../glib;"../../../../dependencies/proxy-libintl-20080418/include""
+ AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\"Glib\";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"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -147,7 +147,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""../../../../dependencies/proxy-libintl-20080418/lib""
+ AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../glib/glib.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -436,6 +436,14 @@
PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
Modified: trunk/build/win32/vs8/gspawn-win32-helper-console.vcproj
==============================================================================
--- trunk/build/win32/vs8/gspawn-win32-helper-console.vcproj (original)
+++ trunk/build/win32/vs8/gspawn-win32-helper-console.vcproj Mon Sep 15 16:04:33 2008
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
+ AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -97,7 +97,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -117,7 +117,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
+ AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Modified: trunk/build/win32/vs8/gspawn-win32-helper.vcproj
==============================================================================
--- trunk/build/win32/vs8/gspawn-win32-helper.vcproj (original)
+++ trunk/build/win32/vs8/gspawn-win32-helper.vcproj Mon Sep 15 16:04:33 2008
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
+ AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -97,7 +97,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -117,7 +117,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/win32/proxy-libintl-20080418/include"
+ AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -139,7 +139,7 @@
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
- SubSystem="1"
+ SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
