Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update .gitignore. Build fixes for png2smzx under Windows.

  • Loading branch information...
commit a93868aeb8b37bd2ea69aa78534141963e8274bc 1 parent be42770
@ajs1984 authored
View
2  .gitignore
@@ -28,5 +28,7 @@ src/utils/hlp2txt.exe
src/utils/hlp2txt
src/utils/txt2hlp.exe
src/utils/txt2hlp
+src/utils/png2smzx.exe
+src/utils/png2smzx
stdout.txt
stderr.txt
View
4 src/pngops.h
@@ -26,8 +26,8 @@ __M_BEGIN_DECLS
#include <png.h>
-#if !defined(NEED_PNG_READ_FILE) && defined(CONFIG_SDL) && \
- defined(CONFIG_ICON) && !defined(__WIN32__)
+#if (defined(CONFIG_SDL) && defined(CONFIG_ICON) && !defined(__WIN32__)) || \
+ defined(CONFIG_UTILS)
#define NEED_PNG_READ_FILE
#endif
View
2  src/utils/Makefile.in
@@ -14,7 +14,7 @@ include contrib/unzip/src/Makefile.in
utils_src = src/utils
utils_obj = src/utils/.build
-utils_cflags := -DNEED_PNG_READ_FILE ${LIBPNG_CFLAGS}
+utils_cflags := ${LIBPNG_CFLAGS}
checkres := ${utils_src}/checkres${BINEXT}
checkres_objs := ${utils_obj}/checkres.o ${core_obj}/fsafeopen.o
View
6 src/utils/png2smzx.c
@@ -23,6 +23,12 @@
#include "pngops.h"
#include "smzxconv.h"
+// FIXME: Fix this better
+int error(const char *string, unsigned int type, unsigned int options,
+ unsigned int code) {
+ return 0;
+}
+
static bool dummy_constraint(png_uint_32 w, png_uint_32 h) {
return true;
}
Please sign in to comment.
Something went wrong with that request. Please try again.