fix for previous commit

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

diff --git a/utils/HelpGen/src/makefile.vc b/utils/HelpGen/src/makefile.vc
index d21b25017764e88ba63efdd2c0380fb1001aed6c..20d4d9a32b2fdcc60cd9d113cab879429117f452 100644 (file)
--- a/utils/HelpGen/src/makefile.vc
+++ b/utils/HelpGen/src/makefile.vc
@@ -16,7 +16,8 @@ HELPGEN_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\HelpGen.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)
 HELPGEN_OBJECTS =  \
        $(OBJS)\HelpGen_HelpGen.obj \
        $(OBJS)\HelpGen_cjparser.obj \
@@ -114,6 +115,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