Starting to update the tarball and rpm spec files for 2.5. Mostly

[wxWidgets.git] / contrib / samples / ogl / ogledit / makefile.gcc

diff --git a/contrib/samples/ogl/ogledit/makefile.gcc b/contrib/samples/ogl/ogledit/makefile.gcc
index 4aad42a5dbd516d01fa4b716586b33d55e8135e8..76412f29a0d2b03e80b87dd19da435ed222e961d 100644 (file)
--- a/contrib/samples/ogl/ogledit/makefile.gcc
+++ b/contrib/samples/ogl/ogledit/makefile.gcc
@@ -14,10 +14,11 @@ include ../../../../build/msw/config.gcc
 
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
+OGLEDIT_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 -I.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \
+       $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_ogledit.o \
        $(OBJS)\ogledit_doc.o \
@@ -99,6 +100,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