Src/cppunit/TypeInfoHelper.

src/cppunit/TypeInfoHelper.cpp: removed #include <config.h>, cppunit/config.h was already included.

* src/cppunit/cppunit.dsp: removed TestAssert.cpp from project.

* added/updated .cvsignore files for beter handling of windows projects.

* added include/cppunit/config.h with a default configuration for VC++ 6.0.

* include/cppunit/.cvsignore: removed config.h from the list of ignored file.

* renamed VC++ configurations without RTTI from "Debug No CU_USE_TYPEINFO" to "Debug Crossplatform".

* include/cppunit/TestAssert.h: added include <math.h> for fabs().

10 files changed, 146 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index 169ae2c..3573893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2001-06-06 Baptiste Lepilleur <gaiacrtn@free.fr>
+
+	* src/cppunit/TypeInfoHelper.cpp: removed #include <config.h>, cppunit/config.h was already included.
+
+	* src/cppunit/cppunit.dsp: removed TestAssert.cpp from project.
+
+	* added/updated .cvsignore files for beter handling of windows projects.
+
+	* added include/cppunit/config.h with a default configuration for VC++ 6.0.
+
+	* include/cppunit/.cvsignore: removed config.h from the list of ignored file.
+
+	* renamed VC++ configurations without RTTI from "Debug No CU_USE_TYPEINFO" to "Debug Crossplatform".
+
+	* include/cppunit/TestAssert.h: added include <math.h> for fabs().
+
 2001-06-02  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>
 
 	* src/cppunit/Exception.cpp: Remove unnecessary namespace
diff --git a/examples/cppunittest/CppUnitTestMain.dsp b/examples/cppunittest/CppUnitTestMain.dsp
index f7423f8..a7c82bf 100644
--- a/examples/cppunittest/CppUnitTestMain.dsp
+++ b/examples/cppunittest/CppUnitTestMain.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=CppUnitTestMain - Win32 Debug
+CFG=CppUnitTestMain - Win32 Debug Crossplatform Setting
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,13 @@ CFG=CppUnitTestMain - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "CppUnitTestMain.mak" CFG="CppUnitTestMain - Win32 Debug"
+!MESSAGE NMAKE /f "CppUnitTestMain.mak" CFG="CppUnitTestMain - Win32 Debug Crossplatform Setting"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "CppUnitTestMain - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "CppUnitTestMain - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "CppUnitTestMain - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -67,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
 # ADD RSC /l 0x40c /d "_DEBUG"
@@ -78,12 +79,40 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../../lib/cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
+!ELSEIF  "$(CFG)" == "CppUnitTestMain - Win32 Debug Crossplatform Setting"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "CppUnitTestMain___Win32_Debug_Crossplatform_Setting"
+# PROP BASE Intermediate_Dir "CppUnitTestMain___Win32_Debug_Crossplatform_Setting"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugCrossplatform"
+# PROP Intermediate_Dir "DebugCrossplatform"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DONT_USE_TYPEINFO" /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../../lib/cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../../lib/cppunitcd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
 !ENDIF 
 
 # Begin Target
 
 # Name "CppUnitTestMain - Win32 Release"
 # Name "CppUnitTestMain - Win32 Debug"
+# Name "CppUnitTestMain - Win32 Debug Crossplatform Setting"
 # Begin Source File
 
 SOURCE=.\CppUnitTestMain.cpp
diff --git a/examples/hierarchy/hierarchy.dsp b/examples/hierarchy/hierarchy.dsp
index 5659428..a0db4a5 100644
--- a/examples/hierarchy/hierarchy.dsp
+++ b/examples/hierarchy/hierarchy.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=hierarchy - Win32 Debug Without CPPUNIT_USE_TYPEINFO
+CFG=hierarchy - Win32 Debug Crossplatform Setting
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,13 +13,13 @@ CFG=hierarchy - Win32 Debug Without CPPUNIT_USE_TYPEINFO
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "hierarchy.mak" CFG="hierarchy - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!MESSAGE NMAKE /f "hierarchy.mak" CFG="hierarchy - Win32 Debug Crossplatform Setting"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "hierarchy - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "hierarchy - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "hierarchy - Win32 Debug Without CPPUNIT_USE_TYPEINFO" (based on "Win32 (x86) Console Application")
+!MESSAGE "hierarchy - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -76,7 +76,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
-!ELSEIF  "$(CFG)" == "hierarchy - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!ELSEIF  "$(CFG)" == "hierarchy - Win32 Debug Crossplatform Setting"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -86,12 +86,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugNoTypeInfo"
-# PROP Intermediate_Dir "DebugNoTypeInfo"
+# PROP Output_Dir "DebugCrossplatform"
+# PROP Intermediate_Dir "DebugCrossplatform"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "USE_TYPEINFO" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DONT_USE_TYPEINFO" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
 # ADD RSC /l 0x40c /d "_DEBUG"
 BSC32=bscmake.exe
