regenerated after adding gzstream.* and vidmode.h

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

diff --git a/utils/HelpGen/src/makefile.gcc b/utils/HelpGen/src/makefile.gcc
index 23cf6061a8253a114401b4a6054f38987daf7bae..3a8b42021ab48916fd4d5289be3d7632f76fbdcd 100644 (file)
--- a/utils/HelpGen/src/makefile.gcc
+++ b/utils/HelpGen/src/makefile.gcc
@@ -15,7 +15,7 @@ include ../../../build/msw/config.gcc
 HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \
-       $(__DLLFLAG_p) $(CXXFLAGS)
+       $(__DLLFLAG_p) $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5)
 HELPGEN_OBJECTS =  \
        $(OBJS)\HelpGen_HelpGen.o \
        $(OBJS)\HelpGen_cjparser.o \
@@ -91,6 +91,18 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_4 = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_4 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_5 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_5 = 
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif