From fe336c38d459639f22e0579caaec90d611fe8f74 Mon Sep 17 00:00:00 2001 From: joost Date: Wed, 4 Nov 2015 21:11:04 +0000 Subject: [PATCH] --- Merging r32124 into '.': U packages/gdbint/fpmake.pp --- Recording mergeinfo for merge of r32124 into '.': U . --- Merging r32126 into '.': U packages/gtk2/fpmake.pp --- Recording mergeinfo for merge of r32126 into '.': G . --- Merging r32127 into '.': U packages/imagemagick/fpmake.pp --- Recording mergeinfo for merge of r32127 into '.': G . --- Merging r32128 into '.': U packages/rtl-unicode/fpmake.pp --- Recording mergeinfo for merge of r32128 into '.': G . --- Merging r32129 into '.': U packages/fcl-sdo/fpmake.pp --- Recording mergeinfo for merge of r32129 into '.': G . --- Merging r32138 into '.': U packages/fppkg/fpmake.pp --- Recording mergeinfo for merge of r32138 into '.': G . --- Merging r32139 into '.': U packages/libxml/fpmake.pp --- Recording mergeinfo for merge of r32139 into '.': G . # revisions: 32124,32126,32127,32128,32129,32138,32139 git-svn-id: branches/fixes_3_0@32241 - --- packages/fcl-sdo/fpmake.pp | 2 ++ packages/fppkg/fpmake.pp | 2 ++ packages/gdbint/fpmake.pp | 4 +++- packages/gtk2/fpmake.pp | 18 +++++++++++++++--- packages/imagemagick/fpmake.pp | 1 + packages/libxml/fpmake.pp | 1 + packages/rtl-unicode/fpmake.pp | 6 ++++++ 7 files changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/fcl-sdo/fpmake.pp b/packages/fcl-sdo/fpmake.pp index 8e7ff4614f..ac1e140534 100644 --- a/packages/fcl-sdo/fpmake.pp +++ b/packages/fcl-sdo/fpmake.pp @@ -30,6 +30,7 @@ begin // P.NeedLibC:= false; P.SourcePath.Add('src/base'); P.SourcePath.Add('src/das'); + P.IncludePath.Add('src/das'); T:=P.Targets.AddUnit('sdo_consts.pas'); T.ResourceStrings := True; @@ -261,6 +262,7 @@ begin with T.Dependencies do begin AddUnit('data_acces_intf'); + AddInclude('sdo_global.inc'); end; T:=P.Targets.AddUnit('sdo_das_utils.pas'); with T.Dependencies do diff --git a/packages/fppkg/fpmake.pp b/packages/fppkg/fpmake.pp index 9053cbc348..f9267581d0 100644 --- a/packages/fppkg/fpmake.pp +++ b/packages/fppkg/fpmake.pp @@ -47,6 +47,7 @@ begin P.OSes := P.OSes - [embedded,nativent,msdos]; P.SourcePath.Add('src'); + P.IncludePath.Add('src'); T:=P.Targets.AddUnit('fprepos.pp'); T.ResourceStrings:=true; @@ -66,6 +67,7 @@ begin T:=P.Targets.AddUnit('pkgmkconv.pp'); T:=P.Targets.AddUnit('pkgdownload.pp'); T:=P.Targets.AddUnit('pkgfpmake.pp'); + T.Dependencies.AddInclude('fpmkunitsrc.inc'); T:=P.Targets.AddUnit('pkgcommands.pp'); T:=P.Targets.AddUnit('pkgwget.pp', TargetsWithWGet); diff --git a/packages/gdbint/fpmake.pp b/packages/gdbint/fpmake.pp index c0a67c9243..bc6d0d5f30 100644 --- a/packages/gdbint/fpmake.pp +++ b/packages/gdbint/fpmake.pp @@ -178,7 +178,7 @@ begin T := p.Targets.AddProgram('src'+PathDelim+'gdbver.pp'); T.Install := false; // - // NOTE: the gdbver.inc dependancies gives warnings because the makefile.fpc + // NOTE: the gdbver.inc dependencies gives warnings because the makefile.fpc // does a "cp src/gdbver_nogdb.inc src/gdbver.inc" to create it T:=P.Targets.AddUnit('gdbcon.pp'); @@ -191,6 +191,8 @@ begin P.Targets.AddExampleProgram('testgdb.pp'); P.Targets.AddExampleProgram('symify.pp'); P.Targets.AddExampleUnit('mingw.pas'); + + P.Sources.AddSrc('src/gdbver_nogdb.inc'); end; end; diff --git a/packages/gtk2/fpmake.pp b/packages/gtk2/fpmake.pp index ccc0ceac75..2c87eb72b4 100644 --- a/packages/gtk2/fpmake.pp +++ b/packages/gtk2/fpmake.pp @@ -170,6 +170,9 @@ begin with T.Dependencies do begin AddInclude('gdkincludes.inc'); + AddInclude('gdkdisplaymanager.inc'); + AddInclude('gdkspawn.inc'); + AddInclude('gdkcairo.inc'); AddInclude('gdkcolor.inc'); AddInclude('gdkcursor.inc'); AddInclude('gdkdnd.inc'); @@ -194,7 +197,6 @@ begin AddInclude('gdktypes.inc'); AddInclude('gdkvisual.inc'); AddInclude('gdkwindow.inc'); - AddInclude('gdkincludes.inc'); AddInclude('gdkcolor.inc'); AddInclude('gdkcursor.inc'); AddInclude('gdkdnd.inc'); @@ -219,7 +221,6 @@ begin AddInclude('gdktypes.inc'); AddInclude('gdkvisual.inc'); AddInclude('gdkwindow.inc'); - AddInclude('gdkincludes.inc'); AddInclude('gdkcolor.inc'); AddInclude('gdkcursor.inc'); AddInclude('gdkdnd.inc'); @@ -244,7 +245,6 @@ begin AddInclude('gdktypes.inc'); AddInclude('gdkvisual.inc'); AddInclude('gdkwindow.inc'); - AddInclude('gdkincludes.inc'); AddInclude('gdkcolor.inc'); AddInclude('gdkcursor.inc'); AddInclude('gdkdnd.inc'); @@ -439,6 +439,8 @@ begin AddInclude('gboxed.inc'); AddInclude('gmodule.inc'); AddInclude('gmarshal.inc'); + AddInclude('gincludes.inc'); + AddInclude('goption.inc'); end; T:=P.Targets.AddImplicitUnit('src/gtk+/gtk/gtk2.pas'); T.IncludePath.Add('src/gtk+/gtk'); @@ -1132,6 +1134,14 @@ begin AddInclude('gtkentrycompletion.inc'); AddInclude('gtkuimanager.inc'); AddInclude('gtktreemodelfilter.inc'); + + AddInclude('gtkseparatortoolitem.inc'); + AddInclude('gtkaboutdialog.inc'); + AddInclude('gtkcellrendererprogress.inc'); + AddInclude('gtkfilechooserbutton.inc'); + AddInclude('gtkcellview.inc'); + AddInclude('gtkiconview.inc'); + AddInclude('gtkmenutoolbutton.inc'); end; T:=P.Targets.AddImplicitUnit('src/gtkglext/gtkglext.pas'); T.IncludePath.Add('src/gtkglext'); @@ -1220,6 +1230,8 @@ begin AddInclude('pango-item.inc'); AddInclude('pango-layout.inc'); AddInclude('pango-tabs.inc'); + AddInclude('pango-matrix.inc'); + AddInclude('pango-renderer.inc'); end; T:=P.Targets.AddImplicitUnit('src/pangocairo/pangocairo.pas'); diff --git a/packages/imagemagick/fpmake.pp b/packages/imagemagick/fpmake.pp index 9944e7afe0..105525ded7 100644 --- a/packages/imagemagick/fpmake.pp +++ b/packages/imagemagick/fpmake.pp @@ -42,6 +42,7 @@ begin AddInclude('magick_type.inc'); AddInclude('type.inc'); AddInclude('cache_view.inc'); + AddInclude('cache.inc'); AddInclude('compare.inc'); AddInclude('constitute.inc'); AddInclude('draw.inc'); diff --git a/packages/libxml/fpmake.pp b/packages/libxml/fpmake.pp index 48d03a9b90..0fa32b2b2e 100644 --- a/packages/libxml/fpmake.pp +++ b/packages/libxml/fpmake.pp @@ -25,6 +25,7 @@ begin T:=P.Targets.AddUnit('xml2.pas'); with T.Dependencies do begin + AddInclude('xml2.inc'); AddInclude('xinclude.inc'); AddInclude('xpointer.inc'); AddInclude('HTMLparser.inc'); diff --git a/packages/rtl-unicode/fpmake.pp b/packages/rtl-unicode/fpmake.pp index 862545408c..ad9ab3c936 100644 --- a/packages/rtl-unicode/fpmake.pp +++ b/packages/rtl-unicode/fpmake.pp @@ -49,6 +49,12 @@ begin P.IncludePath.Add('src/collations'); T:=P.Targets.AddUnit('unicodeducet.pas',CollationOSes); + with T.Dependencies do + begin + AddInclude('ucadata.inc'); + AddInclude('ucadata_le.inc'); + AddInclude('ucadata_be.inc'); + end; T:=P.Targets.AddUnit('buildcollations.pas',CollationOSes); T.Install:=False; with T.Dependencies do