set m_encoding in wxCSConv ctor from name

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

diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat
index 0710a2e2e1d317cd566618ed4a4bcb5df41f0e15..666e8c7f7014922d29affecc64ab98567c453e1e 100644 (file)
--- a/samples/layout/makefile.wat
+++ b/samples/layout/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)
@@ -245,8 +245,8 @@ $(OBJS)\layout.exe :  $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
        wlink @$(OBJS)\layout.lbc
 
 $(OBJS)\layout_layout.obj :  .AUTODEPEND .\layout.cpp
-       $(CXX) -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $<
 
 $(OBJS)\layout_layout.res :  .AUTODEPEND .\layout.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 $<
+       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 $<