* fixed fpmake files for darwin/arm and iphonesim

git-svn-id: trunk@20313 -

packages/cocoaint/fpmake.pp

@@ -17,7 +17,8 @@ begin
     P.Directory:='cocoaint';
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
-    P.OSes:=[darwin,iphonesim];
+    P.CPUs:=[i386,x86_64,powerpc,powerpc64];
+    P.OSes:=[darwin];
     P.Dependencies.Add('univint');
     P.SourcePath.Add('src');
 

packages/gnome1/fpmake.pp

@@ -17,7 +17,9 @@ begin
     P.Directory:='gnome1';
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
-    P.OSes:=AllUnixOSes;
+    P.OSes:=AllUnixOSes-[darwin,iphonesim];
+    if Defaults.CPU<>arm then
+      P.OSes := P.OSes + [darwin];
 
     P.Author := 'Library: Gnome project, header: FPC team';
     P.License := 'Library: LGPL2 or later, header: LGPL2 with modification, ';

packages/gtk1/fpmake.pp

@@ -24,7 +24,10 @@ begin
     P.Description := 'Header to the GTK widgetset (v1).';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
 
-    P.OSes:=AllUnixOSes+[Win32,Win64];
+    P.OSes:=AllUnixOSes+[Win32,Win64]-[darwin,iphonesim];
+    if Defaults.CPU<>arm then
+      P.OSes := P.OSes + [darwin];
+
     P.Dependencies.Add('opengl');
 
     T:=P.Targets.AddUnit('src/gdk/gdkpixbuf.pp');

packages/gtk2/fpmake.pp

@@ -18,7 +18,10 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SupportBuildModes := [bmOneByOne];
-    P.OSes:=AllUnixOSes+[Win32,Win64];
+    P.OSes:=AllUnixOSes+[Win32,Win64]-[darwin,iphonesim];
+    if Defaults.CPU<>arm then
+      P.OSes := P.OSes + [darwin];
+
     P.Author := 'Library: Peter Mattis, Spencer Kimball and Josh MacDonald, header: Mattias Gaertner, Olaf Leidinger';
     P.License := 'Library: LGPL2.1, header: LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';

packages/imlib/fpmake.pp

@@ -25,7 +25,10 @@ begin
     P.Description := 'Headers to imlib, an efficient bitmap manipulation program';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
 
-    P.OSes:=AllUnixOSes;
+    P.OSes:=AllUnixOSes-[darwin,iphonesim];
+    if Defaults.CPU<>arm then
+      P.OSes := P.OSes + [darwin];
+
     
     P.Dependencies.Add('gtk1');
     P.Dependencies.Add('x11');

packages/opengl/fpmake.pp

@@ -19,7 +19,9 @@ begin
     P.Version:='2.7.1';
     P.OSes:=AllUnixOSes+[Win32,Win64];
 
-    P.Dependencies.Add('x11',AllUnixOSes);
+    P.Dependencies.Add('x11',AllUnixOSes-[darwin,iphonesim]);
+    if Defaults.CPU<>arm then
+      P.Dependencies.Add('x11',[darwin]);
 
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
@@ -30,7 +32,9 @@ begin
     T:=P.Targets.AddUnit('glu.pp');
     T:=P.Targets.AddUnit('glut.pp');
     T.Dependencies.Add('freeglut',AllOSes-[morphos]);
-    T:=P.Targets.AddUnit('glx.pp',AllUnixOSes);
+    T:=P.Targets.AddUnit('glx.pp',AllUnixOSes-[darwin,iphonesim]);
+    if Defaults.CPU<>arm then
+      T:=P.Targets.AddUnit('glx.pp',[darwin]);
 
     P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('radblur.pp');

packages/sdl/fpmake.pp

@@ -21,6 +21,9 @@ begin
     P.IncludePath.Add('src');
     P.Dependencies.Add('x11',AllUnixOSes);
     P.Dependencies.Add('pthreads',AllUnixOSes);
+    if Defaults.CPU=arm then
+       P.OSes := P.OSes - [darwin];
+    P.OSes := P.OSes - [iphonesim];
 
     T:=P.Targets.AddUnit('logger.pas');
       with T.Dependencies do