diff options
| author | Baptiste Lepilleur <gaiacrtn@free.fr> | 2001-06-05 20:36:31 +0000 |
|---|---|---|
| committer | Baptiste Lepilleur <gaiacrtn@free.fr> | 2001-06-05 20:36:31 +0000 |
| commit | 255fed3c27815d3074bdaafb2b5ed377bd4868f8 (patch) | |
| tree | 20269846783b24269eefed8afc042ca8e86627f1 /examples/cppunittest/CppUnitTestMain.dsp | |
| parent | 12cdd391bd1a4ebb0fe478a370fa64dd222c50e7 (diff) | |
| download | cppunit-255fed3c27815d3074bdaafb2b5ed377bd4868f8.tar.gz | |
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().
Diffstat (limited to 'examples/cppunittest/CppUnitTestMain.dsp')
| -rw-r--r-- | examples/cppunittest/CppUnitTestMain.dsp | 35 |
1 files changed, 32 insertions, 3 deletions
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 |
