diff --git a/ANNOUNCE b/ANNOUNCE index 9d5e66fbc..3c6f0e85e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta42 - November 7, 2014 +Libpng 1.7.0beta42 - November 14, 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. @@ -648,7 +648,11 @@ Version 1.7.0beta41 [November 7, 2014] png_do_swap(). Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" -Version 1.7.0beta42 [November 7, 2014] +Version 1.7.0beta42 [November 14, 2014] + The macros passed in the command line to Borland make were ignored if + similarly-named macros were already defined in makefiles. This behavior + is different from POSIX make and other make programs. Surround the + macro definitions with ifndef guards (Cosmin). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 357ea1af5..1760be3dc 100644 --- a/CHANGES +++ b/CHANGES @@ -4937,7 +4937,11 @@ Version 1.7.0beta41 [November 7, 2014] png_do_swap(). Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" -Version 1.7.0beta42 [November 7, 2014] +Version 1.7.0beta42 [November 14, 2014] + The macros passed in the command line to Borland make were ignored if + similarly-named macros were already defined in makefiles. This behavior + is different from POSIX make and other make programs. Surround the + macro definitions with ifndef guards (Cosmin). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32 index d488a54a0..bdbc4cb2f 100644 --- a/scripts/makefile.bc32 +++ b/scripts/makefile.bc32 @@ -52,7 +52,9 @@ LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG) # Pre-built configuration # See scripts\pnglibconf.mak for more options +!ifndef PNGLIBCONF_H_PREBUILT PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt +!endif ## Variables OBJS = \ diff --git a/scripts/makefile.bor b/scripts/makefile.bor index a01f73899..6693772db 100644 --- a/scripts/makefile.bor +++ b/scripts/makefile.bor @@ -60,7 +60,9 @@ LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG) # Pre-built configuration # See scripts\pnglibconf.mak for more options +!ifndef PNGLIBCONF_H_PREBUILT PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt +!endif ## Variables diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3 index c917a08f1..1d015026c 100644 --- a/scripts/makefile.tc3 +++ b/scripts/makefile.tc3 @@ -16,7 +16,9 @@ CP=copy # Pre-built configuration # See scripts\pnglibconf.mak for more options +!ifndef PNGLIBCONF_H_PREBUILT PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt +!endif O=.obj E=.exe