Typos fixed and further clarification of the Python situation on Panther

[wxWidgets.git] / samples / docvwmdi / makefile.gcc

diff --git a/samples/docvwmdi/makefile.gcc b/samples/docvwmdi/makefile.gcc
index ddeadc01c42afa9890a0f87d314cbbace36e39ca..69bda58f06929374d2132ec79c4295338bee5c06 100644 (file)
--- a/samples/docvwmdi/makefile.gcc
+++ b/samples/docvwmdi/makefile.gcc
@@ -12,10 +12,11 @@ include ../../build/msw/config.gcc
 
 ### Variables: ###
 
-DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
+DOCVIEW_CXXFLAGS = $(__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) -I.\..\..\samples $(CXXFLAGS)
+       $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \
+       $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
 DOCVIEW_OBJECTS =  \
        $(OBJS)\docview_docview.o \
        $(OBJS)\docview_doc.o \
@@ -98,6 +99,18 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 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