@@ -99,7 +99,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\cppunitnotypeinfod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\cppunitcd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -107,7 +107,7 @@ LINK32=link.exe
 
 # Name "hierarchy - Win32 Release"
 # Name "hierarchy - Win32 Debug"
-# Name "hierarchy - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+# Name "hierarchy - Win32 Debug Crossplatform Setting"
 # Begin Source File
 
 SOURCE=.\BoardGame.cpp
diff --git a/examples/hierarchy/hierarchy.dsw b/examples/hierarchy/hierarchy.dsw
index 0bacebd..db781ec 100644
--- a/examples/hierarchy/hierarchy.dsw
+++ b/examples/hierarchy/hierarchy.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "hierarchy"=".\hierarchy.dsp" - Package Owner=<4>
+Project: "cppunit"=..\..\src\cppunit\cppunit.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -15,6 +15,21 @@ Package=<4>
 
 ###############################################################################
 
+Project: "hierarchy"=.\hierarchy.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name cppunit
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>
diff --git a/examples/msvc6/HostApp/HostApp.dsp b/examples/msvc6/HostApp/HostApp.dsp
index 5883f7c..fc90d86 100644
--- a/examples/msvc6/HostApp/HostApp.dsp
+++ b/examples/msvc6/HostApp/HostApp.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=HostApp - Win32 Debug Without CPPUNIT_USE_TYPEINFO
+CFG=HostApp - Win32 Debug Crossplatform Setting
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,13 +13,13 @@ CFG=HostApp - Win32 Debug Without CPPUNIT_USE_TYPEINFO
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "HostApp.mak" CFG="HostApp - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!MESSAGE NMAKE /f "HostApp.mak" CFG="HostApp - Win32 Debug Crossplatform Setting"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "HostApp - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE "HostApp - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "HostApp - Win32 Debug Without CPPUNIT_USE_TYPEINFO" (based on "Win32 (x86) Application")
+!MESSAGE "HostApp - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -86,7 +86,7 @@ SOURCE="$(InputPath)"
 PreLink_Cmds=copy ..\..\..\lib\testrunnerd.dll Debug
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting"
 
 # PROP BASE Use_MFC 6
 # PROP BASE Use_Debug_Libraries 1
@@ -96,12 +96,12 @@ PreLink_Cmds=copy ..\..\..\lib\testrunnerd.dll Debug
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 6
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugNoTypeInfo"
-# PROP Intermediate_Dir "DebugNoTypeInfo"
+# PROP Output_Dir "DebugCrossplatform"
+# PROP Intermediate_Dir "DebugCrossplatform"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "CPPUNIT_USE_TYPEINFO" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "CPPUNIT_DONT_USE_TYPEINFO" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -112,11 +112,11 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # SUBTRACT BASE LINK32 /pdb:none /map /nodefaultlib
-# ADD LINK32 ..\..\..\lib\cppunitnotypeinfod.lib ..\..\..\lib\testrunnernotypeinfod.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\..\lib\cppunitcd.lib ..\..\..\lib\testrunnercd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none /map /nodefaultlib
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PreLink_Cmds=copy ..\..\..\lib\testrunnernotypeinfod.dll DebugNoTypeInfo
+PreLink_Cmds=copy ..\..\..\lib\testrunnercd.dll DebugCrossplatform
 # End Special Build Tool
 
 !ENDIF 
@@ -125,7 +125,7 @@ PreLink_Cmds=copy ..\..\..\lib\testrunnernotypeinfod.dll DebugNoTypeInfo
 
 # Name "HostApp - Win32 Release"
 # Name "HostApp - Win32 Debug"
-# Name "HostApp - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+# Name "HostApp - Win32 Debug Crossplatform Setting"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -139,7 +139,7 @@ SOURCE=.\ExampleTestCase.cpp
 
 # SUBTRACT CPP /YX /Yc /Yu
 
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
 # SUBTRACT CPP /YX /Yc /Yu
