paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-14 09:29:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r29434 into '.':

Browse Source 
U    utils/fpcmkcfg/fpc.cft
--- Merging r29437 into '.':
U    Makefile.fpc
U    Makefile
--- Merging r29440 into '.':
U    packages/fcl-res/fpmake.pp
--- Merging r29453 into '.':
U    utils/fpcmkcfg/fpccfg.inc

# revisions: 29434,29437,29440,29453

git-svn-id: branches/fixes_3_0@29463 -
This commit is contained in:
marco 2015-01-13 13:58:55 +00:00
parent 12aee0aaf5
commit 9a6b70368f
5 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -467,7 +467,7 @@ endif
endif endif
BuildOnlyBaseCPUs=jvm BuildOnlyBaseCPUs=jvm
ifneq ($(wildcard utils),) ifneq ($(wildcard utils),)
NOUTILSTARGETS=embedded gba $(BuildOnlyBaseCPUs) NOUTILSTARGETS=embedded gba msdos $(BuildOnlyBaseCPUs)
ifeq ($(findstring $(OS_TARGET),$(NOUTILSTARGETS)),) ifeq ($(findstring $(OS_TARGET),$(NOUTILSTARGETS)),)
ifdef BUILDFULLNATIVE ifdef BUILDFULLNATIVE
UTILS=1 UTILS=1

2
Makefile.fpc
View File

@ -204,7 +204,7 @@ endif
BuildOnlyBaseCPUs=jvm BuildOnlyBaseCPUs=jvm
ifneq ($(wildcard utils),) ifneq ($(wildcard utils),)
NOUTILSTARGETS=embedded gba $(BuildOnlyBaseCPUs) NOUTILSTARGETS=embedded gba msdos $(BuildOnlyBaseCPUs)
ifeq ($(findstring $(OS_TARGET),$(NOUTILSTARGETS)),) ifeq ($(findstring $(OS_TARGET),$(NOUTILSTARGETS)),)
ifdef BUILDFULLNATIVE ifdef BUILDFULLNATIVE
UTILS=1 UTILS=1

2
packages/fcl-res/fpmake.pp
View File

@ -24,7 +24,7 @@ begin
P.Email := ''; P.Email := '';
P.Description := 'Resource handling of Free Component Libraries (FCL), FPC''s OOP library.'; P.Description := 'Resource handling of Free Component Libraries (FCL), FPC''s OOP library.';
P.NeedLibC:= false; P.NeedLibC:= false;
P.OSes:=AllOSes-[embedded]; P.OSes:=AllOSes-[embedded,msdos];
P.SourcePath.Add('src'); P.SourcePath.Add('src');
P.IncludePath.Add('src'); P.IncludePath.Add('src');

6
utils/fpcmkcfg/fpc.cft
View File

