Use wxScopedCharBuffer in To8BitData() in ANSI build too.

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

diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat
index bd2a1095e0bbb794d39fa18d0320714bb66b3f49..8c5280eeecfd71e549378db0d3f74540f10cef48 100644 (file)
--- a/samples/event/makefile.wat
+++ b/samples/event/makefile.wat
@@ -164,10 +164,6 @@ __LIB_PNG_p =
 !ifeq USE_GUI 1\r
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
 !endif\r
 !ifeq USE_GUI 1\r
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
 !endif\r

-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r

 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r
 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r


@@ -207,10 +203,6 @@ __UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
 !ifeq UNICODE 1\r
 __UNICODE_DEFINE_p = -d_UNICODE\r
 !endif\r
 !ifeq UNICODE 1\r
 __UNICODE_DEFINE_p = -d_UNICODE\r
 !endif\r

-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r

 ____CAIRO_INCLUDEDIR_FILENAMES =\r
 !ifeq USE_CAIRO 1\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r
 ____CAIRO_INCLUDEDIR_FILENAMES =\r
 !ifeq USE_CAIRO 1\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r


@@ -232,10 +224,10 @@ SETUPHDIR = &
 EVENT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
        $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
 EVENT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
        $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r

-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
-       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
-       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples &\r
-       -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &\r
+       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r

 EVENT_OBJECTS =  &\r
        $(OBJS)\event_event.obj\r
 \r
 EVENT_OBJECTS =  &\r
        $(OBJS)\event_event.obj\r
 \r


@@ -256,21 +248,21 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
 \r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\event.exe del $(OBJS)\event.exe\r
 \r

-$(OBJS)\event.exe :  $(EVENT_OBJECTS) $(OBJS)\event_event.res\r
+$(OBJS)\event.exe :  $(EVENT_OBJECTS) $(OBJS)\event_sample.res

        @%create $(OBJS)\event.lbc\r
        @%append $(OBJS)\event.lbc option quiet\r
        @%append $(OBJS)\event.lbc name $^@\r
        @%append $(OBJS)\event.lbc option caseexact\r
        @%append $(OBJS)\event.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i\r
        @%create $(OBJS)\event.lbc\r
        @%append $(OBJS)\event.lbc option quiet\r
        @%append $(OBJS)\event.lbc name $^@\r
        @%append $(OBJS)\event.lbc option caseexact\r
        @%append $(OBJS)\event.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i\r

-       @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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\event.lbc library %i\r
-       @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res\r
+       @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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_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 wininet.lib) do @%append $(OBJS)\event.lbc library %i\r
+       @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_sample.res

        @for %i in () do @%append $(OBJS)\event.lbc option stack=%i\r
        wlink @$(OBJS)\event.lbc\r
 \r
        @for %i in () do @%append $(OBJS)\event.lbc option stack=%i\r
        wlink @$(OBJS)\event.lbc\r
 \r

+$(OBJS)\event_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+

 $(OBJS)\event_event.obj :  .AUTODEPEND .\event.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $<\r
 \r
 $(OBJS)\event_event.obj :  .AUTODEPEND .\event.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $<\r
 \r

-$(OBJS)\event_event.res :  .AUTODEPEND .\event.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r