From 7ba57b206e461e03c96fef27f5b5149751afdd00 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Tue, 25 Nov 2008 19:55:06 +0000 Subject: [PATCH] Attempt at fixing BeOS build that I broke in r345 -> Issue 61. Completed bugfinders list. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@362 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- graph.c | 7 ++++++- main.c | 3 ++- tables_aide.h | 9 +++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/graph.c b/graph.c index f54be990..8049848b 100644 --- a/graph.c +++ b/graph.c @@ -24,8 +24,10 @@ #include #elif defined(__macosx__) #include +#elif defined(__BEOS__) || defined(__HAIKU__) + // sysinfo not implemented #else - #include + #include // sysinfo() for free RAM #endif #include @@ -585,6 +587,9 @@ unsigned long Memoire_libre(void) len = sizeof(maxmem); sysctl(mib,2,&maxmem,&len,NULL,0); return maxmem; + #elif defined(__BEOS__) || defined(__HAIKU__) + // No on BeOS or Haiku + return 10*1024*1024; #else struct sysinfo info; sysinfo(&info); diff --git a/main.c b/main.c index 3a10ff86..32de18fa 100644 --- a/main.c +++ b/main.c @@ -334,8 +334,9 @@ void Initialisation_du_programme(int argc,char * argv[]) { // Routine pour définir l'icone. char Chemin_icone[256]; + SDL_Surface * Icone; sprintf(Chemin_icone, "%s%s", Repertoire_du_programme, "gfx2.gif"); - SDL_Surface * Icone = IMG_Load(Chemin_icone); + Icone = IMG_Load(Chemin_icone); if (Icone) { byte *Masque_icone; diff --git a/tables_aide.h b/tables_aide.h index 0eb45822..f4242ea7 100644 --- a/tables_aide.h +++ b/tables_aide.h @@ -427,10 +427,11 @@ static const T_TABLEAIDE TableAideCredits[] = AIDE_TEXTE("") AIDE_BOLD(" BUGFINDERS") // AIDE_TEXTE("") // - AIDE_TEXTE(" Ced El Topo fallenblood Frost") - AIDE_TEXTE(" Grimmy keito kusma Lord Graga") - AIDE_TEXTE(" mind MooZ tempest titus^Rab") - AIDE_TEXTE(" tobe") + AIDE_TEXTE(" Ced El Topo fallenblood") + AIDE_TEXTE(" Frost Grimmy keito") + AIDE_TEXTE(" kusma Lord Graga mind") + AIDE_TEXTE(" MooZ richienyhus tempest") + AIDE_TEXTE(" titus^Rab tobe") AIDE_TEXTE("") AIDE_BOLD (" OUR HOMEPAGE") // AIDE_TEXTE("") //