compilation fix for gcc-3.4

[wxWidgets.git] / tests / makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 4c40b62347e8eea1ac0b485caa608f40528ae0d6..007cc5f8c065eef7ab022a7fec0fb7544a54003a 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -103,6 +103,13 @@ __RUNTIME_LIBS_5 = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS_5 = 
 !endif
 !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 = 
 __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) &
 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 &
 TEST_OBJECTS =  &
        $(OBJS)\test_test.obj &
        $(OBJS)\test_main.obj &


@@ -178,15 +185,18 @@ TEST_OBJECTS =  &
        $(OBJS)\test_wxregex.obj &
        $(OBJS)\test_filesys.obj &
        $(OBJS)\test_arrays.obj &
        $(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_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_bstream.obj &
        $(OBJS)\test_ffilestream.obj &
        $(OBJS)\test_filestream.obj &
        $(OBJS)\test_memstream.obj &

-       $(OBJS)\test_zlibstream.obj
+       $(OBJS)\test_zlibstream.obj &
+       $(OBJS)\test_fontmap.obj

 
 
 all : $(OBJS)
 
 
 all : $(OBJS)


@@ -240,6 +250,9 @@ $(OBJS)\test_filesys.obj :  .AUTODEPEND .\filesys\filesys.cpp
 $(OBJS)\test_arrays.obj :  .AUTODEPEND .\arrays\arrays.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) $<
 
 $(OBJS)\test_longlong.obj :  .AUTODEPEND .\longlong\longlong.cpp
        $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 


@@ -252,6 +265,9 @@ $(OBJS)\test_stdstrings.obj :  .AUTODEPEND .\strings\stdstrings.cpp
 $(OBJS)\test_unicode.obj :  .AUTODEPEND .\strings\unicode.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) $<
 
 $(OBJS)\test_bstream.obj :  .AUTODEPEND .\streams\bstream.cpp
        $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 


@@ -266,3 +282,6 @@ $(OBJS)\test_memstream.obj :  .AUTODEPEND .\streams\memstream.cpp
 
 $(OBJS)\test_zlibstream.obj :  .AUTODEPEND .\streams\zlibstream.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) $<