Don't accidentally compile miniz as a separate C file

libsdl-org · Jun 6, 2013 · 7b2b852 · 7b2b852
1 parent b5d7d6c
commit 7b2b852
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/IMG_png.c b/IMG_png.c
@@ -592,7 +592,7 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src)
 
 #ifdef SAVE_PNG
 
-#include "miniz.c"
+#include "miniz.h"
 
 int IMG_SavePNG(SDL_Surface *surface, const char *file)
 {

diff --git a/Makefile.am b/Makefile.am
@@ -25,7 +25,8 @@ libSDL2_image_la_SOURCES =	\
 	IMG_xpm.c		\
 	IMG_xv.c		\
 	IMG_webp.c		\
-	$(IMAGEIO_SOURCE)
+	$(IMAGEIO_SOURCE)	\
+	miniz.h
 
 EXTRA_DIST =			\
 	Android.mk		\
@@ -35,9 +36,8 @@ EXTRA_DIST =			\
 	VisualCE		\
 	Xcode			\
 	Xcode-iOS		\
-    miniz.c			\
 	IMG_xxx.c		\
-	IMG_UIImage.m		\
+	*.m			\
 	SDL2_image.spec		\
 	gcc-fat.sh		\
 	autogen.sh		\

diff --git a/Makefile.in b/Makefile.in
@@ -113,7 +113,7 @@ am__DEPENDENCIES_1 =
 am__libSDL2_image_la_SOURCES_DIST = IMG.c IMG_bmp.c IMG_gif.c \
 	IMG_jpg.c IMG_lbm.c IMG_pcx.c IMG_png.c IMG_pnm.c IMG_tga.c \
 	IMG_tif.c IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c \
-	IMG_ImageIO.m
+	IMG_ImageIO.m miniz.h
 @USE_IMAGEIO_TRUE@am__objects_1 = IMG_ImageIO.lo
 am_libSDL2_image_la_OBJECTS = IMG.lo IMG_bmp.lo IMG_gif.lo IMG_jpg.lo \
 	IMG_lbm.lo IMG_pcx.lo IMG_png.lo IMG_pnm.lo IMG_tga.lo \
@@ -389,7 +389,8 @@ libSDL2_image_la_SOURCES = \
 	IMG_xpm.c		\
 	IMG_xv.c		\
 	IMG_webp.c		\
-	$(IMAGEIO_SOURCE)
+	$(IMAGEIO_SOURCE)	\
+	miniz.h
 
 EXTRA_DIST = \
 	Android.mk		\
@@ -399,9 +400,8 @@ EXTRA_DIST = \
 	VisualCE		\
 	Xcode			\
 	Xcode-iOS		\
-    miniz.c			\
 	IMG_xxx.c		\
-	IMG_UIImage.m		\
+	*.m			\
 	SDL2_image.spec		\
 	gcc-fat.sh		\
 	autogen.sh		\

diff --git a/miniz.c → miniz.h b/miniz.c → miniz.h