added conversions to/from UTF 16/32 LE/BE (patch 809685)

[wxWidgets.git] / demos / bombs / makefile.wat

diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat
index 866a04f9bb9a2daaaec548622743016378c62c78..3370113e824c7a0ab8a177e71f66322d8a97d818 100644 (file)
--- a/demos/bombs/makefile.wat
+++ b/demos/bombs/makefile.wat
@@ -137,7 +137,7 @@ __RUNTIME_LIBS_5 =
 !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
@@ -186,7 +186,7 @@ $(OBJS)\bombs_bombs.obj :  .AUTODEPEND .\bombs.cpp
        $(CXX) -zq -fo=$^@ $(BOMBS_CXXFLAGS) $<
 
 $(OBJS)\bombs_bombs.res :  .AUTODEPEND .\bombs.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)\bombs_bombs1.obj :  .AUTODEPEND .\bombs1.cpp
        $(CXX) -zq -fo=$^@ $(BOMBS_CXXFLAGS) $<
@@ -201,7 +201,7 @@ $(OBJS)\bombs.exe :  $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res
        @%append $(OBJS)\bombs.lbc option caseexact
        @%append $(OBJS)\bombs.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.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)\bombs.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)\bombs.lbc library %i
        @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res
        wlink @$(OBJS)\bombs.lbc