mirror of
				https://gitlab.com/freepascal.org/fpc/source.git
				synced 2025-11-04 07:43:04 +01:00 
			
		
		
		
	* fixed fpmake files for darwin/arm and iphonesim
git-svn-id: trunk@20313 -
This commit is contained in:
		
							parent
							
								
									55d40b4db6
								
							
						
					
					
						commit
						b5b193ead2
					
				@ -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');
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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, ';
 | 
			
		||||
 | 
			
		||||
@ -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');
 | 
			
		||||
 | 
			
		||||
@ -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';
 | 
			
		||||
 | 
			
		||||
@ -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');
 | 
			
		||||
 | 
			
		||||
@ -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');
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user