oreolek/adventin
Archived
1
0
Fork 0
Code Pull requests Releases Activity

more clever unzip, -Dunix

Browse source
This commit is contained in:
p.kosyh 2010-06-04 04:59:55 +00:00
parent 029f951efa
commit 915c25d1de
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Rules.make.standalone
View file

@ -26,7 +26,7 @@ LUA_LFLAGS=$(shell pkg-config --libs lua5.1)
SDL_CFLAGS=$(shell sdl-config --cflags)
SDL_LFLAGS=$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image
CFLAGS += -g -Wall -D_HAVE_ICONV -D_USE_UNPACK
CFLAGS += -g -Wall -D_HAVE_ICONV -Dunix -D_USE_UNPACK
INSTALLD=echo "Do not install standalone version!"
INSTALLB=echo "Do not install standalone version!"

2
Rules.make.system
View file

@ -27,7 +27,7 @@ LUA_LFLAGS=$(shell pkg-config --libs lua5.1)
SDL_CFLAGS=$(shell sdl-config --cflags)
SDL_LFLAGS=$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image
CFLAGS += -Wall -D_HAVE_ICONV -D_USE_UNPACK
CFLAGS += -Wall -Dunix -D_HAVE_ICONV -D_USE_UNPACK
INSTALLD=install -d -m 0755
INSTALLB=install -m 0755

7
src/sdl-instead/game.c
View file

@ -2376,7 +2376,12 @@ int game_from_disk(void)
p = game_local_games_path(1);
fprintf(stderr,"Trying to install: %s\n", g);
if (!unpack(g, p) && zip_game_dirname[0]) {
games_replace(p, zip_game_dirname);
if (games_replace(p, zip_game_dirname)) {
p = getpath(p, zip_game_dirname);
remove_dir(p);
free(p);
return -1;
}
p = zip_game_dirname;
#else
if (0) {