removed unneeded wxWeakRefDynamic::AssignCopy() (last part of patch 1870445)

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

diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat
index 5a935ff3fad962095f5a42654c607da494abf7a6..3633b2772670e2c6d8f57ebc8f99105d877ee061 100644 (file)
--- a/samples/dataview/makefile.wat
+++ b/samples/dataview/makefile.wat
@@ -200,6 +200,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
@@ -255,7 +258,7 @@ $(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
        @%append $(OBJS)\dataview.lbc option caseexact
        @%append $(OBJS)\dataview.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i
-       @for %i in ( $(__WXLIB_ADV_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)\dataview.lbc library %i
+       @for %i in ( $(__WXLIB_ADV_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)\dataview.lbc library %i
        @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res
        @for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i
        wlink @$(OBJS)\dataview.lbc