X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc10103ec8203b5affe1a16b943049a2f27936bd..0ee43a72dd4f45fb3b6a41f5f996a42637cf115f:/tests/makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 2d5cc67571..c86e9acc7c 100644
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -103,6 +103,13 @@ __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 = 
@@ -169,7 +176,7 @@ 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_7) $(CPPFLAGS) $(CXXFLAGS)
+	$(__EXCEPTIONSFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  &
 	$(OBJS)\test_test.obj &
 	$(OBJS)\test_main.obj &
@@ -178,8 +185,12 @@ TEST_OBJECTS =  &
 	$(OBJS)\test_wxregex.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 &
@@ -193,7 +204,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\test.exe
+all : .SYMBOLIC $(OBJS)\test.exe data
 
 clean : .SYMBOLIC 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -213,6 +224,10 @@ $(OBJS)\test.exe :  $(TEST_OBJECTS)
 	@%append $(OBJS)\test.lbc
 	wlink @$(OBJS)\test.lbc
 
+data : .SYMBOLIC 
+	if not exist $(OBJS) mkdir $(OBJS)
+	for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
 $(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
@@ -234,12 +249,24 @@ $(OBJS)\test_filesys.obj :  .AUTODEPEND .\filesys\filesys.cpp
 $(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) $<
 
 $(OBJS)\test_strings.obj :  .AUTODEPEND .\strings\strings.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_stdstrings.obj :  .AUTODEPEND .\strings\stdstrings.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(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) $<