From 0eb18b7619658d360f56489f9637fae675dcfe11 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 29 Dec 2008 17:48:02 +0000 Subject: [PATCH] SkyOS port. Thanks again Begasus :) git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@437 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- Makefile | 14 ++++++++++++++ divers.c | 4 +++- tables_aide.h | 4 ++++ texte.c | 5 +++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 00c09ba5..e5bbf0b2 100644 --- a/Makefile +++ b/Makefile @@ -105,6 +105,20 @@ else CC = gcc OBJDIR = obj/haiku else + + #SkyOS specific + ifeq ($(PLATFORM),skyos) + DELCOMMAND = rm -rf + MKDIR = mkdir -p + RMDIR = rmdir + CP = cp + BIN = grafx2 + CFGBIN = gfxcfg + COPT = -W -Wall -Wdeclaration-after-statement -c -g `sdl-config --cflags` $(TTFCOPT) + LOPT = `sdl-config --libs` -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) + CC = gcc + OBJDIR = obj/skyos + else # Linux specific DELCOMMAND = rm -rf diff --git a/divers.c b/divers.c index ebd97e37..7c0db74e 100644 --- a/divers.c +++ b/divers.c @@ -917,6 +917,8 @@ void Zoomer_une_ligne(byte* Ligne_originale, byte* Ligne_zoomee, // sysinfo not implemented #elif defined(__AROS__) #include +#elif defined(__SKYOS__) + #include #else #include // sysinfo() for free RAM #endif @@ -950,7 +952,7 @@ unsigned long Memoire_libre(void) len = sizeof(maxmem); sysctl(mib,2,&maxmem,&len,NULL,0); return maxmem; - #elif defined(__BEOS__) || defined(__HAIKU__) + #elif defined(__BEOS__) || defined(__HAIKU__) || defined(__SKYOS__) // No on BeOS or Haiku return 10*1024*1024; #elif defined(__AROS__) diff --git a/tables_aide.h b/tables_aide.h index f432d113..78e9b027 100644 --- a/tables_aide.h +++ b/tables_aide.h @@ -430,6 +430,10 @@ static const T_TABLEAIDE TableAideCredits[] = AIDE_TEXTE("") // AIDE_TEXTE(" Luc Schrijvers (begasus@skynet.be)") // AIDE_TEXTE("") + AIDE_BOLD (" SKYOS PORT") // + AIDE_TEXTE("") // + AIDE_TEXTE(" Luc Schrijvers (begasus@skynet.be)") // + AIDE_TEXTE("") AIDE_BOLD(" BUGFINDERS") // AIDE_TEXTE("") // AIDE_TEXTE(" BDCIron Ced El Topo ") diff --git a/texte.c b/texte.c index ee47a5b5..11d4dded 100644 --- a/texte.c +++ b/texte.c @@ -338,6 +338,11 @@ void Initialisation_Texte(void) for_each_file("/etc/fonts/ttfonts", Ajout_fonte); #endif + #elif defined(__SKYOS__) + #ifndef NOTTF + for_each_file("/boot/system/fonts", Ajout_fonte); + #endif + #endif }