build a 2.9.x windows setup file and chm and htb sets of docs

[wxWidgets.git] / tests / makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index e68b7d9166fb207201775cbe0874ef1e2479a70b..7713c067409a43a0b4d8e5c9779d13cdb0cd66e7 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -18,11 +18,7 @@
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386
-! if $(__VERSION__) >= 1280
-!  loaddll wlink    wlinkd
-! else
 !  loaddll wlink    wlink
-! endif
 !  loaddll wlib     wlibd
 !endif
 
@@ -342,6 +338,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_rect.obj &
        $(OBJS)\test_gui_size.obj &
        $(OBJS)\test_gui_point.obj &
+       $(OBJS)\test_gui_measuring.obj &
        $(OBJS)\test_gui_config.obj &
        $(OBJS)\test_gui_comboboxtest.obj &
        $(OBJS)\test_gui_headerctrltest.obj &
@@ -641,6 +638,9 @@ $(OBJS)\test_gui_size.obj :  .AUTODEPEND .\geometry\size.cpp
 $(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
+$(OBJS)\test_gui_measuring.obj :  .AUTODEPEND .\graphics\measuring.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
 $(OBJS)\test_gui_config.obj :  .AUTODEPEND .\config\config.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<