From 404701afad4ecef794f0f3910a05be5e4cbd77b8 Mon Sep 17 00:00:00 2001
From: joost <joost@cnoc.nl>
Date: Sun, 13 Mar 2011 16:26:14 +0000
Subject: [PATCH]  * Removed -Oppentium3 from IDE settings, because that only
 works on i386  * Removed -Ratt from IDE settings (like is done in samplecfg) 
 * Use $fpctarget macro in IDE settings

git-svn-id: trunk@17130 -
---
 utils/fpcmkcfg/fpcfg.inc | 92 +++++++++++++++++++---------------------
 utils/fpcmkcfg/fpinc.cfg | 24 ++++-------
 2 files changed, 52 insertions(+), 64 deletions(-)

diff --git a/utils/fpcmkcfg/fpcfg.inc b/utils/fpcmkcfg/fpcfg.inc
index 935c9c3f8d..bb36f239f4 100644
--- a/utils/fpcmkcfg/fpcfg.inc
+++ b/utils/fpcmkcfg/fpcfg.inc
@@ -1,53 +1,47 @@
 {$ifdef Delphi}
-const fpcfg : array[0..3] of string[240]=(
+const fpcfg : array[0..2] of string[240]=(
 {$else Delphi}
-const fpcfg : array[0..3,1..240] of char=(
+const fpcfg : array[0..2,1..240] of char=(
 {$endif Delphi}
-  '#IFDEF NORMAL'#013#010+
-  ' -Ci'#013#010+
-  ' -XS'#013#010+
-  ' -T%fpctargetos%'#013#010+
-  ' -Sg'#013#010+
-  ' -O1'#013#010+
-  ' -Oppentium3'#013#010+
-  ' -Ratt'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#013#010+
-  ' -g-'#013#010+
-  ' -p-'#013,#010+
-  ' -b-'#013#010+
-  '#ENDIF'#013#010+
-  #013#010+
-  '#IFDEF DEBUG'#013#010+
-  ' -Ci'#013#010+
-  ' -XS'#013#010+
-  ' -T%fpctargetos%'#013#010+
-  ' -Sg'#013#010+
-  ' -Cr'#013#010+
-  ' -Co'#013#010+
-  ' -Oppentium3'#013#010+
-  ' -Ratt'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctarg','etos%\rtl'#013#010+
-  ' -g'#013#010+
-  ' -p-'#013#010+
-  ' -b-'#013#010+
-  '#ENDIF'#013#010+
-  #013#010+
-  '#IFDEF RELEASE'#013#010+
-  ' -XS'#013#010+
-  ' -T%fpctargetos%'#013#010+
-  ' -Sg'#013#010+
-  ' -O2'#013#010+
-  ' -Oppentium3'#013#010+
-  ' -Ratt'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarge','t%-%fpctargetos%\rtl'#013#010+
-  ' -g-'#013#010+
-  ' -p-'#013#010+
-  ' -b-'#013#010+
-  '#ENDIF'#013#010
+  '#IFDEF NORMAL'#010+
+  ' -Ci'#010+
+  ' -XS'#010+
+  ' -T%fpctargetos%'#010+
+  ' -Sg'#010+
+  ' -O1'#010+
+  ' -Fu%basepath%\units\$fpctarget'#010+
+  ' -Fu%basepath%\units\$fpctarget\*'#010+
+  ' -Fu%basepath%\units\$fpctarget\rtl'#010+
+  ' -g-'#010+
+  ' -p-'#010+
+  ' -b-'#010+
+  '#ENDIF'#010+
+  #010+
+  '#IFDEF DEBUG'#010+
+  ' -Ci'#010+
+  ' -XS'#010+
+  ' -T%fpctargetos%'#010+
+  ' -Sg'#010+
+  ' -Cr'#010+
+  ' -Co'#010+
+  ' -Fu%base','path%\units\$fpctarget'#010+
+  ' -Fu%basepath%\units\$fpctarget\*'#010+
+  ' -Fu%basepath%\units\$fpctarget\rtl'#010+
+  ' -g'#010+
+  ' -p-'#010+
+  ' -b-'#010+
+  '#ENDIF'#010+
+  #010+
+  '#IFDEF RELEASE'#010+
+  ' -XS'#010+
+  ' -T%fpctargetos%'#010+
+  ' -Sg'#010+
+  ' -O2'#010+
+  ' -Fu%basepath%\units\$fpctarget'#010+
+  ' -Fu%basepath%\units\$fpctarget\*'#010+
+  ' -Fu%basepat','h%\units\$fpctarget\rtl'#010+
+  ' -g-'#010+
+  ' -p-'#010+
+  ' -b-'#010+
+  '#ENDIF'#010
 );
diff --git a/utils/fpcmkcfg/fpinc.cfg b/utils/fpcmkcfg/fpinc.cfg
index 5ba8b875c3..862a7fa665 100644
--- a/utils/fpcmkcfg/fpinc.cfg
+++ b/utils/fpcmkcfg/fpinc.cfg
@@ -4,11 +4,9 @@
  -T%fpctargetos%
  -Sg
  -O1
- -Oppentium3
- -Ratt
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl
+ -Fu%basepath%\units\$fpctarget
+ -Fu%basepath%\units\$fpctarget\*
+ -Fu%basepath%\units\$fpctarget\rtl
  -g-
  -p-
  -b-
@@ -21,11 +19,9 @@
  -Sg
  -Cr
  -Co
- -Oppentium3
- -Ratt
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl
+ -Fu%basepath%\units\$fpctarget
+ -Fu%basepath%\units\$fpctarget\*
+ -Fu%basepath%\units\$fpctarget\rtl
  -g
  -p-
  -b-
@@ -36,11 +32,9 @@
  -T%fpctargetos%
  -Sg
  -O2
- -Oppentium3
- -Ratt
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl
+ -Fu%basepath%\units\$fpctarget
+ -Fu%basepath%\units\$fpctarget\*
+ -Fu%basepath%\units\$fpctarget\rtl
  -g-
  -p-
  -b-