mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-11 15:47:51 +02:00
* protect the -FM switch with "#ifndef VER2", to ensure that fpc.cfg can
be shared between FPC 2.x and FPC 3.x+ git-svn-id: trunk@31453 -
This commit is contained in:
Jonas Maebe
parent
3f1ad78fc2
commit
cd83bc35b6
@ -140,8 +140,10 @@
|
|||||||
#-Fr%basepath%/msg/errord.msg
|
#-Fr%basepath%/msg/errord.msg
|
||||||
#-Fr%basepath%/msg/errorr.msg
|
#-Fr%basepath%/msg/errorr.msg
|
||||||
|
|
||||||
# search path for unicode binary files
|
# search path for unicode binary files (FPC 2.x does not know this switch)
|
||||||
|
#ifndef VER2
|
||||||
-FM%sharepath%/unicode/
|
-FM%sharepath%/unicode/
|
||||||
|
#endif
|
||||||
|
|
||||||
# searchpath for units and other system dependent things
|
# searchpath for units and other system dependent things
|
||||||
-Fu%basepath%/units/$fpctarget
|
-Fu%basepath%/units/$fpctarget
|
||||||
|
|||||||
@ -158,22 +158,25 @@ const DefaultConfig : array[0..30,1..240] of char=(
|
|||||||
'#-Fr%basepath%/msg/errord.msg'#010+
|
'#-Fr%basepath%/msg/errord.msg'#010+
|
||||||
'#-Fr%basepath%/msg/errorr.msg'#010+
|
'#-Fr%basepath%/msg/errorr.msg'#010+
|
||||||
#010+
|
#010+
|
||||||
'# s','earch path for unicode binary files'#010+
|
'# s','earch path for unicode binary files (FPC 2.x does not know this s'+
|
||||||
|
'witch)'#010+
|
||||||
|
'#ifndef VER2'#010+
|
||||||
'-FM%sharepath%/unicode/'#010+
|
'-FM%sharepath%/unicode/'#010+
|
||||||
|
'#endif'#010+
|
||||||
#010+
|
#010+
|
||||||
'# searchpath for units and other system dependent things'#010+
|
'# searchpath for units and other system dependent things'#010+
|
||||||
'-Fu%basepath%/units/$fpctarget'#010+
|
'-Fu%basepath%/units/$fpctarget'#010+
|
||||||
'-Fu%basepath%/units/$fpctarget/*'#010+
|
'-Fu%basepath%/units/$fpctarget/*'#010+
|
||||||
'-Fu%basepath%/units/$fpctarget/rtl'#010+
|
'-F','u%basepath%/units/$fpctarget/rtl'#010+
|
||||||
#010+
|
#010+
|
||||||
'#ifdef cpui8086'#010+
|
'#ifdef cpui8086'#010+
|
||||||
'-Fu%ba','sepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel'#010+
|
'-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel'#010+
|
||||||
'-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel/*'#010+
|
'-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel/*'#010+
|
||||||
'-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel/rtl'#010+
|
'-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel/rtl'#010+
|
||||||
'#endif'#010+
|
'#endif'#010,
|
||||||
#010+
|
#010+
|
||||||
'#IFDEF FPCAPACHE_1_3'#010+
|
'#IFDEF FPCAPACHE_1_3'#010+
|
||||||
'-Fu%basepath%/units/$fpctarget/htt','pd13/'#010+
|
'-Fu%basepath%/units/$fpctarget/httpd13/'#010+
|
||||||
'#ELSE'#010+
|
'#ELSE'#010+
|
||||||
'#IFDEF FPCAPACHE_2_0'#010+
|
'#IFDEF FPCAPACHE_2_0'#010+
|
||||||
'-Fu%basepath%/units/$fpctarget/httpd20'#010+
|
'-Fu%basepath%/units/$fpctarget/httpd20'#010+
|
||||||
@ -183,10 +186,10 @@ const DefaultConfig : array[0..30,1..240] of char=(
|
|||||||
'#ENDIF'#010+
|
'#ENDIF'#010+
|
||||||
#010+
|
#010+
|
||||||
'# searchpath for fppkg user-specific packages'#010+
|
'# searchpath for fppkg user-specific packages'#010+
|
||||||
'-Fu%localbasepath%/units/$FPCTARGET/*'#010+
|
'-Fu%lo','calbasepath%/units/$FPCTARGET/*'#010+
|
||||||
#010+
|
#010+
|
||||||
'# path to the gcclib'#010+
|
'# path to the gcclib'#010+
|
||||||
'%g','cclibpath%'#010+
|
'%gcclibpath%'#010+
|
||||||
#010+
|
#010+
|
||||||
'# searchpath for libraries'#010+
|
'# searchpath for libraries'#010+
|
||||||
'#-Fl%basepath%/lib'#010+
|
'#-Fl%basepath%/lib'#010+
|
||||||
@ -196,10 +199,10 @@ const DefaultConfig : array[0..30,1..240] of char=(
|
|||||||
'# searchpath for tools'#010+
|
'# searchpath for tools'#010+
|
||||||
'-FD%basepath%/bin/$FPCTARGET'#010+
|
'-FD%basepath%/bin/$FPCTARGET'#010+
|
||||||
#010+
|
#010+
|
||||||
'%NEEDCROSSBINUTILSIFDEF%'#010+
|
'%NEEDCROSSBINUTILSIFDEF%'#010,
|
||||||
#010+
|
#010+
|
||||||
'# never need cross-prefix when targeting the JVM'#010+
|
'# never need cross-prefix when targeting the JVM'#010+
|
||||||
'# (no ','native compiler, always cross-compiling)'#010+
|
'# (no native compiler, always cross-compiling)'#010+
|
||||||
'#ifdef cpujvm'#010+
|
'#ifdef cpujvm'#010+
|
||||||
'#undef NEEDCROSSBINUTILS'#010+
|
'#undef NEEDCROSSBINUTILS'#010+
|
||||||
'#endif'#010+
|
'#endif'#010+
|
||||||
@ -209,19 +212,19 @@ const DefaultConfig : array[0..30,1..240] of char=(
|
|||||||
'#undef NEEDCROSSBINUTILS'#010+
|
'#undef NEEDCROSSBINUTILS'#010+
|
||||||
'#endif'#010+
|
'#endif'#010+
|
||||||
#010+
|
#010+
|
||||||
'# never need cross-prefix when targeting the i8086'#010+
|
'# ','never need cross-prefix when targeting the i8086'#010+
|
||||||
'# (no n','ative compiler, always cross-compiling)'#010+
|
'# (no native compiler, always cross-compiling)'#010+
|
||||||
'#ifdef cpui8086'#010+
|
'#ifdef cpui8086'#010+
|
||||||
'#undef NEEDCROSSBINUTILS'#010+
|
'#undef NEEDCROSSBINUTILS'#010+
|
||||||
'#endif'#010+
|
'#endif'#010+
|
||||||
#010+
|
#010+
|
||||||
'# never need cross-prefix when targeting the i8086'#010+
|
'# never need cross-prefix when targeting the i8086'#010+
|
||||||
'# (no native compiler, always cross-compiling)'#010+
|
'# (no native compiler, always cross-compilin','g)'#010+
|
||||||
'#ifdef cpujvm'#010+
|
'#ifdef cpujvm'#010+
|
||||||
'#undef NEEDCROSSBINUTILS'#010+
|
'#undef NEEDCROSSBINUTILS'#010+
|
||||||
'#endif'#010+
|
'#endif'#010+
|
||||||
#010+
|
#010+
|
||||||
'# binu','tils prefix for cross compiling'#010+
|
'# binutils prefix for cross compiling'#010+
|
||||||
'#IFDEF FPC_CROSSCOMPILING'#010+
|
'#IFDEF FPC_CROSSCOMPILING'#010+
|
||||||
'#IFDEF NEEDCROSSBINUTILS'#010+
|
'#IFDEF NEEDCROSSBINUTILS'#010+
|
||||||
' -XP$FPCTARGET-'#010+
|
' -XP$FPCTARGET-'#010+
|
||||||
@ -233,24 +236,25 @@ const DefaultConfig : array[0..30,1..240] of char=(
|
|||||||
'# Linking'#010+
|
'# Linking'#010+
|
||||||
'# -------------'#010+
|
'# -------------'#010+
|
||||||
#010+
|
#010+
|
||||||
'# generate always debugging information for GDB (slows down the compil'+
|
'# generate always debuggi','ng information for GDB (slows down the comp'+
|
||||||
'ing'#010+
|
'iling'#010+
|
||||||
'# proce','ss)'#010+
|
'# process)'#010+
|
||||||
'# -gc generate checks for pointers'#010+
|
'# -gc generate checks for pointers'#010+
|
||||||
'# -gd use dbx'#010+
|
'# -gd use dbx'#010+
|
||||||
'# -gg use gsym'#010+
|
'# -gg use gsym'#010+
|
||||||
'# -gh use heap trace unit (for memory leak debugging)'#010+
|
'# -gh use heap trace unit (for memory leak debugging)'#010+
|
||||||
'# -gl use line info unit to show more info for backtraces'#010,
|
'# -gl ',' use line info unit to show more info for backtrace'+
|
||||||
|
's'#010+
|
||||||
'# -gv generates programs tracable with valgrind'#010+
|
'# -gv generates programs tracable with valgrind'#010+
|
||||||
'# -gw generate dwarf debugging info'#010+
|
'# -gw generate dwarf debugging info'#010+
|
||||||
'#'#010+
|
'#'#010+
|
||||||
'# Enable debuginfo and use the line info unit by default'#010+
|
'# Enable debuginfo and use the line info unit by default'#010+
|
||||||
'#-gl'#010+
|
'#-gl'#010+
|
||||||
#010+
|
#010+
|
||||||
'# always pass an option to the linker'#010+
|
'# always pa','ss an option to the linker'#010+
|
||||||
'#-k-s'#010+
|
'#-k-s'#010+
|
||||||
#010+
|
#010+
|
||||||
'# Always strip debugin','fo from the executable'#010+
|
'# Always strip debuginfo from the executable'#010+
|
||||||
'-Xs'#010+
|
'-Xs'#010+
|
||||||
#010+
|
#010+
|
||||||
'# Always use smartlinking on i8086, because the system unit exceeds th'+
|
'# Always use smartlinking on i8086, because the system unit exceeds th'+
|
||||||
@ -264,29 +268,29 @@ const DefaultConfig : array[0..30,1..240] of char=(
|
|||||||
#010+
|
#010+
|
||||||
'# -------------'#010+
|
'# -------------'#010+
|
||||||
'# Miscellaneous'#010+
|
'# Miscellaneous'#010+
|
||||||
'# -------------'#010+
|
'#',' -------------'#010+
|
||||||
#010+
|
#010+
|
||||||
'# Write always a nice FPC logo ;)'#010+
|
'# Write always a nice FPC logo ;)'#010+
|
||||||
'-l'#010+
|
'-l'#010+
|
||||||
#010+
|
#010+
|
||||||
'# ','Verbosity'#010+
|
'# Verbosity'#010+
|
||||||
'# e : Show errors (default) d : Show debug info'#010+
|
'# e : Show errors (default) d : Show debug info'#010+
|
||||||
'# w : Show warnings u : Show unit info'#010+
|
'# w : Show warnings u : Show unit info'#010+
|
||||||
'# n : Show notes t : Show tried/used files'#010+
|
'# n : Show notes t : Show tried/use','d files'#010+
|
||||||
'# h : Show hints s : Show ','time stamps'#010+
|
'# h : Show hints s : Show time stamps'#010+
|
||||||
'# i : Show general info q : Show message numbers'#010+
|
'# i : Show general info q : Show message numbers'#010+
|
||||||
'# l : Show linenumbers c : Show conditionals'#010+
|
'# l : Show linenumbers c : Show conditionals'#010+
|
||||||
'# a : Show everything 0 : Show nothing (except errors'+
|
'# a : Show everything 0 : Show',' nothing (except erro'+
|
||||||
')'#010+
|
'rs)'#010+
|
||||||
'# b : Write file names mes','sages r : Rhide/GCC compatibility m'+
|
'# b : Write file names messages r : Rhide/GCC compatibility mod'+
|
||||||
'ode'#010+
|
'e'#010+
|
||||||
'# with full path x : Executable info (Win32 only'+
|
'# with full path x : Executable info (Win32 only'+
|
||||||
')'#010+
|
')'#010+
|
||||||
'# v : write fpcdebug.txt with p : Write tree.log with parse t'+
|
'# v : write fpcdebug.txt with p : Write tree.log with parse t'+
|
||||||
'ree'#010+
|
'r','ee'#010+
|
||||||
'# lots of debugging info'#010+
|
'# lots of debugging info'#010+
|
||||||
'#'#010+
|
'#'#010+
|
||||||
'# Display Info, W','arnings and Notes'#010+
|
'# Display Info, Warnings and Notes'#010+
|
||||||
'-viwn'#010+
|
'-viwn'#010+
|
||||||
'# If you don'#039't want so much verbosity use'#010+
|
'# If you don'#039't want so much verbosity use'#010+
|
||||||
'#-vw'#010
|
'#-vw'#010
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user