[gtkmm/gtkmm-3-24] NMake Makefiles: Fix 32-bit Visual Studio 2017 builds



commit df770447fceca22a88c486a61491c00e27490e00
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jun 17 12:29:24 2020 +0800

    NMake Makefiles: Fix 32-bit Visual Studio 2017 builds
    
    We need to disable /EHsc in the compiler flags when building gtkmm-demo,
    because it turns out that the linking will fail with an internal compiler error
    like on Visual Studio 2015 32-bit builds.
    
    The x64 builds on Visual Studio 2015 and later and 32-bit builds on Visual
    Studio 2019 build and run as expected.

 MSVC_NMake/config-msvc.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 5460b47f..98824852 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -156,9 +156,9 @@ GTKMM_DEMO_CFLAGS = \
        $(GTKMM_BASE_CFLAGS)    \
        $(GTKMM_INCLUDES)
 
-# With /EHsc, gtkmm3-demo fails on VS 2015 32 bit
+# With /EHsc, gtkmm3-demo fails on VS 2015 and 2017 32 bit
 # with an internal compiler error...
-!if "$(VSVER)" == "14" && "$(PLAT)" == "Win32"
+!if $(VSVER) < 16 && "$(PLAT)" == "Win32"
 GTKMM_DEMO_CFLAGS = $(GTKMM_DEMO_CFLAGS:/EHsc=)
 !endif
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]