Extract compiler-specific macro definitions in a new wx/compiler.h.

[wxWidgets.git] / tests / benchmarks / makefile.wat

diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat
index da5d60d15ad46690e3edf114f88ea8b59eedb59f..c8474857ad3cfd98515a123151309e837d0d59b3 100644 (file)
--- a/tests/benchmarks/makefile.wat
+++ b/tests/benchmarks/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r


@@ -36,7 +36,11 @@ PORTNAME =
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r

-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+!endif\r
+COMPILER_VERSION =\r
+!ifeq OFFICIAL_BUILD 1\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r

 !endif\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 !endif\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r


@@ -66,24 +70,54 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r

-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
+!endif\r
+__WXLIB_NET_p =\r
+!ifeq MONOLITHIC 0\r
+__WXLIB_NET_p = &\r
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
+!endif\r
+__LIB_PNG_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
+__bench_gui___depname =\r
+!ifeq USE_GUI 1\r
+__bench_gui___depname = $(OBJS)\bench_gui.exe\r
+!endif\r
+__WXLIB_CORE_p =\r
+!ifeq MONOLITHIC 0\r
+__WXLIB_CORE_p = &\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
+!endif\r
+__LIB_SCINTILLA_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
+__LIB_TIFF_p =\r
+!ifeq USE_GUI 1\r
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r

 !endif\r
 !endif\r

-__DEBUGINFO_0 =\r
+__LIB_JPEG_p =\r
+!ifeq USE_GUI 1\r
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
+!endif\r
+__DEBUGINFO =\r

 !ifeq BUILD debug\r
 !ifeq DEBUG_INFO default\r
 !ifeq BUILD debug\r
 !ifeq DEBUG_INFO default\r

-__DEBUGINFO_0 = -d2\r
+__DEBUGINFO = -d2\r

 !endif\r
 !endif\r
 !ifeq BUILD release\r
 !ifeq DEBUG_INFO default\r
 !endif\r
 !endif\r
 !ifeq BUILD release\r
 !ifeq DEBUG_INFO default\r

-__DEBUGINFO_0 = -d0\r
+__DEBUGINFO = -d0\r

 !endif\r
 !endif\r
 !ifeq DEBUG_INFO 0\r
 !endif\r
 !endif\r
 !ifeq DEBUG_INFO 0\r

-__DEBUGINFO_0 = -d0\r
+__DEBUGINFO = -d0\r

 !endif\r
 !ifeq DEBUG_INFO 1\r
 !endif\r
 !ifeq DEBUG_INFO 1\r

-__DEBUGINFO_0 = -d2\r
+__DEBUGINFO = -d2\r

 !endif\r
 __DEBUGINFO_1 =\r
 !ifeq BUILD debug\r
 !endif\r
 __DEBUGINFO_1 =\r
 !ifeq BUILD debug\r


@@ -102,40 +136,62 @@ __DEBUGINFO_1 =
 !ifeq DEBUG_INFO 1\r
 __DEBUGINFO_1 = debug all\r
 !endif\r
 !ifeq DEBUG_INFO 1\r
 __DEBUGINFO_1 = debug all\r
 !endif\r

-__OPTIMIZEFLAG_2 =\r
+__OPTIMIZEFLAG =\r

 !ifeq BUILD debug\r
 !ifeq BUILD debug\r

-__OPTIMIZEFLAG_2 = -od\r
+__OPTIMIZEFLAG = -od\r

 !endif\r
 !ifeq BUILD release\r
 !endif\r
 !ifeq BUILD release\r

-__OPTIMIZEFLAG_2 = -ot -ox\r
+__OPTIMIZEFLAG = -ot -ox\r

 !endif\r
 !endif\r

-__THREADSFLAG_5 =\r
+__THREADSFLAG =\r

 !ifeq USE_THREADS 0\r
 !ifeq USE_THREADS 0\r

-__THREADSFLAG_5 = \r
+__THREADSFLAG = \r

 !endif\r
 !ifeq USE_THREADS 1\r
 !endif\r
 !ifeq USE_THREADS 1\r

-__THREADSFLAG_5 = -bm\r
+__THREADSFLAG = -bm\r

 !endif\r
 !endif\r

-__RUNTIME_LIBS_6 =\r
+__RUNTIME_LIBS =\r

 !ifeq RUNTIME_LIBS dynamic\r
 !ifeq RUNTIME_LIBS dynamic\r

-__RUNTIME_LIBS_6 = -br\r
+__RUNTIME_LIBS = -br\r

 !endif\r
 !ifeq RUNTIME_LIBS static\r
 !endif\r
 !ifeq RUNTIME_LIBS static\r

-__RUNTIME_LIBS_6 = \r
+__RUNTIME_LIBS = \r

 !endif\r
 !endif\r

