Setting the lib32_libscrnsavw_a_CFLAGS variable automatically turns off
usage of AM_CFLAGS variable for that target. As the AM_CFLAGS contains the
mingw-w64 CRT build flags, specify it manually in lib32_libscrnsavw_a_CFLAGS
variable. Do same for all architectures.
---
 mingw-w64-crt/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index ef5f636cf7ca..0415fa142f43 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -1418,7 +1418,7 @@ lib32_libscrnsave_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 lib32_LIBRARIES += lib32/libscrnsavw.a
 lib32_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
 lib32_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
-lib32_libscrnsavw_a_CFLAGS = -DUNICODE
+lib32_libscrnsavw_a_CFLAGS = $(AM_CFLAGS) -DUNICODE
 
 lib32_LIBRARIES += lib32/libstrmiids.a
 lib32_libstrmiids_a_SOURCES = $(src_libstrmiids)
@@ -1846,7 +1846,7 @@ lib64_libscrnsave_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 lib64_LIBRARIES += lib64/libscrnsavw.a
 lib64_libscrnsavw_a_SOURCES = libsrc/scrnsave.c
 lib64_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
-lib64_libscrnsavw_a_CFLAGS = -DUNICODE
+lib64_libscrnsavw_a_CFLAGS = $(AM_CFLAGS) -DUNICODE
 
 lib64_LIBRARIES += lib64/libstrmiids.a
 lib64_libstrmiids_a_SOURCES = $(src_libstrmiids)
@@ -2223,7 +2223,7 @@ libarm32_libscrnsave_a_CPPFLAGS=$(CPPFLAGSARM32) 
$(sysincludes)
 libarm32_LIBRARIES += libarm32/libscrnsavw.a
 libarm32_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
 libarm32_libscrnsavw_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
-libarm32_libscrnsavw_a_CFLAGS = -DUNICODE
+libarm32_libscrnsavw_a_CFLAGS = $(AM_CFLAGS) -DUNICODE
 
 libarm32_LIBRARIES += libarm32/libstrmiids.a
 libarm32_libstrmiids_a_SOURCES = $(src_libstrmiids)
@@ -2548,7 +2548,7 @@ libarm64_libscrnsave_a_CPPFLAGS=$(CPPFLAGSARM64) 
$(sysincludes)
 libarm64_LIBRARIES += libarm64/libscrnsavw.a
 libarm64_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
 libarm64_libscrnsavw_a_CPPFLAGS=$(CPPFLAGSARM64) $(sysincludes)
-libarm64_libscrnsavw_a_CFLAGS = -DUNICODE
+libarm64_libscrnsavw_a_CFLAGS = $(AM_CFLAGS) -DUNICODE
 
 libarm64_LIBRARIES += libarm64/libstrmiids.a
 libarm64_libstrmiids_a_SOURCES = $(src_libstrmiids)
-- 
2.20.1



_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to