Explorar o código

compiler, utils: pass tlb resources to fpcres

git-svn-id: trunk@15002 -
paul %!s(int64=15) %!d(string=hai) anos
pai
achega
3cd29858ba
Modificáronse 2 ficheiros con 4 adicións e 4 borrados
  1. 3 3
      compiler/comprsrc.pas
  2. 1 1
      utils/fpcres/fpcres.pas

+ 3 - 3
compiler/comprsrc.pas

@@ -320,7 +320,7 @@ const
   ResSignature : array [1..32] of byte =
   ResSignature : array [1..32] of byte =
   ($00,$00,$00,$00,$20,$00,$00,$00,$FF,$FF,$00,$00,$FF,$FF,$00,$00,
   ($00,$00,$00,$00,$20,$00,$00,$00,$FF,$FF,$00,$00,$FF,$FF,$00,$00,
    $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00);
    $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00);
-  dfmexts : array[1..3] of string[4] = ('.lfm', '.dfm', '.xfm');
+  knownexts : array[1..4] of string[4] = ('.lfm', '.dfm', '.xfm', '.tlb');
 var
 var
   f : file;
   f : file;
   oldfmode : byte;
   oldfmode : byte;
@@ -331,9 +331,9 @@ begin
   ext:=lower(ExtractFileExt(fn));
   ext:=lower(ExtractFileExt(fn));
   Result:=CompareText(ext, target_info.resext) = 0;
   Result:=CompareText(ext, target_info.resext) = 0;
   if not Result then
   if not Result then
-    for i:=1 to high(dfmexts) do
+    for i:=1 to high(knownexts) do
     begin
     begin
-      Result:=CompareText(ext, dfmexts[i]) = 0;
+      Result:=CompareText(ext, knownexts[i]) = 0;
       if Result then break;
       if Result then break;
     end;
     end;
 
 

+ 1 - 1
utils/fpcres/fpcres.pas

@@ -23,7 +23,7 @@ uses
   closablefilestream, resource,
   closablefilestream, resource,
 //readers
 //readers
   resreader, coffreader, winpeimagereader, elfreader, machoreader,
   resreader, coffreader, winpeimagereader, elfreader, machoreader,
-  externalreader, dfmreader,
+  externalreader, dfmreader, tlbreader,
 //writers
 //writers
   reswriter, coffwriter, elfwriter, machowriter, externalwriter,
   reswriter, coffwriter, elfwriter, machowriter, externalwriter,
 //misc
 //misc