-__RTTIFLAG_7 =\r
+__RTTIFLAG =\r

 !ifeq USE_RTTI 0\r
 !ifeq USE_RTTI 0\r

-__RTTIFLAG_7 = \r
+__RTTIFLAG = \r

 !endif\r
 !ifeq USE_RTTI 1\r
 !endif\r
 !ifeq USE_RTTI 1\r

-__RTTIFLAG_7 = -xr\r
+__RTTIFLAG = -xr\r

 !endif\r
 !endif\r

-__EXCEPTIONSFLAG_8 =\r
+__EXCEPTIONSFLAG =\r

 !ifeq USE_EXCEPTIONS 0\r
 !ifeq USE_EXCEPTIONS 0\r

-__EXCEPTIONSFLAG_8 = \r
+__EXCEPTIONSFLAG = \r

 !endif\r
 !ifeq USE_EXCEPTIONS 1\r
 !endif\r
 !ifeq USE_EXCEPTIONS 1\r

-__EXCEPTIONSFLAG_8 = -xs\r
+__EXCEPTIONSFLAG = -xs\r
+!endif\r
+__WXLIB_BASE_p =\r
+!ifeq MONOLITHIC 0\r
+__WXLIB_BASE_p = &\r
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+!endif\r
+__WXLIB_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+__WXLIB_MONO_p = &\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+!endif\r
+__LIB_PNG_p =\r
+!ifeq USE_GUI 1\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
+__CAIRO_LIB_p =\r
+!ifeq USE_CAIRO 1\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+____CAIRO_LIBDIR_FILENAMES =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib\r

 !endif\r
 __WXUNIV_DEFINE_p =\r
 !ifeq WXUNIV 1\r
 !endif\r
 __WXUNIV_DEFINE_p =\r
 !ifeq WXUNIV 1\r


@@ -145,6 +201,10 @@ __DEBUG_DEFINE_p =
 !ifeq DEBUG_FLAG 0\r
 __DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
 !endif\r
 !ifeq DEBUG_FLAG 0\r
 __DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
 !endif\r

+__NDEBUG_DEFINE_p =\r
+!ifeq BUILD release\r
+__NDEBUG_DEFINE_p = -dNDEBUG\r
+!endif\r

 __EXCEPTIONS_DEFINE_p =\r
 !ifeq USE_EXCEPTIONS 0\r
 __EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
 __EXCEPTIONS_DEFINE_p =\r
 !ifeq USE_EXCEPTIONS 0\r
 __EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r


@@ -164,58 +224,53 @@ __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
+____CAIRO_INCLUDEDIR_FILENAMES =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r

 !endif\r
 __DLLFLAG_p =\r
 !ifeq SHARED 1\r
 __DLLFLAG_p = -dWXUSINGDLL\r
 !endif\r
 !endif\r
 __DLLFLAG_p =\r
 !ifeq SHARED 1\r
 __DLLFLAG_p = -dWXUSINGDLL\r
 !endif\r

-__WXLIB_NET_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_NET_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-__WXLIB_BASE_p =\r
-!ifeq MONOLITHIC 0\r
-__WXLIB_BASE_p = &\r
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__WXLIB_MONO_p =\r
-!ifeq MONOLITHIC 1\r
-__WXLIB_MONO_p = &\r
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
-!endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r

 \r
 ### Variables: ###\r
 \r
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
 \r
 ### Variables: ###\r
 \r
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
+LIBDIRNAME = &\r
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r

 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r

-BENCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
+BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
+       $(__RUNTIME_LIBS) -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) -i=$(SETUPHDIR) &\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG) &\r
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r

 BENCH_OBJECTS =  &\r
        $(OBJS)\bench_bench.obj &\r
 BENCH_OBJECTS =  &\r
        $(OBJS)\bench_bench.obj &\r

+       $(OBJS)\bench_datetime.obj &\r

        $(OBJS)\bench_htmlpars.obj &\r
        $(OBJS)\bench_htmltag.obj &\r
        $(OBJS)\bench_ipcclient.obj &\r
        $(OBJS)\bench_htmlpars.obj &\r
        $(OBJS)\bench_htmltag.obj &\r
        $(OBJS)\bench_ipcclient.obj &\r

+       $(OBJS)\bench_log.obj &\r

        $(OBJS)\bench_mbconv.obj &\r
        $(OBJS)\bench_strings.obj &\r
        $(OBJS)\bench_tls.obj &\r
        $(OBJS)\bench_printfbench.obj\r
        $(OBJS)\bench_mbconv.obj &\r
        $(OBJS)\bench_strings.obj &\r
        $(OBJS)\bench_tls.obj &\r
        $(OBJS)\bench_printfbench.obj\r

