Added Release, Unicode Debug, and Unicode Release versions for each of

the tests.

Also found out that precompiled headers take up insane amounts of disk
space when used with ACE and also slows the compilation down.  I turned it
off for the tests and for the ace libraries

1 files changed, 112 insertions, 6 deletions

diff --git a/tests/IOStream_Test.dsp b/tests/IOStream_Test.dsp
index 1182e57fddf..808c9852899 100644
--- a/tests/IOStream_Test.dsp
+++ b/tests/IOStream_Test.dsp
@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=IOStream_Test - Win32 Alpha Debug

+CFG=IOStream_Test - Win32 Unicode Release

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,7 +14,8 @@ CFG=IOStream_Test - Win32 Alpha 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 "IOStream_Test.mak" CFG="IOStream_Test - Win32 Alpha Debug"

+!MESSAGE NMAKE /f "IOStream_Test.mak"\

+ CFG="IOStream_Test - Win32 Unicode Release"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -22,6 +23,12 @@ CFG=IOStream_Test - Win32 Alpha Debug
  "Win32 (x86) Console Application")

 !MESSAGE "IOStream_Test - Win32 Alpha Debug" (based on\

  "Win32 (ALPHA) Console Application")

+!MESSAGE "IOStream_Test - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "IOStream_Test - Win32 Unicode Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "IOStream_Test - Win32 Unicode Release" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -38,12 +45,13 @@ CFG=IOStream_Test - Win32 Alpha Debug
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

-# PROP Intermediate_Dir ".\Debug"

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\IOStream_Test"

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -69,8 +77,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "IOStream_Test"

 CPP=cl.exe

-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

+# SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -81,12 +90,103 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 # ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

+!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "IOStream_Test\Debug"

+# PROP BASE Intermediate_Dir "IOStream_Test\Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "IOStream_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\DLL\Release"

+# PROP Intermediate_Dir ".\DLL\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "IOStream_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /Z<none> /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

+# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"

+# SUBTRACT LINK32 /debug /pdbtype:<none>

+

+!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 Unicode Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "IOStream_Test\Unicode Debug"

+# PROP BASE Intermediate_Dir "IOStream_Test\Unicode Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "IOStream_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\DLL\Unicode_Debug"

+# PROP Intermediate_Dir ".\DLL\Unicode_Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "IOStream_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

+# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

+

+!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 Unicode Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "IOStream_Test\Unicode Release"

+# PROP BASE Intermediate_Dir "IOStream_Test\Unicode Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "IOStream_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\DLL\Unicode_Release"

+# PROP Intermediate_Dir ".\DLL\Unicode_Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "IOStream_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c

+# SUBTRACT BASE CPP /Z<none>

+# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c

+# SUBTRACT CPP /Z<none> /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"

+# SUBTRACT BASE LINK32 /debug /pdbtype:<none>

+# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"

+# SUBTRACT LINK32 /debug /pdbtype:<none>

+

 !ENDIF 

 

 # Begin Target

 

 # Name "IOStream_Test - Win32 Debug"

 # Name "IOStream_Test - Win32 Alpha Debug"

+# Name "IOStream_Test - Win32 Release"

+# Name "IOStream_Test - Win32 Unicode Debug"

+# Name "IOStream_Test - Win32 Unicode Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

@@ -232,6 +332,12 @@ DEP_CPP_IOSTR=\
 	".\test_config.h"\

 	

 

+!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 Unicode Release"

+

 !ENDIF 

 

 # End Source File