m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fixes for AROS.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@794 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2009-05-10 07:26:09 +00:00
parent 4a051bb820
commit 23a72b39ee
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -80,6 +80,7 @@ else
LOPT = -lSDL_image `sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype2shared LOPT = -lSDL_image `sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype2shared
CC = gcc CC = gcc
OBJDIR = obj/aros OBJDIR = obj/aros
STRIP = strip --strip-unneeded --remove-section .comment
ZIP = lha ZIP = lha
ZIPOPT = a ZIPOPT = a
@ -186,7 +187,9 @@ else
BIN = grafx2 BIN = grafx2
COPT = -W -Wall -Wdeclaration-after-statement -pedantic -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT) COPT = -W -Wall -Wdeclaration-after-statement -pedantic -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT)
LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng 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 OBJDIR = obj/unix
X11LOPT = -lX11 X11LOPT = -lX11
endif endif

4
filesel.c
View File

@ -273,7 +273,11 @@ void bstrtostr( BSTR in, STRPTR out, TEXT max )
if( max > iptr[0] ) max = iptr[0]; 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]; for( i=0; i<max; i++ ) out[i] = iptr[i+1];
#endif
out[i] = 0; out[i] = 0;
} }
#endif #endif