@ -148,6 +148,12 @@
-Fu%basepath%/units/$fpctarget/* -Fu%basepath%/units/$fpctarget/*
-Fu%basepath%/units/$fpctarget/rtl -Fu%basepath%/units/$fpctarget/rtl
#ifdef cpui8086
-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel
-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel/*
-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel/rtl
#endif
#IFDEF FPCAPACHE_1_3 #IFDEF FPCAPACHE_1_3
-Fu%basepath%/units/$fpctarget/httpd13/ -Fu%basepath%/units/$fpctarget/httpd13/
#ELSE #ELSE

52
utils/fpcmkcfg/fpccfg.inc
View File

@ -1,7 +1,7 @@
{$ifdef Delphi} {$ifdef Delphi}
const DefaultConfig : array[0..29] of string[240]=( const DefaultConfig : array[0..30] of string[240]=(
{$else Delphi} {$else Delphi}
const DefaultConfig : array[0..29,1..240] of char=( const DefaultConfig : array[0..30,1..240] of char=(
{$endif Delphi} {$endif Delphi}
'#'#013#010+ '#'#013#010+
'# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#013#010+ '# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#013#010+
@ -169,12 +169,18 @@ const DefaultConfig : array[0..29,1..240] of char=(
'-Fu%basepath%/units/$fpctarget/*'#013#010+ '-Fu%basepath%/units/$fpctarget/*'#013#010+
'-Fu%basepath%/units/$fpctarget/rtl'#013#010+ '-Fu%basepath%/units/$fpctarget/rtl'#013#010+
#013#010+ #013#010+
'#ifdef cpui8086'#013#010+
'-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel'#013#010+
'-Fu%basepath%/units/$fpctarget/$fpc','subarch-$fpcmemorymodel/*'#013#010+
'-Fu%basepath%/units/$fpctarget/$fpcsubarch-$fpcmemorymodel/rtl'#013#010+
'#endif'#013#010+
#013#010+
'#IFDEF FPCAPACHE_1_3'#013#010+ '#IFDEF FPCAPACHE_1_3'#013#010+
'-Fu%basepath%/units/$fpctarget/httpd13/'#013#010+ '-Fu%basepath%/units/$fpctarget/httpd13/'#013#010+
'#ELSE'#013#010+ '#ELSE'#013#010+
'#IFDEF FPCAPACHE_2_0'#013#010+ '#IFDEF FPCAPACHE_2_0'#013#010+
'-Fu%basepath%/units/','$fpctarget/httpd20'#013#010+ '-Fu%basepath%/units/$fpctarget/httpd20'#013#010+
'#ELSE'#013#010+ '#ELSE'#013#010,
'-Fu%basepath%/units/$fpctarget/httpd22'#013#010+ '-Fu%basepath%/units/$fpctarget/httpd22'#013#010+
'#ENDIF'#013#010+ '#ENDIF'#013#010+
'#ENDIF'#013#010+ '#ENDIF'#013#010+
@ -186,8 +192,8 @@ const DefaultConfig : array[0..29,1..240] of char=(
'%gcclibpath%'#013#010+ '%gcclibpath%'#013#010+
#013#010+ #013#010+
'# searchpath for libraries'#013#010+ '# searchpath for libraries'#013#010+
'#','-Fl%basepath%/lib'#013#010+ '#-Fl%basepath%/lib'#013#010+
'#-Fl/lib;/usr/lib'#013#010+ '#-Fl/lib',';/usr/lib'#013#010+
'-Fl%basepath%/lib/$FPCTARGET'#013#010+ '-Fl%basepath%/lib/$FPCTARGET'#013#010+
#013#010+ #013#010+
'# searchpath for tools'#013#010+ '# searchpath for tools'#013#010+
@ -196,8 +202,8 @@ const DefaultConfig : array[0..29,1..240] of char=(
'%NEEDCROSSBINUTILSIFDEF%'#013#010+ '%NEEDCROSSBINUTILSIFDEF%'#013#010+
#013#010+ #013#010+
'# never need cross-prefix when targeting the JVM'#013#010+ '# never need cross-prefix when targeting the JVM'#013#010+
'# (no native compiler, always cross-','compiling)'#013#010+ '# (no native compiler, always cross-compiling)'#013#010+
'#ifdef cpujvm'#013#010+ '#ifdef cpujvm'#013#010,
'#undef NEEDCROSSBINUTILS'#013#010+ '#undef NEEDCROSSBINUTILS'#013#010+
'#endif'#013#010+ '#endif'#013#010+
#013#010+ #013#010+
@ -208,8 +214,8 @@ const DefaultConfig : array[0..29,1..240] of char=(
#013#010+ #013#010+
'# binutils prefix for cross compiling'#013#010+ '# binutils prefix for cross compiling'#013#010+
'#IFDEF FPC_CROSSCOMPILING'#013#010+ '#IFDEF FPC_CROSSCOMPILING'#013#010+
'#IFDEF NEEDC','ROSSBINUTILS'#013#010+ '#IFDEF NEEDCROSSBINUTILS'#013#010+
' -XP$FPCTARGET-'#013#010+ ' -XP$FPCTARG','ET-'#013#010+
'#ENDIF'#013#010+ '#ENDIF'#013#010+
'#ENDIF'#013#010+ '#ENDIF'#013#010+
#013#010+ #013#010+
@ -222,13 +228,13 @@ const DefaultConfig : array[0..29,1..240] of char=(
'ing'#013#010+ 'ing'#013#010+
'# process)'#013#010+ '# process)'#013#010+
'# -gc generate checks for pointers'#013#010+ '# -gc generate checks for pointers'#013#010+
'# ',' -gd use dbx'#013#010+ '# -gd use dbx'#013#010+
'# -gg use gsym'#013#010+ '# ',' -gg use gsym'#013#010+
'# -gh use heap trace unit (for memory leak debugging)'#013#010+ '# -gh use heap trace unit (for memory leak debugging)'#013#010+
'# -gl use line info unit to show more info for backtraces'#013+ '# -gl use line info unit to show more info for backtraces'#013+
#010+ #010+
'# -gv generates programs tracable with va','lgrind'#013#010+ '# -gv generates programs tracable with valgrind'#013#010+
'# -gw generate dwarf debugging info'#013#010+ '# -gw g','enerate dwarf debugging info'#013#010+
'#'#013#010+ '#'#013#010+
'# Enable debuginfo and use the line info unit by default'#013#010+ '# Enable debuginfo and use the line info unit by default'#013#010+
'#-gl'#013#010+ '#-gl'#013#010+
@ -239,7 +245,7 @@ const DefaultConfig : array[0..29,1..240] of char=(
'# Always strip debuginfo from the executable'#013#010+ '# Always strip debuginfo from the executable'#013#010+
'-Xs'#013#010+ '-Xs'#013#010+
#013#010+ #013#010+
'# Always use ','smartlinking on i8086, because the system unit exceeds '+ '# Always use smartlinking on i8086, beca','use the system unit exceeds '+
'the 64kb'#013#010+ 'the 64kb'#013#010+
'# code limit'#013#010+ '# code limit'#013#010+
'#ifdef cpui8086'#013#010+ '#ifdef cpui8086'#013#010+
@ -256,24 +262,24 @@ const DefaultConfig : array[0..29,1..240] of char=(
'-l'#013#010+ '-l'#013#010+
#013#010+ #013#010+
'# Verbosity'#013#010+ '# Verbosity'#013#010+
'# e : Show',' errors (default) d : Show debug info'#013#010+ '# e : Show errors (default) d :',' Show debug info'#013#010+
'# w : Show warnings u : Show unit info'#013#010+ '# w : Show warnings u : Show unit info'#013#010+
'# n : Show notes t : Show tried/used files'#013#010+ '# n : Show notes t : Show tried/used files'#013#010+
'# h : Show hints s : Show time stamps'#013#010+ '# h : Show hints s : Show time stamps'#013#010+
'# i ',': Show general info q : Show message numbers'#013#010+ '# i : Show general info ',' q : Show message numbers'#013#010+
'# l : Show linenumbers c : Show conditionals'#013#010+ '# l : Show linenumbers c : Show conditionals'#013#010+
'# a : Show everything 0 : Show nothing (except errors'+ '# a : Show everything 0 : Show nothing (except errors'+
')'#013#010+ ')'#013#010+
'# b : Write file names messages r : Rhide/','GCC compatibility m'+ '# b : Write file names messages r : Rhide/GCC compatibility mod'+
'ode'#013#010+ 'e'#013#010+
'# with full path x : Executable info (Win32 only'+ '# ',' with full path x : Executable info (Win32 on'+
')'#013#010+ 'ly)'#013#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'#013#010+ 'ree'#013#010+
'# lots of debugging info'#013#010+ '# lots of debugging info'#013#010+
'#'#013#010+ '#'#013#010+
'# Display Info, Warnings and N','otes'#013#010+ '# Display Info, Warnings and Notes'#013#010+
'-viwn'#013#010+ '-viwn'#013#010+
'# If you don'#039't want so much verbosity use'#013#010+ '# If you don'#039't',' want so much verbosity use'#013#010+
'#-vw'#013#010 '#-vw'#013#010
); );