From 7d39b69e83f1d7d481e1c5abcb5b295c6ab7c5d4 Mon Sep 17 00:00:00 2001
From: "p.kosyh"
Date: Tue, 19 Apr 2011 10:57:52 +0000
Subject: [PATCH] cleanups
---
instead.mmp | 2 +-
src/sdl-instead/SDL_anigif.c | 4 ++--
src/sdl-instead/graphics.c | 1 +
src/sdl-instead/idf.c | 2 +-
src/sdl-instead/idf.h | 4 +---
src/sdl-instead/s60.h | 4 ++++
src/sdl-instead/sdl_idf.h | 7 +++++++
src/sdl-instead/sound.c | 2 +-
src/sdl-instead/util.c | 2 +-
src/sdl-instead/util.h | 1 -
10 files changed, 19 insertions(+), 10 deletions(-)
create mode 100644 src/sdl-instead/sdl_idf.h
diff --git a/instead.mmp b/instead.mmp
index e7c0e61..516f6bc 100644
--- a/instead.mmp
+++ b/instead.mmp
@@ -14,7 +14,7 @@ SYSTEMINCLUDE /epoc32/include/libc /epoc32/include/esdl /epoc32/include/mmf/plu
sourcepath ./src/sdl-instead
SOURCE symbian.cpp
-SOURCE graphics.c input.c game.c main.c instead.c sound.c SDL_rotozoom.c SDL_anigif.c SDL_gfxBlitFunc.c config.c themes.c menu.c util.c cache.c unzip.c ioapi.c unpack.c s60.c lfs.c
+SOURCE graphics.c input.c game.c main.c instead.c sound.c SDL_rotozoom.c SDL_anigif.c SDL_gfxBlitFunc.c config.c themes.c menu.c util.c cache.c unzip.c ioapi.c unpack.c s60.c lfs.c idf.c
SOURCE snprintf.c
USERINCLUDE ./src/sdl-instead
diff --git a/src/sdl-instead/SDL_anigif.c b/src/sdl-instead/SDL_anigif.c
index c8f801d..22b5965 100644
--- a/src/sdl-instead/SDL_anigif.c
+++ b/src/sdl-instead/SDL_anigif.c
@@ -21,8 +21,8 @@
#include
#include
#include "SDL_anigif.h"
-#include "util.h"
-#include "idf.h"
+#include "sdl_idf.h"
+
extern idf_t game_idf;
/* Code from here to end of file has been adapted from XPaint: */
diff --git a/src/sdl-instead/graphics.c b/src/sdl-instead/graphics.c
index b852d18..a266047 100644
--- a/src/sdl-instead/graphics.c
+++ b/src/sdl-instead/graphics.c
@@ -8,6 +8,7 @@
#include "SDL_rotozoom.h"
#include "SDL_gfxBlitFunc.h"
#include "SDL_anigif.h"
+#include "sdl_idf.h"
#define Surf(p) ((SDL_Surface *)p)
diff --git a/src/sdl-instead/idf.c b/src/sdl-instead/idf.c
index fb86842..4f15902 100644
--- a/src/sdl-instead/idf.c
+++ b/src/sdl-instead/idf.c
@@ -2,7 +2,7 @@
#include "internals.h"
#include "idf.h"
#include "list.h"
-#include
+#include
typedef struct _idfd_t {
unsigned long offset;
diff --git a/src/sdl-instead/idf.h b/src/sdl-instead/idf.h
index b100c3b..193ff17 100644
--- a/src/sdl-instead/idf.h
+++ b/src/sdl-instead/idf.h
@@ -1,6 +1,5 @@
#ifndef __IDF_H_INCLUDED
#define __IDF_H_INCLUDED
-#include
struct _idf_t;
struct _idff_t;
@@ -11,7 +10,6 @@ extern idf_t idf_init(const char *path);
extern void idf_shrink(idf_t idf);
extern void idf_done(idf_t idf);
-extern SDL_RWops *RWFromIdf(idf_t idf, const char *fname);
extern int idf_create(const char *file, const char *path);
extern idff_t idf_open(idf_t idf, const char *fname);
@@ -26,4 +24,4 @@ extern char *idf_gets(idff_t idf, char *b, int size);
extern int idf_magic(const char *fname);
extern int idf_only(idf_t idf, int fl);
-#endif
\ No newline at end of file
+#endif
diff --git a/src/sdl-instead/s60.h b/src/sdl-instead/s60.h
index 236c05e..9d895f9 100644
--- a/src/sdl-instead/s60.h
+++ b/src/sdl-instead/s60.h
@@ -8,4 +8,8 @@
#define GAMES_PATH DATAPATH"games/"
#define ICON_PATH DATAPATH"icon/"
#define LANG_PATH DATAPATH"lang/"
+
+extern char *dirname(char *);
+extern char *basename(char *);
+
#endif
diff --git a/src/sdl-instead/sdl_idf.h b/src/sdl-instead/sdl_idf.h
new file mode 100644
index 0000000..a95125f
--- /dev/null
+++ b/src/sdl-instead/sdl_idf.h
@@ -0,0 +1,7 @@
+#ifndef __SDL_IDF_H_INCLUDED
+#define __SDL_IDF_H_INCLUDED
+#include
+#include "idf.h"
+
+extern SDL_RWops *RWFromIdf(idf_t idf, const char *fname);
+#endif
diff --git a/src/sdl-instead/sound.c b/src/sdl-instead/sound.c
index b82f929..0dd4fc6 100644
--- a/src/sdl-instead/sound.c
+++ b/src/sdl-instead/sound.c
@@ -3,7 +3,7 @@
#include
#include
-#include "idf.h"
+#include "sdl_idf.h"
#ifdef S60
int audio_rate = 11025;
diff --git a/src/sdl-instead/util.c b/src/sdl-instead/util.c
index 757f689..df3b3b0 100644
--- a/src/sdl-instead/util.c
+++ b/src/sdl-instead/util.c
@@ -521,4 +521,4 @@ int remove_dir(const char *path)
closedir(d);
rmdir(path);
return 0;
-}
\ No newline at end of file
+}
diff --git a/src/sdl-instead/util.h b/src/sdl-instead/util.h
index f2a716b..bc1d52a 100644
--- a/src/sdl-instead/util.h
+++ b/src/sdl-instead/util.h
@@ -1,6 +1,5 @@
#ifndef __UTIL_H_INCLUDED
#define __UTIL_H_INCLUDED
-
#include "idf.h"
typedef int (*parser_fn)(const char *v, void *data);