Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom

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

diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat
index 3036f380241aeba9c59ba26ac1d5fe20decba6a6..bac34ee83260a997982358d0514b2f965786ca23 100644 (file)
--- a/samples/memcheck/makefile.wat
+++ b/samples/memcheck/makefile.wat
@@ -109,6 +109,13 @@ __DLLFLAG_p =
 !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
@@ -160,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 ### Variables: ###
 
-MEMCHECK_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
+MEMCHECK_CXXFLAGS = $(__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 $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 MEMCHECK_OBJECTS =  &
        $(OBJS)\memcheck_memcheck.obj
 OBJS = &