X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf8ee08b1bfb5680e2e199f3330ae93ef3a901a0..8032564e8148d046a4989c3786e08c315a0a8573:/tests/makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index c86e9acc7c..b1bbdbfa0f 100644
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -103,13 +103,6 @@ __RUNTIME_LIBS_5 = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS_5 = 
 !endif
-__EXCEPTIONSFLAG_6 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_6 = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_6 = -xr
-!endif
 __EXCEPTIONSFLAG_7 =
 !ifeq USE_EXCEPTIONS 0
 __EXCEPTIONSFLAG_7 = 
@@ -176,13 +169,14 @@ SETUPHDIR = &
 TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
 	-i=.\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) &
-	$(__EXCEPTIONSFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
+	$(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  &
 	$(OBJS)\test_test.obj &
 	$(OBJS)\test_main.obj &
 	$(OBJS)\test_formatconverter.obj &
 	$(OBJS)\test_regex.obj &
 	$(OBJS)\test_wxregex.obj &
+	$(OBJS)\test_filename.obj &
 	$(OBJS)\test_filesys.obj &
 	$(OBJS)\test_arrays.obj &
 	$(OBJS)\test_hashes.obj &
@@ -195,7 +189,9 @@ TEST_OBJECTS =  &
 	$(OBJS)\test_ffilestream.obj &
 	$(OBJS)\test_filestream.obj &
 	$(OBJS)\test_memstream.obj &
-	$(OBJS)\test_zlibstream.obj
+	$(OBJS)\test_zlibstream.obj &
+	$(OBJS)\test_fontmap.obj &
+	$(OBJS)\test_datetime.obj
 
 
 all : $(OBJS)
@@ -243,6 +239,9 @@ $(OBJS)\test_regex.obj :  .AUTODEPEND .\regex\regex.cpp
 $(OBJS)\test_wxregex.obj :  .AUTODEPEND .\regex\wxregex.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) $<
 
@@ -281,3 +280,9 @@ $(OBJS)\test_memstream.obj :  .AUTODEPEND .\streams\memstream.cpp
 
 $(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) $<