Some more fixes for AROS build.
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@436 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
		
							parent
							
								
									57c875df3d
								
							
						
					
					
						commit
						30184d82e9
					
				
							
								
								
									
										6
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								Makefile
									
									
									
									
									
								
							@ -72,9 +72,9 @@ else
 | 
			
		||||
    CP = cp
 | 
			
		||||
    BIN = grafx2
 | 
			
		||||
    CFGBIN = gfxcfg
 | 
			
		||||
    COPT = -Wall _c _g `i386-linux-aros-sdl-config --cflags` $(TTFCOPT)
 | 
			
		||||
    LOPT = -lSDL_image `i386-linux-aros-sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT)
 | 
			
		||||
    CC = i386-linux-aros-gcc
 | 
			
		||||
    COPT = -Wall -g `sdl-config --cflags` $(TTFCOPT)
 | 
			
		||||
    LOPT = -lSDL_image `sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT)
 | 
			
		||||
    CC = gcc
 | 
			
		||||
    OBJDIR = obj/aros
 | 
			
		||||
  else
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										4
									
								
								divers.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								divers.c
									
									
									
									
									
								
							@ -915,6 +915,8 @@ void Zoomer_une_ligne(byte* Ligne_originale, byte* Ligne_zoomee,
 | 
			
		||||
    #include <sys/sysctl.h>
 | 
			
		||||
#elif defined(__BEOS__) || defined(__HAIKU__)
 | 
			
		||||
    // sysinfo not implemented
 | 
			
		||||
#elif defined(__AROS__)
 | 
			
		||||
    #include <proto/exec.h>
 | 
			
		||||
#else
 | 
			
		||||
    #include <sys/sysinfo.h> // sysinfo() for free RAM
 | 
			
		||||
#endif
 | 
			
		||||
@ -951,6 +953,8 @@ unsigned long Memoire_libre(void)
 | 
			
		||||
    #elif defined(__BEOS__) || defined(__HAIKU__)
 | 
			
		||||
        // No <sys/sysctl.h> on BeOS or Haiku
 | 
			
		||||
        return 10*1024*1024;
 | 
			
		||||
    #elif defined(__AROS__)
 | 
			
		||||
	return AvailMem(MEMF_ANY);
 | 
			
		||||
    #else
 | 
			
		||||
        struct sysinfo info;
 | 
			
		||||
        sysinfo(&info);
 | 
			
		||||
 | 
			
		||||
@ -417,6 +417,11 @@ static const T_TABLEAIDE TableAideCredits[] =
 | 
			
		||||
  AIDE_TEXTE("")
 | 
			
		||||
  AIDE_TEXTE("  xeron")
 | 
			
		||||
  AIDE_TEXTE("")
 | 
			
		||||
  AIDE_BOLD ("                 AROS PORT")
 | 
			
		||||
  AIDE_TEXTE("")
 | 
			
		||||
  AIDE_TEXTE("  masta-uy")
 | 
			
		||||
  AIDE_TEXTE("  Markus Weiss (mweiss@id-architekten.de)")
 | 
			
		||||
  AIDE_TEXTE("")
 | 
			
		||||
  AIDE_BOLD ("               MAC OS X PORT")              //
 | 
			
		||||
  AIDE_TEXTE("")                                          //
 | 
			
		||||
  AIDE_TEXTE("  Franck Charlet (hitchhikr@australia.edu)") //
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user