static setting changes

2 files changed, 130 insertions, 18 deletions

diff --git a/performance-tests/Misc/basic_perf.dsp b/performance-tests/Misc/basic_perf.dsp
index 77ac59ed2c7..2184cc80159 100644
--- a/performance-tests/Misc/basic_perf.dsp
+++ b/performance-tests/Misc/basic_perf.dsp
@@ -4,24 +4,28 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=basic_perf - Win32 Release

+CFG=basic_perf - Win32 static Debug

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

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "basic_perf.mak".

-!MESSAGE 

+!MESSAGE

 !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 "basic_perf.mak" CFG="basic_perf - Win32 Release"

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "basic_perf.mak" CFG="basic_perf - Win32 static Debug"

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

+!MESSAGE

 !MESSAGE "basic_perf - Win32 Release" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE "basic_perf - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE "basic_perf - Win32 static Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "basic_perf - Win32 static Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

 # PROP Scc_ProjName ""

@@ -77,12 +81,64 @@ 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 /nologo /subsystem:console /debug /machine:I386

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

-!ENDIF 

+!ELSEIF  "$(CFG)" == "basic_perf - Win32 static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "basic_perf\static Debug"

+# PROP BASE Intermediate_Dir "basic_perf\static Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "basic_perf"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "static_Debug"

+# PROP Intermediate_Dir "static_Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "basic_perf"

+# 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 ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

+# 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 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "basic_perf\static Release"

+# PROP BASE Intermediate_Dir "basic_perf\static Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "basic_perf"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "static_Release"

+# PROP Intermediate_Dir "static_Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "basic_perf"

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

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

+# 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 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+

+!ENDIF

 

 # Begin Target

 

 # Name "basic_perf - Win32 Release"

 # Name "basic_perf - Win32 Debug"

+# Name "basic_perf - Win32 static Debug"

+# Name "basic_perf - Win32 static Release"

 # Begin Group "Source Files"

 

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

diff --git a/performance-tests/Misc/context_switch_time.dsp b/performance-tests/Misc/context_switch_time.dsp
index 197636dd1a3..4d9549416de 100644
--- a/performance-tests/Misc/context_switch_time.dsp
+++ b/performance-tests/Misc/context_switch_time.dsp
@@ -4,25 +4,29 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=context_switch_time - Win32 Release

+CFG=context_switch_time - Win32 static Debug

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

 !MESSAGE use the Export Makefile command and run

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "context_switch_time.mak".

-!MESSAGE 

+!MESSAGE

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

+!MESSAGE

 !MESSAGE NMAKE /f "context_switch_time.mak"\

- CFG="context_switch_time - Win32 Release"

-!MESSAGE 

+ CFG="context_switch_time - Win32 static Debug"

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

+!MESSAGE

 !MESSAGE "context_switch_time - Win32 Release" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE "context_switch_time - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE "context_switch_time - Win32 static Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "context_switch_time - Win32 static Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

 # PROP Scc_ProjName ""

@@ -78,12 +82,64 @@ 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 /nologo /subsystem:console /debug /machine:I386

 # ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

-!ENDIF 

+!ELSEIF  "$(CFG)" == "context_switch_time - Win32 static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "context_switch_time\static Debug"

+# PROP BASE Intermediate_Dir "context_switch_time\static Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "context_switch_time"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "static_Debug"

+# PROP Intermediate_Dir "static_Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "context_switch_time"

+# 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 ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

+# 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 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "context_switch_time\static Release"

+# PROP BASE Intermediate_Dir "context_switch_time\static Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "context_switch_time"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "static_Release"

+# PROP Intermediate_Dir "static_Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "context_switch_time"

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

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

+# 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 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+

+!ENDIF

 

 # Begin Target

 

 # Name "context_switch_time - Win32 Release"

 # Name "context_switch_time - Win32 Debug"

+# Name "context_switch_time - Win32 static Debug"

+# Name "context_switch_time - Win32 static Release"

 # Begin Group "Source Files"

 

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