From b6a96ef4b3a2d64f8b3ba558e6e25614339ee4ce Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 16 Jun 2005 21:19:00 +0000 Subject: [PATCH] - removed wrong paths using $1 git-svn-id: trunk@431 - --- compiler/utils/fpc.cft | 6 - compiler/utils/fpccfg.inc | 429 +++++++++++++++++++------------------- 2 files changed, 213 insertions(+), 222 deletions(-) diff --git a/compiler/utils/fpc.cft b/compiler/utils/fpc.cft index 5b955e40c1..e858c909c4 100644 --- a/compiler/utils/fpc.cft +++ b/compiler/utils/fpc.cft @@ -133,12 +133,6 @@ # searchpath for includefiles #-Fi/pp/inc;/pp/rtl/inc -# searchpath for units and other system dependent things --Fu$1/units/\$fpctarget --Fu$1/units/\$fpctarget/* --Fu$1/units/\$fpctarget/rtl -#-Fu~/fpc/packages/base/*/units/$fpctarget;~/fpc/fcll/units/$fpctarget;~/fpc/rtl/units/$fpctarget - # searchpath for includefiles # release them only if you know what you do # because this could cause a rebuild of the runtime library diff --git a/compiler/utils/fpccfg.inc b/compiler/utils/fpccfg.inc index 63661ad6fb..103f32ab70 100644 --- a/compiler/utils/fpccfg.inc +++ b/compiler/utils/fpccfg.inc @@ -3,225 +3,222 @@ const DefaultConfig : array[0..24] of string[240]=( {$else Delphi} const DefaultConfig : array[0..24,1..240] of char=( {$endif Delphi} - '#'#010+ - '# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#010+ - '# Example fpc.cfg for Free Pascal Compiler'#010+ - '#'#010+ - #010+ - '# ----------------------'#010+ - '# Defines (preprocessor)'#010+ - '# ----------------------'#010+ - #010+ - '#'#010+ - '# nested #IFNDEF, #IFDEF, #ENDIF, #ELSE, #DEFINE,',' #UNDEF are allowed'+ - #010+ - '#'#010+ - '# -d is the same as #DEFINE'#010+ - '# -u is the same as #UNDEF'#010+ - '#'#010+ - #010+ - '#'#010+ - '# Some examples (for switches see below, and the -? helppages)'#010+ - '#'#010+ - '# Try compiling with the -dRELEASE or -dDEBUG on the commandline'#010+ - '#'#010+ - #010+ - '# For a release compile w','ith optimizes and strip debuginfo'#010+ - '#IFDEF RELEASE'#010+ - ' -OG2p3'#010+ - ' -Xs'#010+ - ' #WRITE Compiling Release Version'#010+ - '#ENDIF'#010+ - #010+ + '#'#013#010+ + '# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#013#010+ + '# Example fpc.cfg for Free Pascal Compiler'#013#010+ + '#'#013#010+ + #013#010+ + '# ----------------------'#013#010+ + '# Defines (preprocessor)'#013#010+ + '# ----------------------'#013#010+ + #013#010+ + '#'#013#010+ + '# nested #IFNDEF, #IFDEF, #ENDIF, #ELSE',', #DEFINE, #UNDEF are allowed'+ + #013#010+ + '#'#013#010+ + '# -d is the same as #DEFINE'#013#010+ + '# -u is the same as #UNDEF'#013#010+ + '#'#013#010+ + #013#010+ + '#'#013#010+ + '# Some examples (for switches see below, and the -? helppages)'#013#010+ + '#'#013#010+ + '# Try compiling with the -dRELEASE or -dDEBUG on the commandline'#013#010+ + '#'#013#010+ + #013#010+ + '# F','or a release compile with optimizes and strip debuginfo'#013#010+ + '#IFDEF RELEASE'#013#010+ + ' -OG2p3'#013#010+ + ' -Xs'#013#010+ + ' #WRITE Compiling Release Version'#013#010+ + '#ENDIF'#013#010+ + #013#010+ '# For a debug version compile with debuginfo and all codegeneration ch'+ - 'ecks on'#010+ - '#IFDEF DEBUG'#010+ - ' -g'#010+ - ' -Crtoi'#010+ - ' #WRITE Compiling Debug Ver','sion'#010+ - '#ENDIF'#010+ - #010+ - '# ----------------'#010+ - '# Parsing switches'#010+ - '# ----------------'#010+ - #010+ - '# Pascal language mode'#010+ - '# -Mfpc free pascal dialect (default)'#010+ - '# -Mobjfpc switch some Delphi 2 extensions on'#010+ - '# -Mdelphi tries to be Delphi compatib','le'#010+ - '# -Mtp tries to be TP/BP 7.0 compatible'#010+ - '# -Mgpc tries to be gpc compatible'#010+ + 'ecks on'#013#010+ + '#IFDEF DEBUG'#013#010+ + ' -g'#013#010+ + ' -Cr','toi'#013#010+ + ' #WRITE Compiling Debug Version'#013#010+ + '#ENDIF'#013#010+ + #013#010+ + '# ----------------'#013#010+ + '# Parsing switches'#013#010+ + '# ----------------'#013#010+ + #013#010+ + '# Pascal language mode'#013#010+ + '# -Mfpc free pascal dialect (default)'#013#010+ + '# -Mobjfpc switch some Delphi 2 extensions on'#013#010+ + '# ',' -Mdelphi tries to be Delphi compatible'#013#010+ + '# -Mtp tries to be TP/BP 7.0 compatible'#013#010+ + '# -Mgpc tries to be gpc compatible'#013#010+ '# -Mmacpas tries to be compatible to the macintosh pascal diale'+ - 'cts'#010+ - '#'#010+ - '# Turn on Object Pascal extensions by default'#010+ - '#-Mobjfpc'#010+ + 'cts'#013#010+ + '#'#013#010+ + '# Turn on Object ','Pascal extensions by default'#013#010+ + '#-Mobjfpc'#013#010+ + #013#010+ + '# Assembler reader mode'#013#010+ + '# -Rdefault use default assembler'#013#010+ + '# -Ratt read AT&T style assembler'#013#010+ + '# -Rintel read Intel style assembler'#013#010+ + '#'#013#010+ + '# All assembler blocks are AT&T style','d by default'#013#010+ + '#-Ratt'#013#010+ + #013#010+ + '# Semantic checking'#013#010+ + '# -S2 same as -Mobjfpc'#013#010+ + '# -Sc supports operators like C (*=,+=,/= and -=)'#013#010+ + '# -Sa include assertion code.'#013#010+ + '# -Sd same as -Mdelphi'#013#010+ + '# -Se ',' compiler stops after the errors (default is 1)'+ + #013#010+ + '# -Sg allow LABEL and GOTO'#013#010+ + '# -Sh Use ansistrings'#013#010+ + '# -Si support C++ styled INLINE'#013#010+ + '# -SI set interface style to '#013#010+ + '# -SIcomCOM c','ompatible interface (default)'#013#010+ + '# -SIcorbaCORBA compatible interface'#013#010+ + '# -Sm support macros like C (global)'#013#010+ + '# -So same as -Mtp'#013#010+ + '# -Sp same as -Mgpc'#013#010+ + '# -Ss constructor name must be init ','(destructor must be '+ + 'done)'#013#010+ + '# -St allow static keyword in objects'#013#010+ + '#'#013#010+ + '# Allow goto, inline, C-operators, C-vars'#013#010+ + '-Sgic'#013#010+ + #013#010+ + '# ---------------'#013#010+ + '# Code generation'#013#010+ + '# ---------------'#013#010+ + #013#010+ + '# Uncomment the next line if you always want sta','tic/dynamic units by'+ + ' default'#013#010+ + '# (can be overruled with -CD, -CS at the commandline)'#013#010+ + '#-CS'#013#010+ + '#-CD'#013#010+ + #013#010+ + '# Set the default heapsize to 8Mb'#013#010+ + '#-Ch8000000'#013#010+ + #013#010+ + '# Set default codegeneration checks (iocheck, overflow, range, stack)'#013+ #010+ - '# Assemb','ler reader mode'#010+ - '# -Rdefault use default assembler'#010+ - '# -Ratt read AT&T style assembler'#010+ - '# -Rintel read Intel style assembler'#010+ - '#'#010+ - '# All assembler blocks are AT&T styled by default'#010+ - '#-Ratt'#010+ + '#-Ci'#013#010+ + '#-Co'#013#010+ + '#-Cr'#013#010+ + '#-','Ct'#013#010+ + #013#010+ + '# Optimizer switches for i386 compiler'#013#010+ + '# -Og generate smaller code'#013#010+ + '# -OG generate faster code (default)'#013#010+ + '# -Or keep certain variables in registers (still BUGGY!!!)'#013#010+ + '# -Ou enable uncertain optimizations (s','ee docs)'#013#010+ + '# -O1 level 1 optimizations (quick optimizations)'#013#010+ + '# -O2 level 2 optimizations (-O1 + slower optimizations)'#013#010+ + '# -O3 level 3 optimizations (same as -O2u)'#013#010+ + '# -Op target processor'#013#010+ + '# -Op1 set target pr','ocessor to 386/486'#013#010+ + '# -Op2 set target processor to Pentium/PentiumMMX (tm)'#013#010+ + '# -Op3 set target processor to PPro/PII/c6x86/K6 (tm)'#013#010+ + #013#010+ + '# Optimize always for Size and PII'#013#010+ + '#-OG2p3'#013#010+ + #013#010+ + #013#010+ + '# -----------------------'#013#010+ + '# Set Filenames and P','aths'#013#010+ + '# -----------------------'#013#010+ + #013#010+ + '# Both slashes and backslashes are allowed in paths'#013#010+ + #013#010+ + '# path to the messagefile, not necessary anymore but can be used to ov'+ + 'erride'#013#010+ + '# the default language'#013#010+ + '#-Fr%basepath%/msg/errore.msg'#013#010+ + '#-Fr%basepath%/ms','g/errorn.msg'#013#010+ + '#-Fr%basepath%/msg/errores.msg'#013#010+ + '#-Fr%basepath%/msg/errord.msg'#013#010+ + '#-Fr%basepath%/msg/errorr.msg'#013#010+ + #013#010+ + '# path to the gcclib'#013#010+ + '#-Fl%basepath%/lib'#013#010+ + #013#010+ + '# searchpath for includefiles'#013#010+ + '#-Fi/pp/inc;/pp/rtl/inc'#013#010+ + #013#010+ + '# searchpath for includefile','s'#013#010+ + '# release them only if you know what you do'#013#010+ + '# because this could cause a rebuild of the runtime library'#013#010+ + '# if you tell them compiler/ide to build the project (FK)'#013#010+ + '#-Fi%basepath%/source/rtl/inc;%basepath%/source/rtl/i386'#013#010+ + #013#010+ + '# searchpath',' for objectfiles'#013#010+ + '#-Fo%basepath%/source/rtl/inc;%basepath%/source/rtl/i386'#013#010+ + #013#010+ + '# searchpath for units and other system dependent things'#013#010+ + '-Fu%basepath%/units/$FPCTARGET/'#013#010+ + '-Fu%basepath%/units/$FPCTARGET/*'#013#010+ + '-Fu%basepath%/units/$FPCTARGET/rtl'#013#010+ + #013,#010+ + '# searchpath for libraries'#013#010+ + '#-Fl%basepath%/lib'#013#010+ + '#-Fl/lib;/usr/lib'#013#010+ + #013#010+ + '# searchpath for tools'#013#010+ + '-FD%basepath%/bin/$FPCTARGET'#013#010+ + #013#010+ + #013#010+ + '# -------------'#013#010+ + '# Linking'#013#010+ + '# -------------'#013#010+ + #013#010+ + '# generate always debugging information for GDB (slows down the c','omp'+ + 'iling'#013#010+ + '# process)'#013#010+ + '# -gc generate checks for pointers'#013#010+ + '# -gd use dbx'#013#010+ + '# -gg use gsym'#013#010+ + '# -gh use heap trace unit (for memory leak debugging)'#013#010+ + '# -gl use line info unit to show mor','e info for backtrace'+ + 's'#013#010+ + '# -gv generates programs tracable with valgrind'#013#010+ + '# -gw generate dwarf debugging info'#013#010+ + '#'#013#010+ + '# Enable debuginfo and use the line info unit by default'#013#010+ + '#-gl'#013#010+ + #013#010+ + '# always pass an option to the linker'#013,#010+ + '#-k-s'#013#010+ + #013#010+ + '# Always strip debuginfo from the executable'#013#010+ + '-Xs'#013#010+ + #013#010+ + #013#010+ + '# -------------'#013#010+ + '# Miscellaneous'#013#010+ + '# -------------'#013#010+ + #013#010+ + '# Write always a nice FPC logo ;)'#013#010+ + '-l'#013#010+ + #013#010+ + '# Verbosity'#013#010+ + '# e : Show errors (default) d : Show debug info'#013#010+ + '# w',' : Show warnings u : Show unit info'#013#010+ + '# n : Show notes t : Show tried/used files'#013#010+ + '# h : Show hints m : Show defined macros'#013#010+ + '# i : Show general info p : Show compiled pr','ocedures'#013+ #010+ - '# Semantic checking'#010+ - '# -S2 ',' same as -Mobjfpc'#010+ - '# -Sc supports operators like C (*=,+=,/= and -=)'#010+ - '# -Sa include assertion code.'#010+ - '# -Sd same as -Mdelphi'#010+ - '# -Se compiler stops after the errors (default is 1)'#010+ - '# -Sg ',' allow LABEL and GOTO'#010+ - '# -Sh Use ansistrings'#010+ - '# -Si support C++ styled INLINE'#010+ - '# -SI set interface style to '#010+ - '# -SIcomCOM compatible interface (default)'#010+ - '# -SIcorbaCORBA compatible inte','rface'#010+ - '# -Sm support macros like C (global)'#010+ - '# -So same as -Mtp'#010+ - '# -Sp same as -Mgpc'#010+ - '# -Ss constructor name must be init (destructor must be do'+ - 'ne)'#010+ - '# -St allow static keyword in object','s'#010+ - '#'#010+ - '# Allow goto, inline, C-operators, C-vars'#010+ - '-Sgic'#010+ - #010+ - '# ---------------'#010+ - '# Code generation'#010+ - '# ---------------'#010+ - #010+ - '# Uncomment the next line if you always want static/dynamic units by d'+ - 'efault'#010+ - '# (can be overruled with -CD, -CS at the commandline)'#010+ - '#','-CS'#010+ - '#-CD'#010+ - #010+ - '# Set the default heapsize to 8Mb'#010+ - '#-Ch8000000'#010+ - #010+ - '# Set default codegeneration checks (iocheck, overflow, range, stack)'#010+ - '#-Ci'#010+ - '#-Co'#010+ - '#-Cr'#010+ - '#-Ct'#010+ - #010+ - '# Optimizer switches for i386 compiler'#010+ - '# -Og generate smaller code'#010+ - '# -OG gener','ate faster code (default)'#010+ - '# -Or keep certain variables in registers (still BUGGY!!!)'#010+ - '# -Ou enable uncertain optimizations (see docs)'#010+ - '# -O1 level 1 optimizations (quick optimizations)'#010+ - '# -O2 level 2 optimizations (','-O1 + slower optimizations)'#010+ - '# -O3 level 3 optimizations (same as -O2u)'#010+ - '# -Op target processor'#010+ - '# -Op1 set target processor to 386/486'#010+ - '# -Op2 set target processor to Pentium/PentiumMMX (tm)'#010+ - '# -Op3 set target proce','ssor to PPro/PII/c6x86/K6 (tm)'#010+ - #010+ - '# Optimize always for Size and PII'#010+ - '#-OG2p3'#010+ - #010+ - #010+ - '# -----------------------'#010+ - '# Set Filenames and Paths'#010+ - '# -----------------------'#010+ - #010+ - '# Both slashes and backslashes are allowed in paths'#010+ - #010+ - '# path to the messagefile, not ','necessary anymore but can be used to '+ - 'override'#010+ - '# the default language'#010+ - '#-Fr%basepath%/msg/errore.msg'#010+ - '#-Fr%basepath%/msg/errorn.msg'#010+ - '#-Fr%basepath%/msg/errores.msg'#010+ - '#-Fr%basepath%/msg/errord.msg'#010+ - '#-Fr%basepath%/msg/errorr.msg'#010+ - #010+ - '# path to the gccli','b'#010+ - '#-Fl%basepath%/lib'#010+ - #010+ - '# searchpath for includefiles'#010+ - '#-Fi/pp/inc;/pp/rtl/inc'#010+ - #010+ - '# searchpath for units and other system dependent things'#010+ - '-Fu$1/units/\$fpctarget'#010+ - '-Fu$1/units/\$fpctarget/*'#010+ - '-Fu$1/units/\$fpctarget/rtl'#010+ - '#-Fu~/fpc/packages/base/*/un','its/$fpctarget;~/fpc/fcll/units/$fpctarg'+ - 'et;~/fpc/rtl/units/$fpctarget'#010+ - #010+ - '# searchpath for includefiles'#010+ - '# release them only if you know what you do'#010+ - '# because this could cause a rebuild of the runtime library'#010+ - '# if you tell them compiler/ide to ','build the project (FK)'#010+ - '#-Fi%basepath%/source/rtl/inc;%basepath%/source/rtl/i386'#010+ - #010+ - '# searchpath for objectfiles'#010+ - '#-Fo%basepath%/source/rtl/inc;%basepath%/source/rtl/i386'#010+ - #010+ - '# searchpath for units and other system dependent things'#010+ - '-Fu%basepath%/u','nits/$FPCTARGET/'#010+ - '-Fu%basepath%/units/$FPCTARGET/*'#010+ - '-Fu%basepath%/units/$FPCTARGET/rtl'#010+ - #010+ - '# searchpath for libraries'#010+ - '#-Fl%basepath%/lib'#010+ - '#-Fl/lib;/usr/lib'#010+ - #010+ - '# searchpath for tools'#010+ - '-FD%basepath%/bin/$FPCTARGET'#010+ - #010+ - #010+ - '# -------------'#010+ - '# Linking'#010+ - '# -------','------'#010+ - #010+ - '# generate always debugging information for GDB (slows down the compil'+ - 'ing'#010+ - '# process)'#010+ - '# -gc generate checks for pointers'#010+ - '# -gd use dbx'#010+ - '# -gg use gsym'#010+ - '# -gh use heap trace unit (for memo','ry leak debugging)'#010+ - '# -gl use line info unit to show more info for backtraces'#010+ - '# -gv generates programs tracable with valgrind'#010+ - '# -gw generate dwarf debugging info'#010+ - '#'#010+ - '# Enable debuginfo and use the line info ','unit by default'#010+ - '#-gl'#010+ - #010+ - '# always pass an option to the linker'#010+ - '#-k-s'#010+ - #010+ - '# Always strip debuginfo from the executable'#010+ - '-Xs'#010+ - #010+ - #010+ - '# -------------'#010+ - '# Miscellaneous'#010+ - '# -------------'#010+ - #010+ - '# Write always a nice FPC logo ;)'#010+ - '-l'#010+ - #010+ - '# Verbosity'#010+ - '# e : Show errors ','(default) d : Show debug info'#010+ - '# w : Show warnings u : Show unit info'#010+ - '# n : Show notes t : Show tried/used files'#010+ - '# h : Show hints m : Show defined macros'#010+ - '# i : Show ge','neral info p : Show compiled procedures'#010+ - '# l : Show linenumbers c : Show conditionals'#010+ + '# l : Show linenumbers c : Show conditionals'#013#010+ '# a : Show everything 0 : Show nothing (except errors'+ - ')'#010+ - '# b : Show all procedure r : Rhide/GCC comp','atibility m'+ - 'ode'#010+ - '# declarations if an error x : Executable info (Win32 only'+ - ')'#010+ - '# occurs'#010+ - '#'#010+ - '# Display Info, Warnings, Notes and Hints'#010+ - '-viwn'#010+ - '# If you don'#039't want so much verbosity use'#010+ - '#-vw'#010 + ')'#013#010+ + '# b : Show all procedure r : Rhide/GCC compatibility mod'+ + 'e'#013#010+ + '# declaration','s if an error x : Executable info (Win32 on'+ + 'ly)'#013#010+ + '# occurs'#013#010+ + '#'#013#010+ + '# Display Info, Warnings, Notes and Hints'#013#010+ + '-viwn'#013#010+ + '# If you don'#039't want so much verbosity use'#013#010+ + '#-vw'#013#010 );