From f8ff8eca4da9271c82d6acca037e6b01f64b89b5 Mon Sep 17 00:00:00 2001
From: svenbarth <pascaldragon@googlemail.com>
Date: Sun, 12 Jun 2016 10:57:15 +0000
Subject: [PATCH] Fix non-Windows resources since me and merging without
 TortoiseSVN don't go along that well :/

rtl/inc/system.inc:
  + ResHeader variable that provides the public _FPC_ResLocation symbol used by intres.inc; this variable will always be available and without indirect entry information it will simply hook up to FPC_RESLOCATION itself
  * SetupEntryInformation: setup FPCResLocation
rtl/inc/intres.inc:
  * no need to cater for indirect entry or not anymore

git-svn-id: trunk@33964 -
---
 rtl/inc/intres.inc | 5 -----
 rtl/inc/system.inc | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/rtl/inc/intres.inc b/rtl/inc/intres.inc
index ddd1dcf8f8..10efe8728c 100644
--- a/rtl/inc/intres.inc
+++ b/rtl/inc/intres.inc
@@ -34,12 +34,7 @@ type
 
 var
 {$ifdef FPC_HAS_WINLIKERESOURCES}
-{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
   ResHeader : PPResHdr; external name '_FPC_ResLocation';
-{$else}
-  ResHeaderVar : PResHdr; external name 'FPC_RESLOCATION';
-  ResHeader : PPResHdr = @ResHeaderVar;
-{$endif}
 {$else}
   ResHeaderVar : PResHdr = nil;
   ResHeader : PPResHdr= @ResHeaderVar;
diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc
index f7e8517a2d..84261264cb 100644
--- a/rtl/inc/system.inc
+++ b/rtl/inc/system.inc
@@ -111,6 +111,7 @@ var
   FPCResStrInitTables : Pointer;public name '_FPC_ResStrInitTables';
 {$endif FPC_HAS_RESSTRINITS}
   FPCResourceStringTables : Pointer;public name '_FPC_ResourceStringTables';
+  FPCResLocation : Pointer;public name'_FPC_ResLocation';
 {$else FPC_HAS_INDIRECT_ENTRY_INFORMATION}
 {$ifdef FPC_HAS_RESSTRINITS}
   FPCResStrInitTablesVar : record end; external name 'FPC_RESSTRINITTABLES';
@@ -118,6 +119,12 @@ var
 {$endif FPC_HAS_RESSTRINITS}
   FPCResourceStringTablesVar : record end; External Name 'FPC_RESOURCESTRINGTABLES';
   FPCResourceStringTables : Pointer = @FPCResourceStringTablesVar;public name '_FPC_ResourceStringTables';
+{$ifdef FPC_HAS_WINLIKERESOURCES}
+  FPCResLocationVar: record end; external name 'FPC_RESLOCATION';
+{$else FPC_HAS_WINLIKERESOURCES}
+  FPCResLocationVar : Pointer = Nil;
+{$endif FPC_HAS_WINLIKERESOURCES}
+  FPCResLocation : Pointer = @FPCResLocationVar;public name '_FPC_ResLocation';
 {$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
 
 {$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
@@ -126,6 +133,7 @@ begin
   EntryInformation := info;
   FPCResStrInitTables := info.ResStrInitTables;
   FPCResourceStringTables := info.ResourceStringTables;
+  FPCResLocation := info.ResLocation;
 {$ifdef FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION}
   OSSetupEntryInformation(info);
 {$endif FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION}