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

bugfix in Add_element_to_list(), there were changes in function interface, but they were not applied in function call, so this resulted in program hang when calling fileselector.

Browse Source 
Bugfix there was no Atari_Memory_free() declaration when __MINT_ define was declared.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1799 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
nokturnal 2011-06-15 19:29:11 +00:00
parent bf28d19f20
commit 7184fb857f
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Makefile
View File

@ -209,7 +209,24 @@ else
X11LOPT = -lX11 X11LOPT = -lX11
CC = gcc CC = gcc
else else
ifeq ($(PLATFORM),FreeMiNT) #10
#Atari FreeMiNT/TOS specific
DELCOMMAND = rm -rf
MKDIR = mkdir -p
RMDIR = rmdir
CP = cp
ZIP = zip
PLATFORMFILES = gfx2.png
CC = gcc
BIN = ../bin/grafx2.ttp
LUALOPT = -llua
OBJDIR = ../obj/m68k-atari-mint
PLATFORM = m68k-atari-mint
STRIP = strip -s
X11LOPT =
COPT = -W -Wall -m68020-60 -fomit-frame-pointer -pedantic -std=c99 -Wdeclaration-after-statement -D__MINT__ -DNO_INLINE_MATH -O$(OPTIM) -c -I$(prefix)/include `$(prefix)/bin/libpng12-config --cflags` `$(prefix)/bin/sdl-config --cflags` $(JOYCOPT) $(LAYERCOPT) $(LUACOPT)
LOPT = -static -m68020-60 -lSDL_image `$(prefix)/bin/sdl-config --libs` -L$(prefix)/lib -ltiff -ljpeg `$(prefix)/bin/libpng12-config --libs` -lz -lm $(TTFLOPT) -lfreetype $(LUALOPT) $(LAYERLOPT)
else
# Finally, the default rules that work fine for most unix/gcc systems, linux and freebsd are tested. # Finally, the default rules that work fine for most unix/gcc systems, linux and freebsd are tested.
# Linux and FreeBSD specific (default rules) # Linux and FreeBSD specific (default rules)
DELCOMMAND = rm -rf DELCOMMAND = rm -rf
@ -272,8 +289,8 @@ else
PLATFORM = m68k-atari-mint PLATFORM = m68k-atari-mint
STRIP = m68k-atari-mint-strip -s STRIP = m68k-atari-mint-strip -s
X11LOPT = X11LOPT =
COPT = -W -Wall -m68020-60 -fomit-frame-pointer -pedantic -std=c99 -Wdeclaration-after-statement -D__MINT__ -DNO_INLINE_MATH -O$(OPTIM) -c -I$(prefix)/include `$(prefix)/bin/libpng12-config --cflags` `$(prefix)/bin/sdl-config --cflags` $() $(JOYCOPT) $(LAYERCOPT) $(LUACOPT) COPT = -W -Wall -m68020-60 -fomit-frame-pointer -std=c99 -Wdeclaration-after-statement -D__MINT__ -ffast-math -O$(OPTIM) -c -I$(prefix)/include `$(prefix)/bin/libpng12-config --cflags` `$(prefix)/bin/sdl-config --cflags` $(JOYCOPT) $(LAYERCOPT) $(LUACOPT)
LOPT = -static -m68020-60 -lSDL_image `$(prefix)/bin/sdl-config --libs` -L$(prefix)/lib -ltiff -ljpeg `$(prefix)/bin/libpng12-config --libs` -lz -lm $(TTFLOPT) -lfreetype $(LUALOPT) $(LAYERLOPT) LOPT = -static -m68020-60 -lSDL_image `$(prefix)/bin/sdl-config --libs` -L$(prefix)/lib -ltiff -ljpeg `$(prefix)/bin/libpng12-config --libs` -lz -lm $(TTFLOPT) -lfreetype $(LUALOPT) -lm $(LAYERLOPT) -Wl,--stack,32k
else else
# Compiles a regular linux executable for the native platform # Compiles a regular linux executable for the native platform
@ -298,6 +315,7 @@ else
endif endif
endif endif
endif endif
endif
endif endif
### BUILD SETTINGS are set according to vars set in the platform selection, ### BUILD SETTINGS are set according to vars set in the platform selection,

5
src/fileformats.c
View File

@ -46,6 +46,11 @@
#endif #endif
#endif #endif
#ifndef png_jmpbuf
# define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
#endif
#include <stdlib.h> #include <stdlib.h>
#include "errors.h" #include "errors.h"

5
src/filesel.c
View File

@ -437,7 +437,7 @@ void Read_list_of_files(T_Fileselector *list, byte selected_format)
} }
if(!bFound){ if(!bFound){
Add_element_to_list(list, "..",1,Format_filename("/",19,1),ICON_NONE); // add if not present Add_element_to_list(list, "..",Format_filename("/",19,1),1,ICON_NONE); // add if not present
list->Nb_directories ++; list->Nb_directories ++;
} }
@ -1401,8 +1401,9 @@ byte Button_Load_or_Save(byte load, T_IO_Context *context)
if (load) if (load)
{ {
#if defined(__MINT__) #if defined(__MINT__)
chdir(Main_current_directory);
static char path[1024]={0}; static char path[1024]={0};
chdir(Main_current_directory);
Dgetpath(path,0); Dgetpath(path,0);
strcat(path,PATH_SEPARATOR); strcat(path,PATH_SEPARATOR);
strcpy(Main_current_directory,path); strcpy(Main_current_directory,path);

3
src/misc.c
View File

@ -754,11 +754,8 @@ void Zoom_a_line(byte* original_line, byte* zoomed_line,
// atari have two kinds of memory // atari have two kinds of memory
// standard and fast ram // standard and fast ram
void Atari_Memory_free(unsigned long *stRam,unsigned long *ttRam){ void Atari_Memory_free(unsigned long *stRam,unsigned long *ttRam){
//TODO: return STRAM/TT-RAM
unsigned long mem=0;
*stRam=Mxalloc(-1L,0); *stRam=Mxalloc(-1L,0);
*ttRam = Mxalloc(-1L,1); *ttRam = Mxalloc(-1L,1);
} }
#else #else
// Indique quelle est la mémoire disponible // Indique quelle est la mémoire disponible

5
src/misc.h
View File

@ -146,8 +146,11 @@ dword Timer_start; // Heure de d
byte New_preview_is_needed; // Booléen "Il faut relancer le chrono de preview" byte New_preview_is_needed; // Booléen "Il faut relancer le chrono de preview"
#if defined (__MINT__)
void Atari_Memory_free(unsigned long *stRam,unsigned long *ttRam);
#else
unsigned long Memory_free(void); unsigned long Memory_free(void);
#endif
#define Num2str(a,b,c) sprintf(b,"%*lu",c,(long)(a)) #define Num2str(a,b,c) sprintf(b,"%*lu",c,(long)(a))
#define Dec2str(a,b,c) sprintf(b,"%.*f",c,(double)(a)) #define Dec2str(a,b,c) sprintf(b,"%.*f",c,(double)(a))