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

Some fixes for AROS:

Browse Source 
src/text.c: Added path for truetype fonts.

src/Makefile: Create GrafX2 binary in the root directory. This allows
running without any prior installation.

src/readline.c: Added ':' to the forbidden charactersS.

src/const.h: Use '/' as indicator for parent directory.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1972 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
mazzearos 2012-08-02 13:02:00 +00:00
parent ce2d12a0a8
commit c68f05cda5
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile
View File

@ -317,10 +317,10 @@ endif
else else
ifdef AROS32CROSS ifdef AROS32CROSS
#cross compile an Aros 32 bit executable #cross compile an Aros 32 bit executable
BIN = ../bin/grafx2 BIN = ../GrafX2
COPT = -Wall -g `i386-linux-aros-sdl-config --cflags` $(TTFCOPT) COPT = -Wall -Wno-pointer-sign -Wno-unused-but-set-variable -g `i386-linux-aros-sdl-config --cflags` $(TTFCOPT)
LOPT = -lSDL_image `i386-linux-aros-sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype2shared LOPT = -lSDL_image `i386-linux-aros-sdl-config --libs` -lpng -ljpeg -lz $(TTFLOPT) -lfreetype2shared
CC = i386-aros-gcc CC = i386-linux-aros-gcc
OBJDIR = ../obj/aros OBJDIR = ../obj/aros
STRIP = strip --strip-unneeded --remove-section .comment STRIP = strip --strip-unneeded --remove-section .comment
PLATFORM = AROS PLATFORM = AROS

2
src/const.h
View File

@ -92,7 +92,7 @@
#define INITIAL_SEPARATOR_PROPORTION 0.3 ///< Proportion of the normal view width, relative to the whole screen width. #define INITIAL_SEPARATOR_PROPORTION 0.3 ///< Proportion of the normal view width, relative to the whole screen width.
#define NB_ZOOMED_PIXELS_MIN 4 ///< Minimal number of pixel shown (in width) by the zoomed view. (Note: below 4, you can't scroll!) #define NB_ZOOMED_PIXELS_MIN 4 ///< Minimal number of pixel shown (in width) by the zoomed view. (Note: below 4, you can't scroll!)
#if defined(__MORPHOS__) || defined(__amigaos4__) || defined(__amigaos__) #if defined(__MORPHOS__) || defined(__amigaos4__) || defined(__amigaos__) || defined(__AROS__)
#define PARENT_DIR "/" #define PARENT_DIR "/"
#else #else
/// Filename that means "parent directory" for your operating system. /// Filename that means "parent directory" for your operating system.

2
src/readline.c
View File

@ -139,7 +139,7 @@ int Valid_character(word c, int input_type)
// AmigaOS4: Pas de ':' car utilisé pour les volumes. // AmigaOS4: Pas de ':' car utilisé pour les volumes.
#if defined(__WIN32__) #if defined(__WIN32__)
char forbidden_char[] = {'/', '|', '?', '*', '<', '>', ':', '\\'}; char forbidden_char[] = {'/', '|', '?', '*', '<', '>', ':', '\\'};
#elif defined (__amigaos4__) #elif defined (__amigaos4__) || defined(__AROS__)
char forbidden_char[] = {'/', '|', '?', '*', '<', '>', ':'}; char forbidden_char[] = {'/', '|', '?', '*', '<', '>', ':'};
#else #else
char forbidden_char[] = {'/', '|', '?', '*', '<', '>'}; char forbidden_char[] = {'/', '|', '?', '*', '<', '>'};

4
src/text.c
View File

@ -349,6 +349,10 @@ void Init_text(void)
#ifndef NOTTF #ifndef NOTTF
For_each_file( "FONTS:_TrueType", Add_font ); For_each_file( "FONTS:_TrueType", Add_font );
#endif #endif
#elif defined(__AROS__)
#ifndef NOTTF
For_each_file( "FONTS:TrueType", Add_font );
#endif
#elif defined(__BEOS__) #elif defined(__BEOS__)
#ifndef NOTTF #ifndef NOTTF
For_each_file("/etc/fonts/ttfonts", Add_font); For_each_file("/etc/fonts/ttfonts", Add_font);