Typos fixed and further clarification of the Python situation on Panther

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

diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc
index 99519573c4034d68c66fba2a2a86a5820c9686ea..ae508d9af064d86aeb1038434141c1eff94ca46f 100644 (file)
--- a/samples/oleauto/makefile.gcc
+++ b/samples/oleauto/makefile.gcc
@@ -14,10 +14,11 @@ include ../../build/msw/config.gcc
 
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OLEAUTO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
+OLEAUTO_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)
 OLEAUTO_OBJECTS =  \
        $(OBJS)\oleauto_oleauto.o \
        $(OBJS)\oleauto_oleauto_rc.o
@@ -96,6 +97,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