summaryrefslogtreecommitdiff
path: root/examples/msvc6
diff options
context:
space:
mode:
authorBaptiste Lepilleur <gaiacrtn@free.fr>2001-05-18 18:32:42 +0000
committerBaptiste Lepilleur <gaiacrtn@free.fr>2001-05-18 18:32:42 +0000
commit82017693c2dcaab03556154d990fe44591fb6f0a (patch)
tree296fe4d4d48a6dbd3545f31ce9b7418c08c997d7 /examples/msvc6
parent15bf5fbb250670464df54ef9155cc3b391118523 (diff)
downloadcppunit-82017693c2dcaab03556154d990fe44591fb6f0a.tar.gz
:registerFactory(factory) now generate a dummy name based on a serial number instead of using RTTI.
* Symbol CU_USE_TYPEINFO must be defined instead of USE_TYPEINFO to compile RTTI. * Added back default constructor to TestSuiteBuilder which use RTTI. It is available only if CU_USE_TYPEINFO is defined. * Moved TypeInfoHelper.h from src/cppunit to include/cppunit/extensions. * Macro CU_TEST_SUITE in HelperMacros.h now use TestSuiteBuilder default constructor if CU_USE_TYPEINFO is defined, otherwise it use the type name given to the CU_TEST_SUITE macro. * TestFactoryRegistry::registerFactory(factory) now generate a dummy name based on a serial number instead of using RTTI. The macro CU_TEST_SUITE_REGISTRATION and class AutoRegisterSuite can now when CU_USE_TYPEINFO is not defined. * Added a new Configuration named "Debug Without CU_USE_TYPEINFO" to msvc6 projects. The flag CU_USE_TYPEINFO is not defined in that configuration.
Diffstat (limited to 'examples/msvc6')
-rw-r--r--examples/msvc6/HostApp/HostApp.dsp48
1 files changed, 44 insertions, 4 deletions
diff --git a/examples/msvc6/HostApp/HostApp.dsp b/examples/msvc6/HostApp/HostApp.dsp
index 0260670..c04ae7c 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
+CFG=HostApp - Win32 Debug Without CU_USE_TYPEINFO
!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=HostApp - 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 "HostApp.mak" CFG="HostApp - Win32 Debug"
+!MESSAGE NMAKE /f "HostApp.mak" CFG="HostApp - Win32 Debug Without CU_USE_TYPEINFO"
!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 CU_USE_TYPEINFO" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
@@ -42,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 "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "USE_TYPEINFO" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "CU_USE_TYPEINFO" /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"
@@ -68,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 "_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 "_AFXDLL" /D "WIN32" /D "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" /D "CU_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"
@@ -85,12 +86,46 @@ SOURCE="$(InputPath)"
PreLink_Cmds=copy ..\..\..\lib\testrunnerd.dll Debug
# End Special Build Tool
+!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Without CU_USE_TYPEINFO"
+
+# PROP BASE Use_MFC 6
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "HostApp___Win32_Debug_Without_CU_USE_TYPEINFO"
+# PROP BASE Intermediate_Dir "HostApp___Win32_Debug_Without_CU_USE_TYPEINFO"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 6
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugNoTypeInfo"
+# PROP Intermediate_Dir "DebugNoTypeInfo"
+# 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 "CU_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 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"
+# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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
+# SUBTRACT LINK32 /pdb:none /map /nodefaultlib
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PreLink_Cmds=copy ..\..\..\lib\testrunnernotypeinfod.dll DebugNoTypeInfo
+# End Special Build Tool
+
!ENDIF
# Begin Target
# Name "HostApp - Win32 Release"
# Name "HostApp - Win32 Debug"
+# Name "HostApp - Win32 Debug Without CU_USE_TYPEINFO"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -104,6 +139,11 @@ SOURCE=.\ExampleTestCase.cpp
# SUBTRACT CPP /YX /Yc /Yu
+!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Without CU_USE_TYPEINFO"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
!ENDIF
# End Source File