diff --git a/include/cppunit/TestAssert.h b/include/cppunit/TestAssert.h
index 9127780..b8143d3 100644
--- a/include/cppunit/TestAssert.h
+++ b/include/cppunit/TestAssert.h
@@ -1,6 +1,7 @@
 #ifndef CPPUNIT_TESTASSERT_H
 #define CPPUNIT_TESTASSERT_H
 
+#include <math.h>
 #include <string>
 #include <sstream>
 #include <cppunit/config.h>
diff --git a/include/cppunit/config.h b/include/cppunit/config.h
new file mode 100644
index 0000000..0314ca2
--- /dev/null
+++ b/include/cppunit/config.h
@@ -0,0 +1,36 @@
+#ifndef CPPUNIT_CONFIG_H
+#define CPPUNIT_CONFIG_H
+
+/* Default configuration for VC++ 6.0.
+ * On Unix platform, this file is generated by the configure script.
+ *
+ * Since we don't have that in everyday VC++, we define this header with
+ * reasonable default:
+ * - RTTI enabled
+ * - compatibility with old assert macro, now replaced with CPPUNIT_ASSERT.
+ * - preprocessor can expand expression
+ *
+ * Define the symbol CPPUNIT_DONT_USE_TYPEINFO to disable RTTI.
+ * Define the symbol CPPUNIT_DISABLE_NAKED_ASSERT to disable naked assert.
+ */
+
+/* Define to 1 if the compiler supports Run-Time Type Identification */
+#ifdef CPPUNIT_DONT_USE_TYPEINFO
+#define CPPUNIT_USE_TYPEINFO                0
+#else
+#define CPPUNIT_USE_TYPEINFO                1
+#endif
+
+/* Define to 1 if you wish to have the old-style macros
+   assert(), assertEqual(), assertDoublesEqual(), and assertLongsEqual() */
+#ifdef CPPUNIT_DISABLE_NAKED_ASSERT
+#define CPPUNIT_ENABLE_NAKED_ASSERT         0
+#else
+#define CPPUNIT_ENABLE_NAKED_ASSERT         1
+#endif
+
+/* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.) */
+#define CPPUNIT_HAVE_CPP_SOURCEANNOTATION   1
+
+
+#endif
diff --git a/src/cppunit/TypeInfoHelper.cpp b/src/cppunit/TypeInfoHelper.cpp
index 249d8ad..4d3e19e 100644
--- a/src/cppunit/TypeInfoHelper.cpp
+++ b/src/cppunit/TypeInfoHelper.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <cppunit/config.h>
 
 #if CPPUNIT_USE_TYPEINFO
diff --git a/src/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp
index 00cfd34..1ac2f67 100644
--- a/src/cppunit/cppunit.dsp
+++ b/src/cppunit/cppunit.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=cppunit - Win32 Debug Without CPPUNIT_USE_TYPEINFO
+CFG=cppunit - Win32 Debug Crossplatform Setting
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,13 +13,13 @@ CFG=cppunit - Win32 Debug Without CPPUNIT_USE_TYPEINFO
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "cppunit.mak" CFG="cppunit - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!MESSAGE NMAKE /f "cppunit.mak" CFG="cppunit - Win32 Debug Crossplatform Setting"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "cppunit - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "cppunit - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "cppunit - Win32 Debug Without CPPUNIT_USE_TYPEINFO" (based on "Win32 (x86) Static Library")
+!MESSAGE "cppunit - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\include" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "CPPUNIT_USE_TYPEINFO" /D "WIN32" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\include" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32" /YX /FD /c
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
 # ADD RSC /l 0x40c /d "NDEBUG"
 BSC32=bscmake.exe
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "CPPUNIT_USE_TYPEINFO" /D "WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
 # ADD RSC /l 0x40c /d "_DEBUG"
 BSC32=bscmake.exe
@@ -75,7 +75,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\lib\cppunitd.lib"
 
-!ELSEIF  "$(CFG)" == "cppunit - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!ELSEIF  "$(CFG)" == "cppunit - Win32 Debug Crossplatform Setting"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -84,11 +84,11 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugNoTypeInfo"
-# PROP Intermediate_Dir "DebugNoTypeInfo"
+# PROP Output_Dir "DebugCrossplatform"
+# PROP Intermediate_Dir "DebugCrossplatform"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "CPPUNIT_USE_TYPEINFO" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32" /D "CPPUNIT_DONT_USE_TYPEINFO" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
 # ADD RSC /l 0x40c /d "_DEBUG"
 BSC32=bscmake.exe
