Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-07 06:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

-Fix unnecessary msi builds, this time for real! msi module was referencing the module 'msi_msiserver_typelib' expecting (OUTPUT)msi_msiserver_typelib.tlb to be build inset of (INTERMEDIATE)msiserver.tlb (the actual generated file). As a result the file was never created and make was trying to recreate it on every build. mystery solved :) (part 1/2)

Browse source 
svn path=/trunk/; revision=33322
This commit is contained in:
Marc Piulachs 2008-05-06 14:42:49 +00:00
parent f540600448
commit 880e173654
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1340,7 +1340,7 @@ Rule widlProxyRule ( "$(source): ${$(module_name)_precondition}\n"
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n"
"$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
"\t$(ECHO_WIDL)\n"
"\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)\n",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );

2
reactos/tools/rbuild/module.cpp
View file

@ -970,10 +970,10 @@ Module::GetTargetDirectoryTree () const
case LiveIso:
case IsoRegTest:
case LiveIsoRegTest:
case EmbeddedTypeLib:
case ElfExecutable:
case Cabinet:
return OutputDirectory;
case EmbeddedTypeLib:
case StaticLibrary:
case HostStaticLibrary:
case ObjectLibrary: