updated bakefiles to take advantage of Bakefile 0.2.3 (now required)

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

diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat
index 79e8f4b37a4b4b3c9cffe5d2439627866c71b89a..69988853b0051412915ca0188ac76f22b6f6cb97 100644 (file)
--- a/samples/mediaplayer/makefile.wat
+++ b/samples/mediaplayer/makefile.wat
@@ -202,6 +202,9 @@ __THREAD_DEFINE_p =
 __THREAD_DEFINE_p = -dwxNO_THREADS
 !endif
 __UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
@@ -257,7 +260,7 @@ $(OBJS)\mediaplayer.exe :  $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res
        @%append $(OBJS)\mediaplayer.lbc option caseexact
        @%append $(OBJS)\mediaplayer.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(MEDIAPLAYER_OBJECTS)) do @%append $(OBJS)\mediaplayer.lbc file %i
-       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\mediaplayer.lbc library %i
+       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\mediaplayer.lbc library %i
        @%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res
        @for %i in () do @%append $(OBJS)\mediaplayer.lbc option stack=%i
        wlink @$(OBJS)\mediaplayer.lbc