summaryrefslogtreecommitdiff
path: root/scripts/makefile.mingw
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-11-25 08:51:04 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-11-25 08:51:04 -0600
commitde5c932283c8ff0484ecfc2fb7d05490ab540133 (patch)
tree07f03509a605fc5e4ec448bd3709705eb06cd51b /scripts/makefile.mingw
parent3b673e0fb0b96d0ca8aa162276e4848809105ea4 (diff)
downloadlibpng-de5c932283c8ff0484ecfc2fb7d05490ab540133.tar.gz
[master] Disabled the new pedantic warnings
about deprecated function use and deprecated structure access unless the user defines PNG_PEDANTIC_WARNINGS. Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files. Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects since the warnings no longer depend on this.
Diffstat (limited to 'scripts/makefile.mingw')
-rw-r--r--scripts/makefile.mingw6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index e6d45f230..212379aee 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -62,15 +62,15 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
### if you don't need thread safety, but want the asm accel
-#CFLAGS= -DPNG_CONFIGURE_LIBPNG $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \
+#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \
# $(addprefix -I,$(ZLIBINC)) -W -Wall -O $(ALIGN) -funroll-loops \
# -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
### if you need thread safety and want (minimal) asm accel
-#CFLAGS= -DPNG_CONFIGURE_LIBPNG $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
+#CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
# -W -Wall -O $(ALIGN) -funroll-loops \
# -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
### Normal (non-asm) compilation
-CFLAGS= -DPNG_CONFIGURE_LIBPNG $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
+CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
-W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \
-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5