Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat
index 5a6fb1c54521b85e3a4e7ce8a2a9af9e9481978e..bac0f5631368af4317db09fc64d0c5ad5c6eee71 100644 (file)
--- a/samples/grid/makefile.wat
+++ b/samples/grid/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
@@ -165,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 ### Variables: ###
 
-GRID_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)
+GRID_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 &
+       $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 GRID_OBJECTS =  &
        $(OBJS)\grid_griddemo.obj
 OBJS = &