浏览代码

* darwin: remove some leftover resource-spec structures from i_bsd, clean up some related darwin specific int/ext resource handling in options

git-svn-id: trunk@44455 -
Károly Balogh 5 年之前
父节点
当前提交
8bdcf4273d
共有 3 个文件被更改,包括 2 次插入24 次删除
  1. 1 3
      compiler/options.pas
  2. 0 21
      compiler/systems/i_bsd.pas
  3. 1 0
      compiler/systems/t_darwin.pas

+ 1 - 3
compiler/options.pas

@@ -107,8 +107,7 @@ uses
   llvminfo,
   llvminfo,
 {$endif llvm}
 {$endif llvm}
   dirparse,
   dirparse,
-  pkgutil,
-  i_bsd;
+  pkgutil;
 
 
 const
 const
   page_size = 24;
   page_size = 24;
@@ -2432,7 +2431,6 @@ begin
                       begin
                       begin
                         if (target_info.system in systems_darwin) then
                         if (target_info.system in systems_darwin) then
                           begin
                           begin
-                            RegisterRes(res_macosx_ext_info,TWinLikeResourceFile);
                             set_target_res(res_ext);
                             set_target_res(res_ext);
                             target_info.resobjext:='.fpcres';
                             target_info.resobjext:='.fpcres';
                           end
                           end

+ 0 - 21
compiler/systems/i_bsd.pas

@@ -33,27 +33,6 @@ unit i_bsd;
        systems;
        systems;
 
 
     const
     const
-       res_macho_info : tresinfo =
-           (
-             id     : res_macho;
-             resbin : 'fpcres';
-             rescmd : '-o $OBJ -a $ARCH -s $SUBARCH -of mach-o $DBG';
-             rcbin  : 'windres';
-             rccmd  : '--include $INC -O res -D FPC -o $RES $RC';
-             resourcefileclass : nil;
-             resflags : [];
-           );
-       res_macosx_ext_info : tresinfo =
-          (
-             id     : res_ext;
-             resbin : 'fpcres';
-             rescmd : '-o $OBJ -a $ENDIAN -of external $DBG';
-             rcbin  : 'windres';
-             rccmd  : '--include $INC -O res -D FPC -o $RES $RC';
-             resourcefileclass : nil;
-             resflags : [res_external_file,res_arch_in_file_name];
-          );
-
        system_i386_freebsd_info : tsysteminfo =
        system_i386_freebsd_info : tsysteminfo =
           (
           (
             system       : system_i386_FreeBSD;
             system       : system_i386_FreeBSD;

+ 1 - 0
compiler/systems/t_darwin.pas

@@ -769,5 +769,6 @@ initialization
 {$endif aarch64}
 {$endif aarch64}
 
 
   RegisterRes(res_macho_info,TWinLikeResourceFile);
   RegisterRes(res_macho_info,TWinLikeResourceFile);
+  RegisterRes(res_macosx_ext_info,TWinLikeResourceFile);
 end.
 end.