regenerated after adding gzstream.* and vidmode.h

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

diff --git a/samples/console/makefile.gcc b/samples/console/makefile.gcc
index cb453664df66b7e19c3519678c35474f177d7711..971de4665fca315b575d7d42eafe0ee29a1e0f7a 100644 (file)
--- a/samples/console/makefile.gcc
+++ b/samples/console/makefile.gcc
@@ -15,7 +15,8 @@ include ../../build/msw/config.gcc
 CONSOLE_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) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
+       $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \
+       $(__EXCEPTIONSFLAG_5)
 CONSOLE_OBJECTS =  \
        $(OBJS)\console_console.o
 OBJS = \
@@ -84,6 +85,18 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 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