Mercurial > molko
changeset 17:fc71221b7bee
core: minimal cleanups
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 08 Jan 2020 20:08:17 +0100 |
| parents | 621c815c9509 |
| children | 3ddd3acfe0e9 |
| files | INSTALL.md Makefile src/font.h src/sprite.h src/texture.h |
| diffstat | 5 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/INSTALL.md Tue Jan 07 21:45:03 2020 +0100 +++ b/INSTALL.md Wed Jan 08 20:08:17 2020 +0100 @@ -38,7 +38,7 @@ - *make* - *mingw-w64-x86_64-gcc* -- *mingw-w64-x86_64-expat* +- *mingw-w64-x86_64-expat* (only for molko-map tool) - *mingw-w64-x86_64-SDL2* - *mingw-w64-x86_64-SDL2_image* - *mingw-w64-x86_64-SDL2_mixer*
--- a/Makefile Tue Jan 07 21:45:03 2020 +0100 +++ b/Makefile Wed Jan 08 20:08:17 2020 +0100 @@ -78,7 +78,8 @@ ${CC} -o $@ $< ${CFLAGS} ${EXPAT_CFLAGS} ${EXPAT_LDFLAGS} clean: - rm -f molko ${LIB} ${OBJS} ${DEPS} + rm -f ${PROG} src/main.o src/main.d + rm -f ${LIB} ${OBJS} ${DEPS} rm -f ${TESTS_OBJS} ${TESTS_DEPS} rm -f ${TOOLS_OBJS} ${TOOLS_DEPS}
--- a/src/font.h Tue Jan 07 21:45:03 2020 +0100 +++ b/src/font.h Wed Jan 08 20:08:17 2020 +0100 @@ -25,6 +25,7 @@ */ #include <stddef.h> +#include <stdint.h> struct font; struct texture;
--- a/src/sprite.h Tue Jan 07 21:45:03 2020 +0100 +++ b/src/sprite.h Wed Jan 08 20:08:17 2020 +0100 @@ -37,7 +37,6 @@ uint16_t cellh; /* Height per cell (RW) */ uint16_t nrows; /* Number of rows (RW) */ uint16_t ncols; /* Number of columns (RW) */ - }; /**
--- a/src/texture.h Tue Jan 07 21:45:03 2020 +0100 +++ b/src/texture.h Wed Jan 08 20:08:17 2020 +0100 @@ -16,6 +16,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifndef MOLKO_TEXTURE_H +#define MOLKO_TEXTURE_H + struct texture; /** @@ -71,3 +74,5 @@ */ void texture_close(struct texture *tex); + +#endif /* !MOLKO_TEXTURE_H */