set m_encoding in wxCSConv ctor from name

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

diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat
index 2c67eea43fa90c52f4e155c6e97b66c24b38b9c0..317e11370c020e58f98bb4cf2cb284e7fa3eba6c 100644 (file)
--- a/samples/docview/makefile.wat
+++ b/samples/docview/makefile.wat
@@ -201,7 +201,7 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 26
+WX_RELEASE_NODOT = 27
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -247,13 +247,13 @@ $(OBJS)\docview.exe :  $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
        wlink @$(OBJS)\docview.lbc
 
 $(OBJS)\docview_docview.obj :  .AUTODEPEND .\docview.cpp
-       $(CXX) -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<
 
 $(OBJS)\docview_doc.obj :  .AUTODEPEND .\doc.cpp
-       $(CXX) -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<
 
 $(OBJS)\docview_view.obj :  .AUTODEPEND .\view.cpp
-       $(CXX) -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $<
 
 $(OBJS)\docview_docview.res :  .AUTODEPEND .\docview.rc
        wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<