luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop the "win32" part from under "dependencies" so that the same project

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2008-09-15 16:04:33 +00:00 committed by Tor Lillqvist
parent b006f4832f
commit 4b92cd39fd
5 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/ChangeLog
View File

@ -13,6 +13,20 @@
variables that aren't mentioned in glib.symbols. Add G_LOG_DOMAIN variables that aren't mentioned in glib.symbols. Add G_LOG_DOMAIN
for gobject. 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> 2008-08-27 Tor Lillqvist <tml@novell.com>
* win32/vs8/*.vcproj: Add "win32" directory level to the * win32/vs8/*.vcproj: Add "win32" directory level to the

8
build/win32/vs8/gio.vcproj
View File

@ -39,7 +39,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" 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=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -64,7 +64,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib" AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll" OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib" AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../gio/gio.def" ModuleDefinitionFile="../../../gio/gio.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -121,7 +121,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" 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=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -144,7 +144,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib" AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll" OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib" AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../gio/gio.def" ModuleDefinitionFile="../../../gio/gio.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"

16
build/win32/vs8/glib.vcproj
View File

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/win32/proxy-libintl-20080418/include&quot;" AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
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" 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"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -66,7 +66,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib" AdditionalDependencies="intl.lib Ws2_32.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll" OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;../../../../dependencies/win32/proxy-libintl-20080418/lib&quot;" AdditionalLibraryDirectories="../../../../dependencies/win32/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../glib/glib.def" ModuleDefinitionFile="../../../glib/glib.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -124,7 +124,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../..;../dirent;../../../glib;&quot;../../../../dependencies/proxy-libintl-20080418/include&quot;" AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
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" 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"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -147,7 +147,7 @@
AdditionalDependencies="intl.lib Ws2_32.lib" AdditionalDependencies="intl.lib Ws2_32.lib"
OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll" OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;../../../../dependencies/proxy-libintl-20080418/lib&quot;" AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
ModuleDefinitionFile="../../../glib/glib.def" ModuleDefinitionFile="../../../glib/glib.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -436,6 +436,14 @@
PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;" PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter <Filter

6
build/win32/vs8/gspawn-win32-helper-console.vcproj
View File

@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" 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" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -97,7 +97,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin" OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj" IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
@ -117,7 +117,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" 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" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

8
build/win32/vs8/gspawn-win32-helper.vcproj
View File

@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" 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" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -97,7 +97,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin" OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj" IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="2"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
<Tool <Tool
@ -117,7 +117,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" 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" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -139,7 +139,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"