Fixed the code to actually work.

[wxWidgets.git] / contrib / samples / gizmos / dynsash / makefile.gcc

diff --git a/contrib/samples/gizmos/dynsash/makefile.gcc b/contrib/samples/gizmos/dynsash/makefile.gcc
index a7f46fd3a43e1feb5e37189b13046b8dfa2d3b2f..b9ad9ab4a991b9526a3f2d5f29711b4825d31935 100644 (file)
--- a/contrib/samples/gizmos/dynsash/makefile.gcc
+++ b/contrib/samples/gizmos/dynsash/makefile.gcc
@@ -15,7 +15,8 @@ include ../../../../build/msw/config.gcc
 DYNSASH_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 -I.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \
+       $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5)
 DYNSASH_OBJECTS =  \
        $(OBJS)\dynsash_sample_rc.o \
        $(OBJS)\dynsash_dynsash.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