+BENCH_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
+       $(__RUNTIME_LIBS) -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) -i=$(SETUPHDIR) &\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) &\r
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+BENCH_GUI_OBJECTS =  &\r
+       $(OBJS)\bench_gui_bench.obj &\r
+       $(OBJS)\bench_gui_image.obj\r

 \r
 \r
 all : $(OBJS)\r
 \r
 \r
 all : $(OBJS)\r


@@ -224,7 +279,7 @@ $(OBJS) :
 \r
 ### Targets: ###\r
 \r
 \r
 ### Targets: ###\r
 \r

-all : .SYMBOLIC $(OBJS)\bench.exe data\r
+all : .SYMBOLIC $(OBJS)\bench.exe data $(__bench_gui___depname) data-image\r

 \r
 clean : .SYMBOLIC \r
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
 \r
 clean : .SYMBOLIC \r
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r


@@ -233,15 +288,16 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe\r
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe\r

+       -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe\r

 \r
 $(OBJS)\bench.exe :  $(BENCH_OBJECTS)\r
        @%create $(OBJS)\bench.lbc\r
        @%append $(OBJS)\bench.lbc option quiet\r
        @%append $(OBJS)\bench.lbc name $^@\r
        @%append $(OBJS)\bench.lbc option caseexact\r
 \r
 $(OBJS)\bench.exe :  $(BENCH_OBJECTS)\r
        @%create $(OBJS)\bench.lbc\r
        @%append $(OBJS)\bench.lbc option quiet\r
        @%append $(OBJS)\bench.lbc name $^@\r
        @%append $(OBJS)\bench.lbc option caseexact\r

-       @%append $(OBJS)\bench.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
+       @%append $(OBJS)\bench.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r

        @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i\r
        @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i\r

-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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 wininet.lib) do @%append $(OBJS)\bench.lbc library %i\r
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_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)\bench.lbc library %i\r

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


@@ -250,9 +306,30 @@ data : .SYMBOLIC
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r

+!ifeq USE_GUI 1\r
+$(OBJS)\bench_gui.exe :  $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res\r
+       @%create $(OBJS)\bench_gui.lbc\r
+       @%append $(OBJS)\bench_gui.lbc option quiet\r
+       @%append $(OBJS)\bench_gui.lbc name $^@\r
+       @%append $(OBJS)\bench_gui.lbc option caseexact\r
+       @%append $(OBJS)\bench_gui.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
+       @for %i in ($(BENCH_GUI_OBJECTS)) do @%append $(OBJS)\bench_gui.lbc file %i\r
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_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)\bench_gui.lbc library %i\r
+       @%append $(OBJS)\bench_gui.lbc option resource=$(OBJS)\bench_gui_sample.res\r
+       @for %i in () do @%append $(OBJS)\bench_gui.lbc option stack=%i\r
+       wlink @$(OBJS)\bench_gui.lbc\r
+!endif\r
+\r
+data-image : .SYMBOLIC \r
+       if not exist $(OBJS) mkdir $(OBJS)\r
+       for %f in (../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
+\r

 $(OBJS)\bench_bench.obj :  .AUTODEPEND .\bench.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r
 $(OBJS)\bench_bench.obj :  .AUTODEPEND .\bench.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r

+$(OBJS)\bench_datetime.obj :  .AUTODEPEND .\datetime.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
+\r

 $(OBJS)\bench_htmlpars.obj :  .AUTODEPEND .\htmlparser\htmlpars.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r
 $(OBJS)\bench_htmlpars.obj :  .AUTODEPEND .\htmlparser\htmlpars.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r


@@ -262,6 +339,9 @@ $(OBJS)\bench_htmltag.obj :  .AUTODEPEND .\htmlparser\htmltag.cpp
 $(OBJS)\bench_ipcclient.obj :  .AUTODEPEND .\ipcclient.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r
 $(OBJS)\bench_ipcclient.obj :  .AUTODEPEND .\ipcclient.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r

+$(OBJS)\bench_log.obj :  .AUTODEPEND .\log.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
+\r

 $(OBJS)\bench_mbconv.obj :  .AUTODEPEND .\mbconv.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r
 $(OBJS)\bench_mbconv.obj :  .AUTODEPEND .\mbconv.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r


@@ -274,3 +354,12 @@ $(OBJS)\bench_tls.obj :  .AUTODEPEND .\tls.cpp
 $(OBJS)\bench_printfbench.obj :  .AUTODEPEND .\printfbench.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r
 $(OBJS)\bench_printfbench.obj :  .AUTODEPEND .\printfbench.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r

+$(OBJS)\bench_gui_sample.res :  .AUTODEPEND .\..\..\samples\sample.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)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
+\r
+$(OBJS)\bench_gui_bench.obj :  .AUTODEPEND .\bench.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\bench_gui_image.obj :  .AUTODEPEND .\image.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_GUI_CXXFLAGS) $<\r
+\r