Applied patch [ 853031 ] Japanese po file

[wxWidgets.git] / samples / mobile / styles / makefile.wat

diff --git a/samples/mobile/styles/makefile.wat b/samples/mobile/styles/makefile.wat
index 188bcfd9d6bc5698a8f1709152ac7bacb8b8210b..36aac75b63a7e8a520898a72d6155258fa010da4 100644 (file)
--- a/samples/mobile/styles/makefile.wat
+++ b/samples/mobile/styles/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


@@ -137,7 +144,7 @@ __RUNTIME_LIBS_5 =
 !endif
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 !endif
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1

-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -d_UNICODE

 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0


@@ -164,10 +171,10 @@ OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

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

 STYLES_OBJECTS =  &
        $(OBJS)\styles_styles.obj
 
 STYLES_OBJECTS =  &
        $(OBJS)\styles_styles.obj
 


@@ -181,7 +188,7 @@ $(OBJS) :
 all : .SYMBOLIC $(OBJS)\styles.exe data
 
 $(OBJS)\styles_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
 all : .SYMBOLIC $(OBJS)\styles.exe data
 
 $(OBJS)\styles_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<
+       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<

 
 $(OBJS)\styles_styles.obj :  .AUTODEPEND .\styles.cpp
        $(CXX) -zq -fo=$^@ $(STYLES_CXXFLAGS) $<
 
 $(OBJS)\styles_styles.obj :  .AUTODEPEND .\styles.cpp
        $(CXX) -zq -fo=$^@ $(STYLES_CXXFLAGS) $<


@@ -204,6 +211,6 @@ $(OBJS)\styles.exe :  $(STYLES_OBJECTS) $(OBJS)\styles_sample.res
        @%append $(OBJS)\styles.lbc option caseexact
        @%append $(OBJS)\styles.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(STYLES_OBJECTS)) do @%append $(OBJS)\styles.lbc file %i
        @%append $(OBJS)\styles.lbc option caseexact
        @%append $(OBJS)\styles.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(STYLES_OBJECTS)) do @%append $(OBJS)\styles.lbc file %i

-       @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\styles.lbc library %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\styles.lbc library %i

        @%append $(OBJS)\styles.lbc option resource=$(OBJS)\styles_sample.res
        wlink @$(OBJS)\styles.lbc
        @%append $(OBJS)\styles.lbc option resource=$(OBJS)\styles_sample.res
        wlink @$(OBJS)\styles.lbc