X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/405b7d914d8967ac6cf14ad50b3eff5deb87037d..c0b0635cf69537ca32377bad5650b39402cb21b6:/tests/makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 4c40b62347..ada71d0ba3 100644
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -133,12 +133,13 @@ __DLLFLAG_p = -dWXUSINGDLL
 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_BASE_p = &
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 __LIB_TIFF_p =
 !ifeq USE_GUI 1
@@ -162,6 +163,7 @@ LIBDIRNAME = .\..\lib\wat_dll$(CFG)
 
 ### Variables: ###
 
+WX_RELEASE_NODOT = 25
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
@@ -176,17 +178,24 @@ TEST_OBJECTS =  &
 	$(OBJS)\test_formatconverter.obj &
 	$(OBJS)\test_regex.obj &
 	$(OBJS)\test_wxregex.obj &
+	$(OBJS)\test_fileconf.obj &
+	$(OBJS)\test_filename.obj &
 	$(OBJS)\test_filesys.obj &
 	$(OBJS)\test_arrays.obj &
+	$(OBJS)\test_hashes.obj &
 	$(OBJS)\test_longlong.obj &
 	$(OBJS)\test_strings.obj &
 	$(OBJS)\test_stdstrings.obj &
 	$(OBJS)\test_unicode.obj &
+	$(OBJS)\test_crt.obj &
 	$(OBJS)\test_bstream.obj &
 	$(OBJS)\test_ffilestream.obj &
 	$(OBJS)\test_filestream.obj &
 	$(OBJS)\test_memstream.obj &
-	$(OBJS)\test_zlibstream.obj
+	$(OBJS)\test_sstream.obj &
+	$(OBJS)\test_zlibstream.obj &
+	$(OBJS)\test_fontmap.obj &
+	$(OBJS)\test_datetime.obj
 
 
 all : $(OBJS)
@@ -234,12 +243,21 @@ $(OBJS)\test_regex.obj :  .AUTODEPEND .\regex\regex.cpp
 $(OBJS)\test_wxregex.obj :  .AUTODEPEND .\regex\wxregex.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_fileconf.obj :  .AUTODEPEND .\fileconf\fileconf.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_filename.obj :  .AUTODEPEND .\filename\filename.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_filesys.obj :  .AUTODEPEND .\filesys\filesys.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_arrays.obj :  .AUTODEPEND .\arrays\arrays.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_hashes.obj :  .AUTODEPEND .\hashes\hashes.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_longlong.obj :  .AUTODEPEND .\longlong\longlong.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
@@ -252,6 +270,9 @@ $(OBJS)\test_stdstrings.obj :  .AUTODEPEND .\strings\stdstrings.cpp
 $(OBJS)\test_unicode.obj :  .AUTODEPEND .\strings\unicode.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_crt.obj :  .AUTODEPEND .\strings\crt.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_bstream.obj :  .AUTODEPEND .\streams\bstream.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
@@ -264,5 +285,14 @@ $(OBJS)\test_filestream.obj :  .AUTODEPEND .\streams\filestream.cpp
 $(OBJS)\test_memstream.obj :  .AUTODEPEND .\streams\memstream.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_sstream.obj :  .AUTODEPEND .\streams\sstream.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_zlibstream.obj :  .AUTODEPEND .\streams\zlibstream.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_fontmap.obj :  .AUTODEPEND .\fontmap\fontmap.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_datetime.obj :  .AUTODEPEND .\datetime\datetime.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<