Applied patch [ 817317 ] fixes for errors and warnings reported by MinGW for utils

[wxWidgets.git] / utils / configtool / src / makefile.vc

diff --git a/utils/configtool/src/makefile.vc b/utils/configtool/src/makefile.vc
index 774b8784ea1c410c3b7435924e6fc314e7d38fdd..905e21e47879e3cef459ae5105b2bcc5d2d798e1 100644 (file)
--- a/utils/configtool/src/makefile.vc
+++ b/utils/configtool/src/makefile.vc
@@ -21,7 +21,8 @@ WXCONFIGTOOL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /I.\..\..\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
-       /I.\..\..\..\samples $(CXXFLAGS) /GR /GX
+       /I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \
+       $(__EXCEPTIONSFLAG_9)
 WXCONFIGTOOL_OBJECTS =  \
        $(OBJS)\wxconfigtool_sample.res \
        $(OBJS)\wxconfigtool_wxconfigtool.obj \
@@ -131,6 +132,18 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_8 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_8 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_9 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_9 = /GX
+!endif
 !if "$(USE_GUI)" == "1"
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif