OCC13817, OCC13143, OCC13648 WOK improvements

diff --git a/src/WOKBuilderDef/LIB.edl b/src/WOKBuilderDef/LIB.edl
index 4179c0bd0588bb0b2636bc3647a34926af318424..4c8adf1adb60eb850d78045cd2a57b7e5425e3dd 100755 (executable)
--- a/src/WOKBuilderDef/LIB.edl
+++ b/src/WOKBuilderDef/LIB.edl
@@ -31,6 +31,10 @@
        $%LIB_ExplibName.exp\^
  @end;
 
+ @template LIB_ManifestFileName ( %LIB_ManifestName ) is
+       $%LIB_ManifestName.manifest\^
+ @end;
+
  @template LIB_LibraryHeaderSTATIC (
                          %CSF_LibraryHeaderLib ,
                          %CSF_LibraryHeaderOpt ,
@@ -42,6 +46,10 @@
        $%CollectorOutput.exp\^
  @end;
 
+ @template LIB_LibraryMAN ( %CollectorOutput ) is
+       $%CollectorOutput.manifest\^
+ @end;
+ 
  @template LIB_LibraryHeaderIMPORT ( 
                          %CSF_LibraryHeaderLib ,
                          %CSF_LibraryHeaderOpt ,

diff --git a/src/WOKBuilderDef/LINK.edl b/src/WOKBuilderDef/LINK.edl
index 21ab9acd7c4185c240b25aba4ad3943b472d3612..111554e1c245a9c919c9111d26eaf0ea796a9889 100755 (executable)
--- a/src/WOKBuilderDef/LINK.edl
+++ b/src/WOKBuilderDef/LINK.edl
@@ -53,6 +53,14 @@
        $%CollectorOutput.exp\^
  @end;
 
+ @template LINK_DLLMAN ( %CollectorOutput ) is
+       $%CollectorOutput.dll.manifest\^
+ @end;
+
+ @template LINK_EXEMAN ( %CollectorOutput ) is
+       $%CollectorOutput.exe.manifest\^
+ @end;
+
  @template LINK_LinkerDLL ( %CollectorOutput ) is
        $%CollectorOutput.dll\^
  @end;