Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat
index 6f0f375bc85695808164765cfaefa439cb98b468..7ea137cc0ffee3f6b0210a0177e4943a12f0e6cc 100644 (file)
--- a/samples/menu/makefile.wat
+++ b/samples/menu/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


@@ -160,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-MENU_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)
+MENU_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)

 MENU_OBJECTS =  &
        $(OBJS)\menu_menu.obj
 OBJS = &
 MENU_OBJECTS =  &
        $(OBJS)\menu_menu.obj
 OBJS = &