added .chm support for Unix (Markus Sinner)

[wxWidgets.git] / contrib / utils / wxrc / makefile.gcc

diff --git a/contrib/utils/wxrc/makefile.gcc b/contrib/utils/wxrc/makefile.gcc
index f395370e525405af5c3a1646e9abbcb28fe63008..c7ba420ca34766f4db34c1a53230dd8e1a14de02 100644 (file)
--- a/contrib/utils/wxrc/makefile.gcc
+++ b/contrib/utils/wxrc/makefile.gcc
@@ -19,7 +19,7 @@ SETUPHDIR = \
 WXRC_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)
 WXRC_OBJECTS =  \
        $(OBJS)\wxrc_wxrc.o
 
@@ -84,6 +84,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