no changes, just removed the unnecessary wxGrid:: qualifiers

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

diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat
index feb639f5c2c693b3c9bb95478c08f2308a60a189..27dd0074375b0167ddc22d0022e7ef0234538903 100644 (file)
--- a/tests/benchmarks/makefile.wat
+++ b/tests/benchmarks/makefile.wat
@@ -210,6 +210,8 @@ BENCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
 BENCH_OBJECTS =  &
        $(OBJS)\bench_bench.obj &
+       $(OBJS)\bench_htmlpars.obj &
+       $(OBJS)\bench_htmltag.obj &
        $(OBJS)\bench_strings.obj &
        $(OBJS)\bench_tls.obj
 
@@ -220,7 +222,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\bench.exe
+all : .SYMBOLIC $(OBJS)\bench.exe data
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -235,16 +237,26 @@ $(OBJS)\bench.exe :  $(BENCH_OBJECTS)
        @%append $(OBJS)\bench.lbc option quiet
        @%append $(OBJS)\bench.lbc name $^@
        @%append $(OBJS)\bench.lbc option caseexact
-       @%append $(OBJS)\bench.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
+       @%append $(OBJS)\bench.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)
        @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i
        @for %i in ( $(__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) do @%append $(OBJS)\bench.lbc library %i
        @%append $(OBJS)\bench.lbc
        @for %i in () do @%append $(OBJS)\bench.lbc option stack=%i
        wlink @$(OBJS)\bench.lbc
 
+data : .SYMBOLIC 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
 $(OBJS)\bench_bench.obj :  .AUTODEPEND .\bench.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
 
+$(OBJS)\bench_htmlpars.obj :  .AUTODEPEND .\htmlparser\htmlpars.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
+$(OBJS)\bench_htmltag.obj :  .AUTODEPEND .\htmlparser\htmltag.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<
+
 $(OBJS)\bench_strings.obj :  .AUTODEPEND .\strings.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<