Some minor changes to make it compile on AROS.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1649 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
masta.uy 2010-11-13 20:05:12 +00:00
parent aeb7f26809
commit 0bfc627094
4 changed files with 19 additions and 2 deletions

View File

@ -235,6 +235,18 @@ else
PLATFORM = gp2x PLATFORM = gp2x
STRIP = /opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin/arm-open2x-linux-strip STRIP = /opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin/arm-open2x-linux-strip
JOYCOPT = -DUSE_JOYSTICK JOYCOPT = -DUSE_JOYSTICK
else ifdef AROS32CROSS
#cross compile an Aros 32 bit executable
BIN = ../bin/grafx2
COPT = -Wall -g `i386-linux-aros-sdl-config --cflags` $(TTFCOPT)
LOPT = -lSDL_image `i386-linux-aros-sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype2shared
CC = i386-aros-gcc
OBJDIR = ../obj/aros
STRIP = strip --strip-unneeded --remove-section .comment
PLATFORM = AROS
ZIP = lha
ZIPOPT = a
else else
# Compiles a regular linux executable for the native platform # Compiles a regular linux executable for the native platform

View File

@ -299,7 +299,7 @@ int Lock_file_handle = -1;
byte Create_lock_file(const char *file_directory) byte Create_lock_file(const char *file_directory)
{ {
#ifdef __amigaos__ #if defined (__amigaos__)||(__AROS__)
#warning "Missing code for your platform, please check and correct!" #warning "Missing code for your platform, please check and correct!"
#else #else
char lock_filename[MAX_PATH_CHARACTERS]; char lock_filename[MAX_PATH_CHARACTERS];
@ -336,7 +336,7 @@ byte Create_lock_file(const char *file_directory)
return -1; return -1;
} }
#endif #endif
#endif // __amigaos__ #endif // __amigaos__ or __AROS__
return 0; return 0;
} }

View File

@ -6,6 +6,9 @@
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#if defined(__AROS__)
#include <limits.h>
#endif
#if defined(__AROS__) || defined(__BEOS__) || defined(__MORPHOS__) || defined(__GP2X__) || defined(__WIZ__) || defined(__CAANOO__) || defined(__amigaos__) #if defined(__AROS__) || defined(__BEOS__) || defined(__MORPHOS__) || defined(__GP2X__) || defined(__WIZ__) || defined(__CAANOO__) || defined(__amigaos__)
// These platforms don't have realpath(). // These platforms don't have realpath().

View File

@ -118,6 +118,8 @@ void Set_data_directory(const char * program_dir, char * data_dir)
#elif defined (__GP2X__) || defined (__gp2x__) || defined (__WIZ__) || defined (__CAANOO__) #elif defined (__GP2X__) || defined (__gp2x__) || defined (__WIZ__) || defined (__CAANOO__)
strcat(data_dir,"share/grafx2/"); strcat(data_dir,"share/grafx2/");
// All other targets, program is in a "bin" subdirectory // All other targets, program is in a "bin" subdirectory
#elif defined (__AROS__)
strcat(data_dir,"/share/grafx2/");
#else #else
strcat(data_dir,"../share/grafx2/"); strcat(data_dir,"../share/grafx2/");
#endif #endif