浏览代码

+ Fixed bootstrap problem for resources

git-svn-id: trunk@1013 -
michael 20 年之前
父节点
当前提交
7184d30fc1
共有 2 个文件被更改,包括 5 次插入0 次删除
  1. 1 0
      compiler/options.pas
  2. 4 0
      rtl/inc/elfres32.inc

+ 1 - 0
compiler/options.pas

@@ -1829,6 +1829,7 @@ begin
   def_system_macro('FPC_HAS_TYPE_EXTENDED');
   def_system_macro('FPC_HAS_TYPE_EXTENDED');
   def_system_macro('FPC_HAS_TYPE_DOUBLE');
   def_system_macro('FPC_HAS_TYPE_DOUBLE');
   def_system_macro('FPC_HAS_TYPE_SINGLE');
   def_system_macro('FPC_HAS_TYPE_SINGLE');
+  def_system_macro('FPC_HAS_RESOURCES');
 {$endif}
 {$endif}
 {$ifdef m68k}
 {$ifdef m68k}
   def_system_macro('CPU68K');
   def_system_macro('CPU68K');

+ 4 - 0
rtl/inc/elfres32.inc

@@ -41,7 +41,11 @@ type
 
 
 Var
 Var
   InitRes : Boolean = False;
   InitRes : Boolean = False;
+{$ifdef FPC_HAS_RESOURCES}
   FPCResourceSectionLocation : pFPCResourceSectionTable; external name 'FPC_RESLOCATION';
   FPCResourceSectionLocation : pFPCResourceSectionTable; external name 'FPC_RESLOCATION';
+{$else}
+  FPCResourceSectionLocation : pFPCResourceSectionTable = Nil;
+{$endif}
   FPCRuntimeResourceInfoArray : PFPCRuntimeResourceInfo;
   FPCRuntimeResourceInfoArray : PFPCRuntimeResourceInfo;
   ResInfoCount : Cardinal;
   ResInfoCount : Cardinal;