regenerated after adding gzstream.* and vidmode.h

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

diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc
index 6fbc53bb111f75fd64099a5c0f137cd9d7ba12c4..76c2cf408c915dba1f1913e642e4a1c05b3f3d32 100644 (file)
--- a/samples/layout/makefile.gcc
+++ b/samples/layout/makefile.gcc
@@ -15,7 +15,8 @@ include ../../build/msw/config.gcc
 LAYOUT_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \
+       $(__EXCEPTIONSFLAG_5)
 LAYOUT_OBJECTS =  \
        $(OBJS)\layout_layout.o \
        $(OBJS)\layout_layout_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