regenerated after adding gzstream.* and vidmode.h

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

diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc
index 047230fd83a341ca5ee47d5ef54aa6b8c9b9a355..22a8a668f2bae4df4f38a91bde29ec6308e6065b 100644 (file)
--- a/samples/typetest/makefile.gcc
+++ b/samples/typetest/makefile.gcc
@@ -19,7 +19,8 @@ SETUPHDIR = \
 TYPETEST_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)
 TYPETEST_OBJECTS =  \
        $(OBJS)\typetest_typetest.o \
        $(OBJS)\typetest_typetest_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