regenerated after adding gzstream.* and vidmode.h

[wxWidgets.git] / samples / taskbar / makefile.wat

diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat
index 545137092d1294ffe00c4c109cd28cebe4ee4470..09053ffffb2128b07d6502a8c9c5f38067811d15 100644 (file)
--- a/samples/taskbar/makefile.wat
+++ b/samples/taskbar/makefile.wat
@@ -109,6 +109,13 @@ __DLLFLAG_p =
 !ifeq SHARED 1
 __DLLFLAG_p = -dWXUSINGDLL
 !endif
 !ifeq SHARED 1
 __DLLFLAG_p = -dWXUSINGDLL
 !endif

+__EXCEPTIONSFLAG_7 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_7 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_7 = -xs
+!endif

 __LIB_JPEG_p =
 !ifeq USE_GUI 1
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 __LIB_JPEG_p =
 !ifeq USE_GUI 1
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib


@@ -172,7 +179,7 @@ SETUPHDIR = &
 TASKBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) &
 TASKBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) &

-       -i=.\..\..\samples $(CXXFLAGS)
+       -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7)

 TASKBAR_OBJECTS =  &
        $(OBJS)\taskbar_tbtest.obj
 
 TASKBAR_OBJECTS =  &
        $(OBJS)\taskbar_tbtest.obj