@@ -96,7 +96,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\cppunitd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\cppunitnotypeinfod.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\cppunitcd.lib"
 
 !ENDIF 
 
@@ -104,7 +104,7 @@ LIB32=link.exe -lib
 
 # Name "cppunit - Win32 Release"
 # Name "cppunit - Win32 Debug"
-# Name "cppunit - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+# Name "cppunit - Win32 Debug Crossplatform Setting"
 # Begin Group "extensions"
 
 # PROP Default_Filter ""
@@ -167,6 +167,10 @@ SOURCE=..\..\ChangeLog
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\cppunit\config.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\estring.h
 # End Source File
 # Begin Source File
@@ -183,10 +187,6 @@ SOURCE=..\..\include\cppunit\Test.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\TestAssert.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\cppunit\TestAssert.h
 # End Source File
 # Begin Source File
diff --git a/src/msvc6/testrunner/TestRunner.dsp b/src/msvc6/testrunner/TestRunner.dsp
index 8b360dd..f5761e3 100644
--- a/src/msvc6/testrunner/TestRunner.dsp
+++ b/src/msvc6/testrunner/TestRunner.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=TestRunner - Win32 Debug Without CPPUNIT_USE_TYPEINFO
+CFG=TestRunner - Win32 Debug Crossplatform Setting
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,13 +13,13 @@ CFG=TestRunner - Win32 Debug Without CPPUNIT_USE_TYPEINFO
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "TestRunner.mak" CFG="TestRunner - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!MESSAGE NMAKE /f "TestRunner.mak" CFG="TestRunner - Win32 Debug Crossplatform Setting"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "TestRunner - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "TestRunner - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "TestRunner - Win32 Debug Without CPPUNIT_USE_TYPEINFO" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "TestRunner - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_AFXEXT" /D "CPPUNIT_USE_TYPEINFO" /D "WIN32" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_AFXEXT" /D "WIN32" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_AFXEXT" /D "CPPUNIT_USE_TYPEINFO" /D "WIN32" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_AFXEXT" /D "WIN32" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -82,7 +82,7 @@ LINK32=link.exe
 # ADD LINK32 ..\..\..\lib\cppunitd.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\lib\testrunnerd.dll" /implib:"..\..\..\lib\testrunnerd.lib" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "TestRunner - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!ELSEIF  "$(CFG)" == "TestRunner - Win32 Debug Crossplatform Setting"
 
 # PROP BASE Use_MFC 6
 # PROP BASE Use_Debug_Libraries 1
@@ -97,7 +97,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_AFXEXT" /D "CPPUNIT_USE_TYPEINFO" /D "WIN32" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_AFXEXT" /D "WIN32" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_AFXEXT" /D "WIN32" /D "CPPUNIT_DONT_USE_TYPEINFO" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 ..\..\..\lib\cppunitd.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\lib\testrunnerd.dll" /implib:"..\..\..\lib\testrunnerd.lib" /pdbtype:sept
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 ..\..\..\lib\cppunitnotypeinfod.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /def:".\TestRunner.def" /out:"..\..\..\lib\testrunnernotypeinfod.dll" /implib:"..\..\..\lib\testrunnernotypeinfod.lib" /pdbtype:sept
+# ADD LINK32 ..\..\..\lib\cppunitcd.lib winmm.lib /nologo /subsystem:windows /dll /pdb:"DebugCrossplatform/testrunnercd.pdb" /debug /machine:I386 /def:".\TestRunner.def" /out:"..\..\..\lib\testrunnercd.dll" /implib:"..\..\..\lib\testrunnercd.lib" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
@@ -117,7 +117,7 @@ LINK32=link.exe
 
 # Name "TestRunner - Win32 Release"
 # Name "TestRunner - Win32 Debug"
-# Name "TestRunner - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+# Name "TestRunner - Win32 Debug Crossplatform Setting"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -150,7 +150,7 @@ SOURCE=.\TestRunner.def
 
 !ELSEIF  "$(CFG)" == "TestRunner - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "TestRunner - Win32 Debug Without CPPUNIT_USE_TYPEINFO"
+!ELSEIF  "$(CFG)" == "TestRunner - Win32 Debug Crossplatform Setting"
 
 # PROP Exclude_From_Build 1