Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

modified tools/rbuild/backend/mingw/modulehandler.cpp

Browse source 
Allow static libraries to "link" to other static libraries
   Removed some dead code

modified   dll/nls/normaliz_redist/normaliz_redist.rbuild
modified   dll/win32/kernel32/kernel32.rbuild
   No need to specify icu4ros explicitely anymore, thanks to the rbuild changes
   Make kernel32_base include normalize, rather than linking it as an external dependency of kernel32

svn path=/trunk/; revision=36929
This commit is contained in:
KJK::Hyperion 2008-10-25 02:52:24 +00:00
parent f258a9cc26
commit 7661ad3e1c
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
View file

@ -7,7 +7,6 @@
<module name="normaliz_redist" type="win32dll" installname="normaliz_redist.dll">
<library>normalize</library>
<library>idna</library>
<library>icu4ros</library>
<library>normaliz_redist_data</library>
<library>libcntpr</library>
<library>kernel32</library>

5
reactos/dll/win32/kernel32/kernel32.rbuild
View file

@ -120,6 +120,8 @@
</directory>
</if>
</directory>
<library>normalize</library>
</module>
<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll">
<importlibrary definition="kernel32.def" />
@ -134,9 +136,6 @@
<file>kernel32.rc</file>
<library>normalize</library>
<library>icu4ros</library>
<library>ntdll</library>
</module>
</group>

14
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -347,6 +347,18 @@ MingwModuleHandler::GetImportLibraryDependency (
dep = backend->GetFullName ( *library_target );
delete library_target;
}
if ( IsStaticLibrary ( importedModule ) || importedModule.type == ObjectLibrary )
{
const std::vector<Library*>& libraries = importedModule.non_if_data.libraries;
for ( size_t i = 0; i < libraries.size (); ++ i )
{
dep += " ";
dep += GetImportLibraryDependency ( *libraries[i]->importedModule );
}
}
return dep;
}
@ -2891,7 +2903,6 @@ MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
CLEAN_FILE ( junk_tmp );
string objectsMacro = GetObjectsMacro ( module );
string linkDepsMacro = GetLinkingDependenciesMacro ();
string libsMacro = GetLibsMacro ();
GenerateRules ();
@ -2968,7 +2979,6 @@ MingwBootProgramModuleHandler::GenerateBootProgramModuleTarget ()
CLEAN_FILE ( junk_cpy );
string objectsMacro = GetObjectsMacro ( module );
string linkDepsMacro = GetLinkingDependenciesMacro ();
string libsMacro = GetLibsMacro ();
const Module *payload = module.project.LocateModule ( module.payload );
GenerateRules ();