revert r60023 and really fixed compilation problems caused by r60017 by providing...

[wxWidgets.git] / tests / makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 2272436a31683823a363dc7ec718050c2869a5a6..e68b7d9166fb207201775cbe0874ef1e2479a70b 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -18,7 +18,11 @@
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386
+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else
 !  loaddll wlink    wlink
+! endif
 !  loaddll wlib     wlibd
 !endif
 
@@ -275,6 +279,7 @@ TEST_OBJECTS =  &
        $(OBJS)\test_datetimetest.obj &
        $(OBJS)\test_evthandler.obj &
        $(OBJS)\test_timertest.obj &
+       $(OBJS)\test_exec.obj &
        $(OBJS)\test_filekind.obj &
        $(OBJS)\test_filenametest.obj &
        $(OBJS)\test_filesystest.obj &
@@ -352,6 +357,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_guifuncs.obj &
        $(OBJS)\test_gui_selstoretest.obj &
        $(OBJS)\test_gui_garbage.obj &
+       $(OBJS)\test_gui_settings.obj &
        $(OBJS)\test_gui_socket.obj &
        $(OBJS)\test_gui_clientsize.obj &
        $(OBJS)\test_gui_setsize.obj
@@ -467,6 +473,9 @@ $(OBJS)\test_evthandler.obj :  .AUTODEPEND .\events\evthandler.cpp
 $(OBJS)\test_timertest.obj :  .AUTODEPEND .\events\timertest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_exec.obj :  .AUTODEPEND .\exec\exec.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_filekind.obj :  .AUTODEPEND .\filekind\filekind.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
@@ -677,6 +686,9 @@ $(OBJS)\test_gui_selstoretest.obj :  .AUTODEPEND .\misc\selstoretest.cpp
 $(OBJS)\test_gui_garbage.obj :  .AUTODEPEND .\misc\garbage.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
+$(OBJS)\test_gui_settings.obj :  .AUTODEPEND .\misc\settings.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
 $(OBJS)\test_gui_socket.obj :  .AUTODEPEND .\net\socket.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<