From 071a17f194c0633609a3085f32fc58f54a9fbc4c Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 21 Jul 2014 11:27:26 -0500 Subject: [PATCH] [libpng16] Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32 (bug report from Wolfgang S. Kechel). Bug was introduced in libpng-1.6.11. Also fixed makefile.bc32, makefile.bor, makefile.msc, makefile.intel, and makefile.tc3 similarly. --- ANNOUNCE | 10 ++++++---- CHANGES | 9 ++++++--- scripts/makefile.bc32 | 4 ++-- scripts/makefile.bor | 4 ++-- scripts/makefile.intel | 2 +- scripts/makefile.msc | 2 +- scripts/makefile.tc3 | 2 +- scripts/makefile.vcwin32 | 2 +- 8 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 6789f2e32..bf3e78a0f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,4 @@ - -Libpng 1.6.13beta02 - July 4, 2014 +Libpng 1.6.13beta02 - July 21, 2014 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -38,7 +37,11 @@ Version 1.6.13beta01 [July 4, 2014] "if (defined(__ARM_NEON__) || defined(__ARM_NEON))" (James Wu). Fixed clang no-warning builds: png_digit was defined but never used. -Version 1.6.13beta02 [July 4, 2014] +Version 1.6.13beta02 [July 21, 2014] + Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32 + (bug report from Wolfgang S. Kechel). Bug was introduced in libpng-1.6.11. + Also fixed makefile.bc32, makefile.bor, makefile.msc, makefile.intel, and + makefile.tc3 similarly. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -47,4 +50,3 @@ to subscribe) or to glennrp at users.sourceforge.net Glenn R-P -#endif diff --git a/CHANGES b/CHANGES index 9bd92b57c..e12a838b5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -#if 0 + CHANGES - changes for libpng Version 0.2 @@ -4952,7 +4952,11 @@ Version 1.6.13beta01 [July 4, 2014] "if (defined(__ARM_NEON__) || defined(__ARM_NEON))" (James Wu). Fixed clang no-warning builds: png_digit was defined but never used. -Version 1.6.13beta02 [July 4, 2014] +Version 1.6.13beta02 [July 21, 2014] + Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32 + (bug report from Wolfgang S. Kechel). Bug was introduced in libpng-1.6.11. + Also fixed makefile.bc32, makefile.bor, makefile.msc, makefile.intel, and + makefile.tc3 similarly. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -4961,4 +4965,3 @@ to subscribe) or to glennrp at users.sourceforge.net Glenn R-P -#endif diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32 index 6fece9cd8..cefbef005 100644 --- a/scripts/makefile.bc32 +++ b/scripts/makefile.bc32 @@ -51,8 +51,8 @@ CFLAGS=-O2 -d -k- -w $(TARGET_CPU) $(CDEBUG) LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG) # Pre-built configuration -# See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +# See scripts\pnglibconf.mak for more options +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt ## Variables OBJS = \ diff --git a/scripts/makefile.bor b/scripts/makefile.bor index 254de89e8..c4eed602c 100644 --- a/scripts/makefile.bor +++ b/scripts/makefile.bor @@ -59,8 +59,8 @@ CFLAGS=-O2 -Z -X- -w -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG) LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG) # Pre-built configuration -# See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +# See scripts\pnglibconf.mak for more options +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt ## Variables diff --git a/scripts/makefile.intel b/scripts/makefile.intel index 9fa963f50..b6f229a7a 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -40,7 +40,7 @@ CP=cp # Pre-built configuration # See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt O=.obj diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 6e30e81b1..7bc215244 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc @@ -21,7 +21,7 @@ O=.obj # Pre-built configuration # See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt #uncomment next to put error messages in a file ERRFILE= >> pngerrs diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3 index e4744a774..97359a46a 100644 --- a/scripts/makefile.tc3 +++ b/scripts/makefile.tc3 @@ -16,7 +16,7 @@ CP=copy # Pre-built configuration # See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt O=.obj E=.exe diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index b17f6a46f..aacb6ccbc 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -24,7 +24,7 @@ RM = del # Pre-built configuration # See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt # File extensions O=.obj