From 23a72b39ee539281c5441eec76e7e17883b1b2f6 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 10 May 2009 07:26:09 +0000
Subject: [PATCH] Build fixes for AROS.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@794 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 Makefile  | 5 ++++-
 filesel.c | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2aa1cb8b..16fff493 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,7 @@ else
     LOPT = -lSDL_image `sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype2shared
     CC = gcc
     OBJDIR = obj/aros
+	STRIP = strip --strip-unneeded --remove-section .comment
     ZIP = lha
     ZIPOPT = a
 
@@ -186,7 +187,9 @@ else
         BIN = grafx2
         COPT = -W -Wall -Wdeclaration-after-statement -pedantic -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT)
         LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng
-        CC = gcc
+		# Use gcc for compiling. Use ncc to build a callgraph and analyze the code.
+		CC = gcc
+		#CC = nccgen -ncgcc -ncld -ncfabs
         OBJDIR = obj/unix
         X11LOPT = -lX11
       endif
diff --git a/filesel.c b/filesel.c
index e09b5828..7b59a79a 100644
--- a/filesel.c
+++ b/filesel.c
@@ -273,7 +273,11 @@ void bstrtostr( BSTR in, STRPTR out, TEXT max )
 
   if( max > iptr[0] ) max = iptr[0];
 
+#if defined(__AROS__)
+  for ( i=0 ; i<max ; i++ ) out[i] = *(AROS_BSTR_ADDR(iptr+i));
+#else
   for( i=0; i<max; i++ ) out[i] = iptr[i+1];
+#endif
   out[i] = 0;
 }
 #endif