update from Tsolakos Stavros

[wxWidgets.git] / utils / wxrc / makefile.vc

diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc
index 2af1e10367b9b0a6ac0c89575950ea12f79ff542..ed0ec7631dfc9277d7a74818c132078a53f62763 100644 (file)
--- a/utils/wxrc/makefile.vc
+++ b/utils/wxrc/makefile.vc
@@ -20,7 +20,8 @@ WXRC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____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_CONSOLE $(CXXFLAGS) /GR /GX
+       /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE $(CXXFLAGS) \
+       $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9)
 WXRC_OBJECTS =  \
        $(OBJS)\wxrc_wxrc.obj
 
@@ -107,6 +108,18 @@ __DEBUG_DEFINE_p = /D__WXDEBUG__
 !if "$(SHARED)" == "1"
 __DLLFLAG_p = /DWXUSINGDLL
 !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