added .chm support for Unix (Markus Sinner)

[wxWidgets.git] / contrib / build / xrc / makefile.gcc

diff --git a/contrib/build/xrc/makefile.gcc b/contrib/build/xrc/makefile.gcc
index 52bac58d8b7e732939aef8962aac44f67b1494e6..8574435610630bb45e6b151150839956c4bbed90 100644 (file)
--- a/contrib/build/xrc/makefile.gcc
+++ b/contrib/build/xrc/makefile.gcc
@@ -19,7 +19,8 @@ SETUPHDIR = \
 XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) -Wall \
-       -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS)
+       -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) \
+       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)
 XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_dummy.o \
        $(OBJS)\xrcdll_xmlres.o \
@@ -63,7 +64,8 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) -Wall \
        -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse \
-       -I..\..\src\xrc\expat\xmltok $(CXXFLAGS)
+       -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_0)
 XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_dummy.o \
        $(OBJS)\xrclib_xmlres.o \
@@ -168,6 +170,18 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_0 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_0 = 
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif