added .chm support for Unix (Markus Sinner)

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

diff --git a/contrib/build/deprecated/makefile.gcc b/contrib/build/deprecated/makefile.gcc
index c27b0b41435493ab605d40cac051822ecedd4877..e151737eba198ee5871fe991264052dd43308fa1 100644 (file)
--- a/contrib/build/deprecated/makefile.gcc
+++ b/contrib/build/deprecated/makefile.gcc
@@ -22,7 +22,8 @@ DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) -Wall \
        -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-       -I..\..\src\deprecated $(CXXFLAGS)
+       -I..\..\src\deprecated $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_0)
 DEPRECATEDDLL_OBJECTS =  \
        $(OBJS)\deprecateddll_dummy.o \
        $(OBJS)\deprecateddll_prop.o \
@@ -42,7 +43,8 @@ DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) -Wall \
-       -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS)
+       -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS) \
+       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)
 DEPRECATEDLIB_OBJECTS =  \
        $(OBJS)\deprecatedlib_dummy.o \
        $(OBJS)\deprecatedlib_prop.o \
@@ -122,6 +124,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