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

replaced hardcoded lua script and libs paths with defines, Atari build stack adjustments (reduced it's size to 8k)

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1800 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
nokturnal 2011-06-15 22:40:43 +00:00
parent 7184fb857f
commit 78e1745ef1
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -290,7 +290,7 @@ else
STRIP = m68k-atari-mint-strip -s STRIP = m68k-atari-mint-strip -s
X11LOPT = X11LOPT =
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) 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) -lm $(LAYERLOPT) -Wl,--stack,32k 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,8k
else else
# Compiles a regular linux executable for the native platform # Compiles a regular linux executable for the native platform

6
src/factory.c
View File

@ -45,7 +45,7 @@
#include "graph.h" #include "graph.h"
#include "filesel.h" // Read_list_of_drives() #include "filesel.h" // Read_list_of_drives()
#include "realpath.h" #include "realpath.h"
#include "setup.h"
/// Lua scripts bound to shortcut keys. /// Lua scripts bound to shortcut keys.
char * Bound_script[10]; char * Bound_script[10];
@ -1491,8 +1491,8 @@ void Run_script(const char *script_subdirectory, const char *script_filename)
strcpy(buf, "LUA_PATH="); strcpy(buf, "LUA_PATH=");
strcat(buf, Data_directory); strcat(buf, Data_directory);
Append_path(buf+9, "scripts", NULL); Append_path(buf+9, SCRIPTS_SUBDIRECTORY, NULL);
Append_path(buf+9, "libs", NULL); Append_path(buf+9, LUALIB_SUBDIRECTORY, NULL);
Append_path(buf+9, "?.lua", NULL); Append_path(buf+9, "?.lua", NULL);
putenv(buf); putenv(buf);

2
src/readini.c
View File

@ -945,7 +945,7 @@ int Load_INI(T_Config * conf)
{ {
// Default when empty: // Default when empty:
Realpath(Data_directory, conf->Scripts_directory); Realpath(Data_directory, conf->Scripts_directory);
Append_path(conf->Scripts_directory, "scripts", NULL); Append_path(conf->Scripts_directory, SCRIPTS_SUBDIRECTORY, NULL);
} }
conf->Allow_multi_shortcuts=0; conf->Allow_multi_shortcuts=0;

1
src/setup.c
View File

@ -89,7 +89,6 @@ void Set_program_directory(ARG_UNUSED const char * argv0,char * program_dir)
#elif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) #elif defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__)
strcpy(program_dir,"PROGDIR:"); strcpy(program_dir,"PROGDIR:");
#elif defined(__MINT__) #elif defined(__MINT__)
static char path[1024]={0}; static char path[1024]={0};
char currentDrive='A'; char currentDrive='A';
currentDrive=currentDrive+Dgetdrv(); currentDrive=currentDrive+Dgetdrv();

16
src/setup.h
View File

@ -70,6 +70,22 @@ void Set_config_directory(const char * program_dir, char * config_dir);
#define SKINS_SUBDIRECTORY "skins" #define SKINS_SUBDIRECTORY "skins"
#endif #endif
/// Name of the subdirectory containing scripts
#if defined (__MINT__)
#define SCRIPTS_SUBDIRECTORY "SCRIPTS"
#else
#define SCRIPTS_SUBDIRECTORY "scripts"
#endif
/// LUA directory prefix
#if defined (__MINT__)
#define LUALIB_SUBDIRECTORY "LIBS"
#else
#define LUALIB_SUBDIRECTORY "libs"
#endif
/// Name of the binary file containing some configuration settings. /// Name of the binary file containing some configuration settings.
#if defined (__MINT__) #if defined (__MINT__)
#define CONFIG_FILENAME "GFX2.CFG" #define CONFIG_FILENAME "GFX2.CFG"