diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-15 17:39:32 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-15 17:39:32 +0000 |
| commit | 6ebd2d53e3918e7a7ee395980201a440a3d73f36 (patch) | |
| tree | 132766122f023f2aac4cb56175c5ecb6481d8fd6 | |
| parent | 80727de8afa356faf4545832b07e05421064b43b (diff) | |
| download | ATCD-6ebd2d53e3918e7a7ee395980201a440a3d73f36.tar.gz | |
ChangeLogTag:Mon May 15 10:25:38 2000 Darrell Brunsch <brunsch@uci.edu>
89 files changed, 3372 insertions, 14343 deletions
diff --git a/ChangeLog b/ChangeLog index 84b9f232973..94a2e69d552 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,107 @@ +Mon May 15 10:25:38 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/create_vt_dsps.pl: + + I got tired of creating the version tests for the ACE tests, + so why not script it? + + * tests/version_tests/ACE_Init_Test.dsp: (removed) + + This test is tricky. It uses MFC, which gets complicated when + also using the static version of ACE. Since this is the only + test that does this, I just disabled it in the create_vt_dsps.pl. + + * tests/version_tests/Reactor_Exception_Test.dsp: (removed) + * tests/version_tests/Sigset_Op_Test.dsp: (removed) + + These two were named differently than their parents in + tests/, so they have been renamed. + + * tests/version_tests/Atomic_Op_Test.dsp: + * tests/version_tests/Auto_IncDec_Test.dsp: + * tests/version_tests/Barrier_Test.dsp: + * tests/version_tests/Basic_Types_Test.dsp: + * tests/version_tests/Buffer_Stream_Test.dsp: + * tests/version_tests/CDR_File_Test.dsp: + * tests/version_tests/CDR_Test.dsp: + * tests/version_tests/Cache_Map_Manager_Test.dsp: + * tests/version_tests/Cached_Accept_Conn_Test.dsp: + * tests/version_tests/Cached_Conn_Test.dsp: + * tests/version_tests/Capabilities_Test.dsp: + * tests/version_tests/Collection_Test.dsp: + * tests/version_tests/Conn_Test.dsp: + * tests/version_tests/DLL_Test.dsp: + * tests/version_tests/DLList_Test.dsp: + * tests/version_tests/Dynamic_Priority_Test.dsp: + * tests/version_tests/Enum_Interfaces_Test.dsp: + * tests/version_tests/Env_Value_Test.dsp: + * tests/version_tests/Future_Set_Test.dsp: + * tests/version_tests/Future_Test.dsp: + * tests/version_tests/Handle_Set_Test.dsp: + * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: + * tests/version_tests/Hash_Map_Manager_Test.dsp: + * tests/version_tests/High_Res_Timer_Test.dsp: + * tests/version_tests/IOStream_Test.dsp: + * tests/version_tests/Lazy_Map_Manager_Test.dsp: + * tests/version_tests/MM_Shared_Memory_Test.dsp: + * tests/version_tests/MT_Reactor_Timer_Test.dsp: + * tests/version_tests/MT_SOCK_Test.dsp: + * tests/version_tests/Malloc_Test.dsp: + * tests/version_tests/Map_Manager_Test.dsp: + * tests/version_tests/Map_Test.dsp: + * tests/version_tests/Mem_Map_Test.dsp: + * tests/version_tests/Message_Block_Test.dsp: + * tests/version_tests/Message_Queue_Notifications_Test.dsp: + * tests/version_tests/Message_Queue_Test.dsp: + * tests/version_tests/Naming_Test.dsp: + * tests/version_tests/New_Fail_Test.dsp: + * tests/version_tests/Notify_Performance_Test.dsp: + * tests/version_tests/Object_Manager_Test.dsp: + * tests/version_tests/OrdMultiSet_Test.dsp: + * tests/version_tests/Pipe_Test.dsp: + * tests/version_tests/Priority_Buffer_Test.dsp: + * tests/version_tests/Priority_Reactor_Test.dsp: + * tests/version_tests/Priority_Task_Test.dsp: + * tests/version_tests/Process_Manager_Test.dsp: + * tests/version_tests/Process_Mutex_Test.dsp: + * tests/version_tests/Process_Strategy_Test.dsp: + * tests/version_tests/RB_Tree_Test.dsp: + * tests/version_tests/Reactor_Notify_Test.dsp: + * tests/version_tests/Reactor_Performance_Test.dsp: + * tests/version_tests/Reactor_Timer_Test.dsp: + * tests/version_tests/Reactors_Test.dsp: + * tests/version_tests/Reader_Writer_Test.dsp: + * tests/version_tests/Recursive_Mutex_Test.dsp: + * tests/version_tests/Reverse_Lock_Test.dsp: + * tests/version_tests/SOCK_Connector_Test.dsp: + * tests/version_tests/SOCK_Send_Recv_Test.dsp: + * tests/version_tests/SOCK_Test.dsp: + * tests/version_tests/SPIPE_Test.dsp: + * tests/version_tests/SString_Test.dsp: + * tests/version_tests/SV_Shared_Memory_Test.dsp: + * tests/version_tests/Semaphore_Test.dsp: + * tests/version_tests/Service_Config_Test.dsp: + * tests/version_tests/Simple_Message_Block_Test.dsp: + * tests/version_tests/Svc_Handler_Test.dsp: + * tests/version_tests/TSS_Test.dsp: + * tests/version_tests/Task_Test.dsp: + * tests/version_tests/Thread_Manager_Test.dsp: + * tests/version_tests/Thread_Mutex_Test.dsp: + * tests/version_tests/Thread_Pool_Reactor_Test.dsp: + * tests/version_tests/Thread_Pool_Test.dsp: + * tests/version_tests/Time_Service_Test.dsp: + * tests/version_tests/Time_Value_Test.dsp: + * tests/version_tests/Timeprobe_Test.dsp: + * tests/version_tests/Timer_Queue_Test.dsp: + * tests/version_tests/Tokens_Test.dsp: + * tests/version_tests/UPIPE_SAP_Test.dsp: + * tests/version_tests/Upgradable_RW_Test.dsp: + * tests/version_tests/version_tests.dsw: + * tests/version_tests/Reactor_Exceptions_Test.dsp: (added) + * tests/version_tests/Sigset_Ops_Test.dsp: (added) + + These files were regenerated. + Mon May 15 12:28:32 2000 Aviad Eden <Aviad_Eden@icomverse.com> * ace/Object_Manager.h: In the paragraph that describes the diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 84b9f232973..94a2e69d552 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,107 @@ +Mon May 15 10:25:38 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/create_vt_dsps.pl: + + I got tired of creating the version tests for the ACE tests, + so why not script it? + + * tests/version_tests/ACE_Init_Test.dsp: (removed) + + This test is tricky. It uses MFC, which gets complicated when + also using the static version of ACE. Since this is the only + test that does this, I just disabled it in the create_vt_dsps.pl. + + * tests/version_tests/Reactor_Exception_Test.dsp: (removed) + * tests/version_tests/Sigset_Op_Test.dsp: (removed) + + These two were named differently than their parents in + tests/, so they have been renamed. + + * tests/version_tests/Atomic_Op_Test.dsp: + * tests/version_tests/Auto_IncDec_Test.dsp: + * tests/version_tests/Barrier_Test.dsp: + * tests/version_tests/Basic_Types_Test.dsp: + * tests/version_tests/Buffer_Stream_Test.dsp: + * tests/version_tests/CDR_File_Test.dsp: + * tests/version_tests/CDR_Test.dsp: + * tests/version_tests/Cache_Map_Manager_Test.dsp: + * tests/version_tests/Cached_Accept_Conn_Test.dsp: + * tests/version_tests/Cached_Conn_Test.dsp: + * tests/version_tests/Capabilities_Test.dsp: + * tests/version_tests/Collection_Test.dsp: + * tests/version_tests/Conn_Test.dsp: + * tests/version_tests/DLL_Test.dsp: + * tests/version_tests/DLList_Test.dsp: + * tests/version_tests/Dynamic_Priority_Test.dsp: + * tests/version_tests/Enum_Interfaces_Test.dsp: + * tests/version_tests/Env_Value_Test.dsp: + * tests/version_tests/Future_Set_Test.dsp: + * tests/version_tests/Future_Test.dsp: + * tests/version_tests/Handle_Set_Test.dsp: + * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: + * tests/version_tests/Hash_Map_Manager_Test.dsp: + * tests/version_tests/High_Res_Timer_Test.dsp: + * tests/version_tests/IOStream_Test.dsp: + * tests/version_tests/Lazy_Map_Manager_Test.dsp: + * tests/version_tests/MM_Shared_Memory_Test.dsp: + * tests/version_tests/MT_Reactor_Timer_Test.dsp: + * tests/version_tests/MT_SOCK_Test.dsp: + * tests/version_tests/Malloc_Test.dsp: + * tests/version_tests/Map_Manager_Test.dsp: + * tests/version_tests/Map_Test.dsp: + * tests/version_tests/Mem_Map_Test.dsp: + * tests/version_tests/Message_Block_Test.dsp: + * tests/version_tests/Message_Queue_Notifications_Test.dsp: + * tests/version_tests/Message_Queue_Test.dsp: + * tests/version_tests/Naming_Test.dsp: + * tests/version_tests/New_Fail_Test.dsp: + * tests/version_tests/Notify_Performance_Test.dsp: + * tests/version_tests/Object_Manager_Test.dsp: + * tests/version_tests/OrdMultiSet_Test.dsp: + * tests/version_tests/Pipe_Test.dsp: + * tests/version_tests/Priority_Buffer_Test.dsp: + * tests/version_tests/Priority_Reactor_Test.dsp: + * tests/version_tests/Priority_Task_Test.dsp: + * tests/version_tests/Process_Manager_Test.dsp: + * tests/version_tests/Process_Mutex_Test.dsp: + * tests/version_tests/Process_Strategy_Test.dsp: + * tests/version_tests/RB_Tree_Test.dsp: + * tests/version_tests/Reactor_Notify_Test.dsp: + * tests/version_tests/Reactor_Performance_Test.dsp: + * tests/version_tests/Reactor_Timer_Test.dsp: + * tests/version_tests/Reactors_Test.dsp: + * tests/version_tests/Reader_Writer_Test.dsp: + * tests/version_tests/Recursive_Mutex_Test.dsp: + * tests/version_tests/Reverse_Lock_Test.dsp: + * tests/version_tests/SOCK_Connector_Test.dsp: + * tests/version_tests/SOCK_Send_Recv_Test.dsp: + * tests/version_tests/SOCK_Test.dsp: + * tests/version_tests/SPIPE_Test.dsp: + * tests/version_tests/SString_Test.dsp: + * tests/version_tests/SV_Shared_Memory_Test.dsp: + * tests/version_tests/Semaphore_Test.dsp: + * tests/version_tests/Service_Config_Test.dsp: + * tests/version_tests/Simple_Message_Block_Test.dsp: + * tests/version_tests/Svc_Handler_Test.dsp: + * tests/version_tests/TSS_Test.dsp: + * tests/version_tests/Task_Test.dsp: + * tests/version_tests/Thread_Manager_Test.dsp: + * tests/version_tests/Thread_Mutex_Test.dsp: + * tests/version_tests/Thread_Pool_Reactor_Test.dsp: + * tests/version_tests/Thread_Pool_Test.dsp: + * tests/version_tests/Time_Service_Test.dsp: + * tests/version_tests/Time_Value_Test.dsp: + * tests/version_tests/Timeprobe_Test.dsp: + * tests/version_tests/Timer_Queue_Test.dsp: + * tests/version_tests/Tokens_Test.dsp: + * tests/version_tests/UPIPE_SAP_Test.dsp: + * tests/version_tests/Upgradable_RW_Test.dsp: + * tests/version_tests/version_tests.dsw: + * tests/version_tests/Reactor_Exceptions_Test.dsp: (added) + * tests/version_tests/Sigset_Ops_Test.dsp: (added) + + These files were regenerated. + Mon May 15 12:28:32 2000 Aviad Eden <Aviad_Eden@icomverse.com> * ace/Object_Manager.h: In the paragraph that describes the diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 84b9f232973..94a2e69d552 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,107 @@ +Mon May 15 10:25:38 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/create_vt_dsps.pl: + + I got tired of creating the version tests for the ACE tests, + so why not script it? + + * tests/version_tests/ACE_Init_Test.dsp: (removed) + + This test is tricky. It uses MFC, which gets complicated when + also using the static version of ACE. Since this is the only + test that does this, I just disabled it in the create_vt_dsps.pl. + + * tests/version_tests/Reactor_Exception_Test.dsp: (removed) + * tests/version_tests/Sigset_Op_Test.dsp: (removed) + + These two were named differently than their parents in + tests/, so they have been renamed. + + * tests/version_tests/Atomic_Op_Test.dsp: + * tests/version_tests/Auto_IncDec_Test.dsp: + * tests/version_tests/Barrier_Test.dsp: + * tests/version_tests/Basic_Types_Test.dsp: + * tests/version_tests/Buffer_Stream_Test.dsp: + * tests/version_tests/CDR_File_Test.dsp: + * tests/version_tests/CDR_Test.dsp: + * tests/version_tests/Cache_Map_Manager_Test.dsp: + * tests/version_tests/Cached_Accept_Conn_Test.dsp: + * tests/version_tests/Cached_Conn_Test.dsp: + * tests/version_tests/Capabilities_Test.dsp: + * tests/version_tests/Collection_Test.dsp: + * tests/version_tests/Conn_Test.dsp: + * tests/version_tests/DLL_Test.dsp: + * tests/version_tests/DLList_Test.dsp: + * tests/version_tests/Dynamic_Priority_Test.dsp: + * tests/version_tests/Enum_Interfaces_Test.dsp: + * tests/version_tests/Env_Value_Test.dsp: + * tests/version_tests/Future_Set_Test.dsp: + * tests/version_tests/Future_Test.dsp: + * tests/version_tests/Handle_Set_Test.dsp: + * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: + * tests/version_tests/Hash_Map_Manager_Test.dsp: + * tests/version_tests/High_Res_Timer_Test.dsp: + * tests/version_tests/IOStream_Test.dsp: + * tests/version_tests/Lazy_Map_Manager_Test.dsp: + * tests/version_tests/MM_Shared_Memory_Test.dsp: + * tests/version_tests/MT_Reactor_Timer_Test.dsp: + * tests/version_tests/MT_SOCK_Test.dsp: + * tests/version_tests/Malloc_Test.dsp: + * tests/version_tests/Map_Manager_Test.dsp: + * tests/version_tests/Map_Test.dsp: + * tests/version_tests/Mem_Map_Test.dsp: + * tests/version_tests/Message_Block_Test.dsp: + * tests/version_tests/Message_Queue_Notifications_Test.dsp: + * tests/version_tests/Message_Queue_Test.dsp: + * tests/version_tests/Naming_Test.dsp: + * tests/version_tests/New_Fail_Test.dsp: + * tests/version_tests/Notify_Performance_Test.dsp: + * tests/version_tests/Object_Manager_Test.dsp: + * tests/version_tests/OrdMultiSet_Test.dsp: + * tests/version_tests/Pipe_Test.dsp: + * tests/version_tests/Priority_Buffer_Test.dsp: + * tests/version_tests/Priority_Reactor_Test.dsp: + * tests/version_tests/Priority_Task_Test.dsp: + * tests/version_tests/Process_Manager_Test.dsp: + * tests/version_tests/Process_Mutex_Test.dsp: + * tests/version_tests/Process_Strategy_Test.dsp: + * tests/version_tests/RB_Tree_Test.dsp: + * tests/version_tests/Reactor_Notify_Test.dsp: + * tests/version_tests/Reactor_Performance_Test.dsp: + * tests/version_tests/Reactor_Timer_Test.dsp: + * tests/version_tests/Reactors_Test.dsp: + * tests/version_tests/Reader_Writer_Test.dsp: + * tests/version_tests/Recursive_Mutex_Test.dsp: + * tests/version_tests/Reverse_Lock_Test.dsp: + * tests/version_tests/SOCK_Connector_Test.dsp: + * tests/version_tests/SOCK_Send_Recv_Test.dsp: + * tests/version_tests/SOCK_Test.dsp: + * tests/version_tests/SPIPE_Test.dsp: + * tests/version_tests/SString_Test.dsp: + * tests/version_tests/SV_Shared_Memory_Test.dsp: + * tests/version_tests/Semaphore_Test.dsp: + * tests/version_tests/Service_Config_Test.dsp: + * tests/version_tests/Simple_Message_Block_Test.dsp: + * tests/version_tests/Svc_Handler_Test.dsp: + * tests/version_tests/TSS_Test.dsp: + * tests/version_tests/Task_Test.dsp: + * tests/version_tests/Thread_Manager_Test.dsp: + * tests/version_tests/Thread_Mutex_Test.dsp: + * tests/version_tests/Thread_Pool_Reactor_Test.dsp: + * tests/version_tests/Thread_Pool_Test.dsp: + * tests/version_tests/Time_Service_Test.dsp: + * tests/version_tests/Time_Value_Test.dsp: + * tests/version_tests/Timeprobe_Test.dsp: + * tests/version_tests/Timer_Queue_Test.dsp: + * tests/version_tests/Tokens_Test.dsp: + * tests/version_tests/UPIPE_SAP_Test.dsp: + * tests/version_tests/Upgradable_RW_Test.dsp: + * tests/version_tests/version_tests.dsw: + * tests/version_tests/Reactor_Exceptions_Test.dsp: (added) + * tests/version_tests/Sigset_Ops_Test.dsp: (added) + + These files were regenerated. + Mon May 15 12:28:32 2000 Aviad Eden <Aviad_Eden@icomverse.com> * ace/Object_Manager.h: In the paragraph that describes the diff --git a/bin/create_vt_dsps.pl b/bin/create_vt_dsps.pl new file mode 100755 index 00000000000..2a707039a89 --- /dev/null +++ b/bin/create_vt_dsps.pl @@ -0,0 +1,180 @@ +# $Id$ +# Script that creates the version_tests dsp files +# To use, go to the ACE_wrappers\tests\version_tests directory and +# run. + +if ($^O ne "MSWin32") { + die "Not running on Win32"; +} + +opendir DIR, ".." or die "Couldn't open dir: $!"; + +open DSW, ">version_tests.dsw" or die "Could not create dsw: $!"; + +@allfiles = readdir DIR; +closedir DIR; + +print DSW "Microsoft Developer Studio Workspace File, Format Version 6.00\n"; +print DSW "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\n"; +print DSW "\n"; + +@data=<DATA>; + +foreach $file (@allfiles) { + if ($file =~ /\.dsp$/i) { + ($shortname, $junk) = split /\./, $file; + ### Don't do ACE_Init_Test since it uses static ACE and MFC, which is tricky and isn't + ### covered by this script. + if ($shortname ne "ACE_Init_Test") { + print "Converting: $shortname\n"; + open NEW, ">$file" or die "Could not create $file: $!"; + + my @mydata = @data; + map {s/XXXXXXXX/$shortname/g;} @mydata; + print NEW @mydata; + + open OLD, "<../$file" or die "Could not open ../$file: $!"; + while (<OLD>) { + s/SOURCE=\.\\/SOURCE=\.\.\\/; + print NEW "$_\n" if (/^\# Begin Group/ || /^\# Begin Source/); + print NEW if (/^\# End/ || /^SOURCE=/ || /^\# PROP Default_Filter/); + } + + close OLD; + close NEW; + + print DSW "###############################################################################\n"; + print DSW "\n"; + print DSW "Project: \"$file\"=.\\$file - Package Owner=<4>\n"; + print DSW "\n"; + print DSW "Package=<5>\n"; + print DSW "{{{\n"; + print DSW "}}}\n"; + print DSW "\n"; + print DSW "Package=<4>\n"; + print DSW "{{{\n"; + print DSW "}}}\n"; + print DSW "\n"; + } + } +} + +$junk = $junk; # to get rid of a warning + +print DSW "###############################################################################\n"; +close DSW; + +__DATA__ +# Microsoft Developer Studio Project File - Name="XXXXXXXX" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=XXXXXXXX - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "XXXXXXXX.mak". +!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 "XXXXXXXX.mak" CFG="XXXXXXXX - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "XXXXXXXX - Win32 Static Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "XXXXXXXX - Win32 Static Release" (based on "Win32 (x86) Console Application") +!MESSAGE "XXXXXXXX - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "XXXXXXXX - Win32 Static Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir ".\XXXXXXXX\Static Debug" +# PROP BASE Intermediate_Dir ".\XXXXXXXX\Static Debug" +# PROP BASE Target_Dir ".\XXXXXXXX" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir ".\LIB\Debug" +# PROP Intermediate_Dir ".\LIB\Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir ".\XXXXXXXX" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c +# SUBTRACT CPP /YX +# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace" + +!ELSEIF "$(CFG)" == "XXXXXXXX - Win32 Static Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir ".\XXXXXXXX\Static Release" +# PROP BASE Intermediate_Dir ".\XXXXXXXX\Static Release" +# PROP BASE Target_Dir ".\XXXXXXXX" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir ".\LIB\Release" +# PROP Intermediate_Dir ".\LIB\Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir ".\XXXXXXXX" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c +# SUBTRACT CPP /YX +# 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 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 /machine:I386 +# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" + +!ELSEIF "$(CFG)" == "XXXXXXXX - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir ".\XXXXXXXX\Release" +# PROP BASE Intermediate_Dir ".\XXXXXXXX\Release" +# PROP BASE Target_Dir ".\XXXXXXXX" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir ".\DLL\Release" +# PROP Intermediate_Dir ".\DLL\Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir ".\XXXXXXXX" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c +# SUBTRACT CPP /YX +# 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 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 /machine:I386 +# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" + +!ENDIF + +# Begin Target + +# Name "XXXXXXXX - Win32 Static Debug" +# Name "XXXXXXXX - Win32 Static Release" +# Name "XXXXXXXX - Win32 Release" diff --git a/tests/version_tests/ACE_Init_Test.dsp b/tests/version_tests/ACE_Init_Test.dsp deleted file mode 100644 index 97b550a6ff8..00000000000 --- a/tests/version_tests/ACE_Init_Test.dsp +++ /dev/null @@ -1,298 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Ace_Init_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Ace_Init_Test - Win32 DLL Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "ACE_Init_Test.mak".
-!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 "ACE_Init_Test.mak" CFG="Ace_Init_Test - Win32 DLL Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Ace_Init_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Ace_Init_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Ace_Init_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Ace_Init_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Ace_Init_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Ace_Init_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Ace_Init_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Ace_Init_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Ace_Init_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Ace_Init_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\DLL Release"
-# PROP BASE Target_Dir ".\Ace_Init_Test"
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Ace_Init_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D ACE_HAS_MFC=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Ace_Init_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Ace_Init_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Ace_Init_Test"
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Ace_Init_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "_AFXDLL" /D "WIN32" /D ACE_HAS_MFC=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Ace_Init_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Ace_Init_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Ace_Init_Test"
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Ace_Init_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "ACE_USES_STATIC_MFC" /D "UNICODE" /D "WIN32" /D ACE_HAS_MFC=1 /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Ace_Init_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Ace_Init_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\static Release"
-# PROP BASE Target_Dir ".\Ace_Init_Test"
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Ace_Init_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D ACE_HAS_MFC=1 /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Ace_Init_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Ace_Init_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Ace_Init_Test"
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Ace_Init_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "_AFXDLL" /D "WIN32" /D ACE_HAS_MFC=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-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 /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Ace_Init_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Ace_Init_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Ace_Init_Test"
-# PROP Use_MFC 2
-# 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 ".\Ace_Init_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "_AFXDLL" /D "WIN32" /D ACE_HAS_MFC=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-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 /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aceud.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Ace_Init_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Ace_Init_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\static Debug"
-# PROP BASE Target_Dir ".\Ace_Init_Test"
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Debug"
-# PROP Intermediate_Dir ".\static Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Ace_Init_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D ACE_HAS_MFC=1 /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-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 /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 acesd.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Ace_Init_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Ace_Init_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Ace_Init_Test"
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Ace_Init_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D ACE_HAS_MFC=1 /D "_AFXDLL" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-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 /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 acesud.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF
-
-# Begin Target
-
-# Name "Ace_Init_Test - Win32 DLL Release"
-# Name "Ace_Init_Test - Win32 DLL Unicode Release"
-# Name "Ace_Init_Test - Win32 static Unicode Release"
-# Name "Ace_Init_Test - Win32 static Release"
-# Name "Ace_Init_Test - Win32 DLL Debug"
-# Name "Ace_Init_Test - Win32 DLL Unicode Debug"
-# Name "Ace_Init_Test - Win32 static Debug"
-# Name "Ace_Init_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\ACE_Init_Test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\ACE_Init_TestDlg.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\ACE_Init_Test_Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\ACE_Init_Test_StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\ACE_Init_TestDlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\ACE_Init_Test.rc
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/tests/version_tests/Atomic_Op_Test.dsp b/tests/version_tests/Atomic_Op_Test.dsp index 644dd7ecf46..7ae7257e2ae 100644 --- a/tests/version_tests/Atomic_Op_Test.dsp +++ b/tests/version_tests/Atomic_Op_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Atomic_Op_Test - Win32 DLL Debug
+CFG=Atomic_Op_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "atomic_op_test.mak".
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Atomic_Op_Test.mak".
+!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 "atomic_op_test.mak" CFG="Atomic_Op_Test - Win32 DLL Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Atomic_Op_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "Atomic_Op_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Atomic_Op_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Atomic_Op_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,96 +29,21 @@ CFG=Atomic_Op_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Atomic_Op_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Atomic_Op_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Atomic_Op_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Atomic_Op_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\Static Debug"
# PROP BASE Target_Dir ".\Atomic_Op_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Atomic_Op_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Atomic_Op_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\DLL Release"
-# PROP BASE Target_Dir ".\Atomic_Op_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Atomic_Op_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Atomic_Op_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Atomic_Op_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 ".\Atomic_Op_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Atomic_Op_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\static Debug"
-# PROP BASE Target_Dir ".\Atomic_Op_Test"
-# 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 ".\Atomic_Op_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,21 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Atomic_Op_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\static Release"
+# PROP BASE Output_Dir ".\Atomic_Op_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\Static Release"
# PROP BASE Target_Dir ".\Atomic_Op_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Atomic_Op_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,48 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Atomic_Op_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Atomic_Op_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Atomic_Op_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Atomic_Op_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Atomic_Op_Test\Release"
+# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\Release"
# PROP BASE Target_Dir ".\Atomic_Op_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Atomic_Op_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -207,48 +102,17 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Atomic_Op_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Atomic_Op_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Atomic_Op_Test"
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "Atomic_Op_Test - Win32 DLL Debug"
-# Name "Atomic_Op_Test - Win32 DLL Release"
-# Name "Atomic_Op_Test - Win32 DLL Unicode Debug"
-# Name "Atomic_Op_Test - Win32 static Debug"
-# Name "Atomic_Op_Test - Win32 static Release"
-# Name "Atomic_Op_Test - Win32 static Unicode Debug"
-# Name "Atomic_Op_Test - Win32 static Unicode Release"
-# Name "Atomic_Op_Test - Win32 DLL Unicode Release"
-# Begin Group "Source Files"
+# Name "Atomic_Op_Test - Win32 Static Debug"
+# Name "Atomic_Op_Test - Win32 Static Release"
+# Name "Atomic_Op_Test - Win32 Release"# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# PROP Default_Filter ".cpp"
# Begin Source File
SOURCE=..\Atomic_Op_Test.cpp
@@ -256,15 +120,11 @@ SOURCE=..\Atomic_Op_Test.cpp # End Group
# Begin Group "Header Files"
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# PROP Default_Filter ".h"
# Begin Source File
SOURCE=..\test_config.h
# End Source File
# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Auto_IncDec_Test.dsp b/tests/version_tests/Auto_IncDec_Test.dsp index da237a71745..c62d8a93e4d 100644 --- a/tests/version_tests/Auto_IncDec_Test.dsp +++ b/tests/version_tests/Auto_IncDec_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Auto_IncDec_Test - Win32 DLL Debug
+CFG=Auto_IncDec_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "atomic_op_test.mak".
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Auto_IncDec_Test.mak".
+!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 "atomic_op_test.mak" CFG="Auto_IncDec_Test - Win32 DLL Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Auto_IncDec_Test.mak" CFG="Auto_IncDec_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Auto_IncDec_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Auto_IncDec_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Auto_IncDec_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Auto_IncDec_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Auto_IncDec_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Auto_IncDec_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Auto_IncDec_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Auto_IncDec_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "Auto_IncDec_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Auto_IncDec_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Auto_IncDec_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,96 +29,21 @@ CFG=Auto_IncDec_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Auto_IncDec_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Auto_IncDec_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Auto_IncDec_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Auto_IncDec_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\Static Debug"
# PROP BASE Target_Dir ".\Auto_IncDec_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Auto_IncDec_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Auto_IncDec_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Auto_IncDec_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\DLL Release"
-# PROP BASE Target_Dir ".\Auto_IncDec_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Auto_IncDec_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Auto_IncDec_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Auto_IncDec_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Auto_IncDec_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 ".\Auto_IncDec_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Auto_IncDec_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Auto_IncDec_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\static Debug"
-# PROP BASE Target_Dir ".\Auto_IncDec_Test"
-# 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 ".\Auto_IncDec_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,21 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Auto_IncDec_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Auto_IncDec_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Auto_IncDec_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\static Release"
+# PROP BASE Output_Dir ".\Auto_IncDec_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\Static Release"
# PROP BASE Target_Dir ".\Auto_IncDec_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Auto_IncDec_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,48 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Auto_IncDec_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Auto_IncDec_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Auto_IncDec_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Auto_IncDec_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Auto_IncDec_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Auto_IncDec_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Auto_IncDec_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Auto_IncDec_Test\Release"
+# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\Release"
# PROP BASE Target_Dir ".\Auto_IncDec_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Auto_IncDec_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -207,48 +102,17 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Auto_IncDec_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Auto_IncDec_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Auto_IncDec_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Auto_IncDec_Test"
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "Auto_IncDec_Test - Win32 DLL Debug"
-# Name "Auto_IncDec_Test - Win32 DLL Release"
-# Name "Auto_IncDec_Test - Win32 DLL Unicode Debug"
-# Name "Auto_IncDec_Test - Win32 static Debug"
-# Name "Auto_IncDec_Test - Win32 static Release"
-# Name "Auto_IncDec_Test - Win32 static Unicode Debug"
-# Name "Auto_IncDec_Test - Win32 static Unicode Release"
-# Name "Auto_IncDec_Test - Win32 DLL Unicode Release"
-# Begin Group "Source Files"
+# Name "Auto_IncDec_Test - Win32 Static Debug"
+# Name "Auto_IncDec_Test - Win32 Static Release"
+# Name "Auto_IncDec_Test - Win32 Release"# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# PROP Default_Filter ".cpp"
# Begin Source File
SOURCE=..\Auto_IncDec_Test.cpp
@@ -256,15 +120,11 @@ SOURCE=..\Auto_IncDec_Test.cpp # End Group
# Begin Group "Header Files"
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# PROP Default_Filter ".h"
# Begin Source File
SOURCE=..\test_config.h
# End Source File
# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Barrier_Test.dsp b/tests/version_tests/Barrier_Test.dsp index c12c8565f4e..ed5ad6bf6bb 100644 --- a/tests/version_tests/Barrier_Test.dsp +++ b/tests/version_tests/Barrier_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Barrier_Test - Win32 DLL Debug
+CFG=Barrier_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Barrier_Test - Win32 DLL 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 "Barrier_Test.mak" CFG="Barrier_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Barrier_Test.mak" CFG="Barrier_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Barrier_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Barrier_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Barrier_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Barrier_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=Barrier_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Barrier_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Barrier_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Barrier_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Barrier_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Barrier_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Barrier_Test\Static Debug"
# PROP BASE Target_Dir ".\Barrier_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Barrier_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Barrier_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Barrier_Test\static Debug"
-# PROP BASE Target_Dir ".\Barrier_Test"
-# 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 ".\Barrier_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Barrier_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Barrier_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Barrier_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 ".\Barrier_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Barrier_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Barrier_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Barrier_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Barrier_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Barrier_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Barrier_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Barrier_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Barrier_Test\Static Release"
# PROP BASE Target_Dir ".\Barrier_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Barrier_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Barrier_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Barrier_Test\static Release"
-# PROP BASE Target_Dir ".\Barrier_Test"
-# 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 ".\Barrier_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Barrier_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Barrier_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Barrier_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Barrier_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Barrier_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Barrier_Test\DLL Release"
+# PROP BASE Output_Dir ".\Barrier_Test\Release"
+# PROP BASE Intermediate_Dir ".\Barrier_Test\Release"
# PROP BASE Target_Dir ".\Barrier_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Barrier_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "Barrier_Test - Win32 DLL Debug"
-# Name "Barrier_Test - Win32 static Debug"
-# Name "Barrier_Test - Win32 DLL Unicode Debug"
-# Name "Barrier_Test - Win32 static Unicode Debug"
-# Name "Barrier_Test - Win32 static Unicode Release"
-# Name "Barrier_Test - Win32 static Release"
-# Name "Barrier_Test - Win32 DLL Unicode Release"
-# Name "Barrier_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "Barrier_Test - Win32 Static Debug"
+# Name "Barrier_Test - Win32 Static Release"
+# Name "Barrier_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Basic_Types_Test.dsp b/tests/version_tests/Basic_Types_Test.dsp index deecf1ff221..b1686031189 100644 --- a/tests/version_tests/Basic_Types_Test.dsp +++ b/tests/version_tests/Basic_Types_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Basic_Types_Test - Win32 static Unicode Debug
+CFG=Basic_Types_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Basic_Types_Test - Win32 static Unicode 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 "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 static Unicode Debug"
+!MESSAGE NMAKE /f "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Basic_Types_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Basic_Types_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Basic_Types_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Basic_Types_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Basic_Types_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Basic_Types_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Basic_Types_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Basic_Types_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Basic_Types_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Basic_Types_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Basic_Types_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,121 +29,47 @@ CFG=Basic_Types_Test - Win32 static Unicode Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Basic_Types_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Basic_Types_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DLL Debug"
-# PROP BASE Intermediate_Dir "DLL Debug"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Basic_Types_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Basic_Types_Test\Static Debug"
+# PROP BASE Target_Dir ".\Basic_Types_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# 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" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=1 /YX /FD /c
+# PROP Target_Dir ".\Basic_Types_Test"
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# 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 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 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DLL Unicode Debug"
-# PROP BASE Intermediate_Dir "DLL Unicode Debug"
-# PROP BASE Target_Dir ""
-# 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 ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=1 /D "UNICODE" /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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "static Debug"
-# PROP BASE Intermediate_Dir "static Debug"
-# PROP BASE Target_Dir ""
-# 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 ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "static Unicode Debug"
-# PROP BASE Intermediate_Dir "static Unicode Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# 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" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "DLL Release"
-# PROP BASE Intermediate_Dir "DLL Release"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Basic_Types_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Basic_Types_Test\Static Release"
+# PROP BASE Target_Dir ".\Basic_Types_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=1 /YX /FD /c
+# PROP Target_Dir ".\Basic_Types_Test"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -156,74 +77,24 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "DLL Unicode Release"
-# PROP BASE Intermediate_Dir "DLL Unicode Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=1 /D "UNICODE" /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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "static Unicode Release"
-# PROP BASE Intermediate_Dir "static Unicode Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Basic_Types_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "static Release"
-# PROP BASE Intermediate_Dir "static Release"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Basic_Types_Test\Release"
+# PROP BASE Intermediate_Dir ".\Basic_Types_Test\Release"
+# PROP BASE Target_Dir ".\Basic_Types_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /YX /FD /c
+# PROP Target_Dir ".\Basic_Types_Test"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -231,24 +102,33 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Basic_Types_Test - Win32 DLL Debug"
-# Name "Basic_Types_Test - Win32 DLL Unicode Debug"
-# Name "Basic_Types_Test - Win32 static Debug"
-# Name "Basic_Types_Test - Win32 static Unicode Debug"
-# Name "Basic_Types_Test - Win32 DLL Release"
-# Name "Basic_Types_Test - Win32 DLL Unicode Release"
-# Name "Basic_Types_Test - Win32 static Unicode Release"
-# Name "Basic_Types_Test - Win32 static Release"
+# Name "Basic_Types_Test - Win32 Static Debug"
+# Name "Basic_Types_Test - Win32 Static Release"
+# Name "Basic_Types_Test - Win32 Release"# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
SOURCE=..\Basic_Types_Test.cpp
# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\test_config.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Buffer_Stream_Test.dsp b/tests/version_tests/Buffer_Stream_Test.dsp index 38f64f659b1..0c35ebd5515 100644 --- a/tests/version_tests/Buffer_Stream_Test.dsp +++ b/tests/version_tests/Buffer_Stream_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Buffer_Stream_Test - Win32 DLL Unicode Release
+CFG=Buffer_Stream_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Buffer_Stream_Test - Win32 DLL Unicode Release !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 "Buffer_Stream_Test.mak" CFG="Buffer_Stream_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "Buffer_Stream_Test.mak" CFG="Buffer_Stream_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Buffer_Stream_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Buffer_Stream_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Buffer_Stream_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Buffer_Stream_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Buffer_Stream_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Buffer_Stream_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "Buffer_Stream_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Buffer_Stream_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Buffer_Stream_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Buffer_Stream_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\DLL Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Buffer_Stream_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\Static Debug"
# PROP BASE Target_Dir ".\Buffer_Stream_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Buffer_Stream_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Buffer_Stream_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Buffer_Stream_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\Static Release"
# PROP BASE Target_Dir ".\Buffer_Stream_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Buffer_Stream_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Buffer_Stream_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\static Release"
+# PROP BASE Output_Dir ".\Buffer_Stream_Test\Release"
+# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\Release"
# PROP BASE Target_Dir ".\Buffer_Stream_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Buffer_Stream_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Buffer_Stream_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Buffer_Stream_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 ".\Buffer_Stream_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Buffer_Stream_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Buffer_Stream_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Buffer_Stream_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Buffer_Stream_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Buffer_Stream_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\static Debug"
-# PROP BASE Target_Dir ".\Buffer_Stream_Test"
-# 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 ".\Buffer_Stream_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Buffer_Stream_Test - Win32 DLL Unicode Release"
-# Name "Buffer_Stream_Test - Win32 DLL Release"
-# Name "Buffer_Stream_Test - Win32 static Unicode Release"
-# Name "Buffer_Stream_Test - Win32 static Release"
-# Name "Buffer_Stream_Test - Win32 DLL Unicode Debug"
-# Name "Buffer_Stream_Test - Win32 DLL Debug"
-# Name "Buffer_Stream_Test - Win32 static Unicode Debug"
-# Name "Buffer_Stream_Test - Win32 static Debug"
-# Begin Group "Source Files"
+# Name "Buffer_Stream_Test - Win32 Static Debug"
+# Name "Buffer_Stream_Test - Win32 Static Release"
+# Name "Buffer_Stream_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/CDR_File_Test.dsp b/tests/version_tests/CDR_File_Test.dsp index a0b8d479d34..0e6517f8c03 100644 --- a/tests/version_tests/CDR_File_Test.dsp +++ b/tests/version_tests/CDR_File_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=CDR_File_Test - Win32 DLL Debug
+CFG=CDR_File_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=CDR_File_Test - Win32 DLL 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 "CDR_File_Test.mak" CFG="CDR_File_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "CDR_File_Test.mak" CFG="CDR_File_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "CDR_File_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_File_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_File_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_File_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_File_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_File_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_File_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_File_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR_File_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR_File_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR_File_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=CDR_File_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "CDR_File_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "CDR_File_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\CDR_File_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\CDR_File_Test\DLL Debug"
+# PROP BASE Output_Dir ".\CDR_File_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\CDR_File_Test\Static Debug"
# PROP BASE Target_Dir ".\CDR_File_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\CDR_File_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "CDR_File_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\CDR_File_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\CDR_File_Test\static Debug"
-# PROP BASE Target_Dir ".\CDR_File_Test"
-# 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 ".\CDR_File_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "CDR_File_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\CDR_File_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\CDR_File_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\CDR_File_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 ".\CDR_File_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "CDR_File_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\CDR_File_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\CDR_File_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\CDR_File_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\CDR_File_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "CDR_File_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "CDR_File_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\CDR_File_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\CDR_File_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\CDR_File_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\CDR_File_Test\Static Release"
# PROP BASE Target_Dir ".\CDR_File_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\CDR_File_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "CDR_File_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\CDR_File_Test\static Release"
-# PROP BASE Intermediate_Dir ".\CDR_File_Test\static Release"
-# PROP BASE Target_Dir ".\CDR_File_Test"
-# 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 ".\CDR_File_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "CDR_File_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\CDR_File_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\CDR_File_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\CDR_File_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\CDR_File_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "CDR_File_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "CDR_File_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\CDR_File_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\CDR_File_Test\DLL Release"
+# PROP BASE Output_Dir ".\CDR_File_Test\Release"
+# PROP BASE Intermediate_Dir ".\CDR_File_Test\Release"
# PROP BASE Target_Dir ".\CDR_File_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\CDR_File_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "CDR_File_Test - Win32 DLL Debug"
-# Name "CDR_File_Test - Win32 static Debug"
-# Name "CDR_File_Test - Win32 DLL Unicode Debug"
-# Name "CDR_File_Test - Win32 static Unicode Debug"
-# Name "CDR_File_Test - Win32 static Unicode Release"
-# Name "CDR_File_Test - Win32 static Release"
-# Name "CDR_File_Test - Win32 DLL Unicode Release"
-# Name "CDR_File_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "CDR_File_Test - Win32 Static Debug"
+# Name "CDR_File_Test - Win32 Static Release"
+# Name "CDR_File_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/CDR_Test.dsp b/tests/version_tests/CDR_Test.dsp index cc46a8cc178..cb87958a6ce 100644 --- a/tests/version_tests/CDR_Test.dsp +++ b/tests/version_tests/CDR_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=CDR_Test - Win32 DLL Debug
+CFG=CDR_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=CDR_Test - Win32 DLL 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 "CDR_Test.mak" CFG="CDR_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "CDR_Test.mak" CFG="CDR_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "CDR_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "CDR_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=CDR_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "CDR_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "CDR_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\CDR_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\CDR_Test\DLL Debug"
+# PROP BASE Output_Dir ".\CDR_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\CDR_Test\Static Debug"
# PROP BASE Target_Dir ".\CDR_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\CDR_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "CDR_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\CDR_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\CDR_Test\static Debug"
-# PROP BASE Target_Dir ".\CDR_Test"
-# 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 ".\CDR_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "CDR_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\CDR_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\CDR_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\CDR_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 ".\CDR_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "CDR_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\CDR_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\CDR_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\CDR_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\CDR_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "CDR_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\CDR_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\CDR_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\CDR_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\CDR_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "CDR_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "CDR_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\CDR_Test\static Release"
-# PROP BASE Intermediate_Dir ".\CDR_Test\static Release"
+# PROP BASE Output_Dir ".\CDR_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\CDR_Test\Static Release"
# PROP BASE Target_Dir ".\CDR_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\CDR_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "CDR_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\CDR_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\CDR_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\CDR_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\CDR_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "CDR_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "CDR_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\CDR_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\CDR_Test\DLL Release"
+# PROP BASE Output_Dir ".\CDR_Test\Release"
+# PROP BASE Intermediate_Dir ".\CDR_Test\Release"
# PROP BASE Target_Dir ".\CDR_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\CDR_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "CDR_Test - Win32 DLL Debug"
-# Name "CDR_Test - Win32 static Debug"
-# Name "CDR_Test - Win32 DLL Unicode Debug"
-# Name "CDR_Test - Win32 static Unicode Debug"
-# Name "CDR_Test - Win32 static Unicode Release"
-# Name "CDR_Test - Win32 static Release"
-# Name "CDR_Test - Win32 DLL Unicode Release"
-# Name "CDR_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "CDR_Test - Win32 Static Debug"
+# Name "CDR_Test - Win32 Static Release"
+# Name "CDR_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
@@ -254,17 +118,5 @@ LINK32=link.exe SOURCE=..\CDR_Test.cpp
# End Source File
# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Cache_Map_Manager_Test.dsp b/tests/version_tests/Cache_Map_Manager_Test.dsp index 0b346f34c23..9c8e061b074 100644 --- a/tests/version_tests/Cache_Map_Manager_Test.dsp +++ b/tests/version_tests/Cache_Map_Manager_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Cache_Map_Manager_Test - Win32 DLL Debug
+CFG=Cache_Map_Manager_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "atomic_op_test.mak".
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Cache_Map_Manager_Test.mak".
+!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 "atomic_op_test.mak" CFG="Cache_Map_Manager_Test - Win32 DLL Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Cache_Map_Manager_Test.mak" CFG="Cache_Map_Manager_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cache_Map_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "Cache_Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Cache_Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Cache_Map_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,96 +29,21 @@ CFG=Cache_Map_Manager_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Cache_Map_Manager_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\Static Debug"
# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Cache_Map_Manager_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Release"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_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 ".\Cache_Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Debug"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# 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 ".\Cache_Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,21 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Release"
+# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\Static Release"
# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Cache_Map_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,48 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\Release"
+# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\Release"
# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Cache_Map_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -207,48 +102,17 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cache_Map_Manager_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cache_Map_Manager_Test"
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "Cache_Map_Manager_Test - Win32 DLL Debug"
-# Name "Cache_Map_Manager_Test - Win32 DLL Release"
-# Name "Cache_Map_Manager_Test - Win32 DLL Unicode Debug"
-# Name "Cache_Map_Manager_Test - Win32 static Debug"
-# Name "Cache_Map_Manager_Test - Win32 static Release"
-# Name "Cache_Map_Manager_Test - Win32 static Unicode Debug"
-# Name "Cache_Map_Manager_Test - Win32 static Unicode Release"
-# Name "Cache_Map_Manager_Test - Win32 DLL Unicode Release"
-# Begin Group "Source Files"
+# Name "Cache_Map_Manager_Test - Win32 Static Debug"
+# Name "Cache_Map_Manager_Test - Win32 Static Release"
+# Name "Cache_Map_Manager_Test - Win32 Release"# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# PROP Default_Filter ".cpp"
# Begin Source File
SOURCE=..\Cache_Map_Manager_Test.cpp
@@ -256,15 +120,11 @@ SOURCE=..\Cache_Map_Manager_Test.cpp # End Group
# Begin Group "Header Files"
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# PROP Default_Filter ".h"
# Begin Source File
SOURCE=..\test_config.h
# End Source File
# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Cached_Accept_Conn_Test.dsp b/tests/version_tests/Cached_Accept_Conn_Test.dsp index 5562230939f..1499efc6ebc 100644 --- a/tests/version_tests/Cached_Accept_Conn_Test.dsp +++ b/tests/version_tests/Cached_Accept_Conn_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Cached_Accept_Conn_Test - Win32 DLL Debug
+CFG=Cached_Accept_Conn_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Cached_Accept_Conn_Test - Win32 DLL 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 "Cached_Accept_Conn_Test.mak" CFG="Cached_Accept_Conn_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Cached_Accept_Conn_Test.mak" CFG="Cached_Accept_Conn_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Cached_Accept_Conn_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Accept_Conn_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Accept_Conn_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Accept_Conn_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Accept_Conn_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Accept_Conn_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Accept_Conn_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Accept_Conn_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Cached_Accept_Conn_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Cached_Accept_Conn_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Cached_Accept_Conn_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=Cached_Accept_Conn_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\Static Debug"
# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Cached_Accept_Conn_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\static Debug"
-# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"
-# 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 ".\Cached_Accept_Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Cached_Accept_Conn_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 ".\Cached_Accept_Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cached_Accept_Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cached_Accept_Conn_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\static Release"
+# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\Static Release"
# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Cached_Accept_Conn_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\Release"
+# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\Release"
# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Cached_Accept_Conn_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cached_Accept_Conn_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\DLL Release"
-# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cached_Accept_Conn_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "Cached_Accept_Conn_Test - Win32 DLL Debug"
-# Name "Cached_Accept_Conn_Test - Win32 static Debug"
-# Name "Cached_Accept_Conn_Test - Win32 DLL Unicode Debug"
-# Name "Cached_Accept_Conn_Test - Win32 static Unicode Debug"
-# Name "Cached_Accept_Conn_Test - Win32 static Unicode Release"
-# Name "Cached_Accept_Conn_Test - Win32 static Release"
-# Name "Cached_Accept_Conn_Test - Win32 DLL Unicode Release"
-# Name "Cached_Accept_Conn_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "Cached_Accept_Conn_Test - Win32 Static Debug"
+# Name "Cached_Accept_Conn_Test - Win32 Static Release"
+# Name "Cached_Accept_Conn_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
@@ -259,6 +123,10 @@ SOURCE=..\Cached_Accept_Conn_Test.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
# Begin Source File
+SOURCE=..\Cached_Accept_Conn_Test.h
+# End Source File
+# Begin Source File
+
SOURCE=..\test_config.h
# End Source File
# End Group
diff --git a/tests/version_tests/Cached_Conn_Test.dsp b/tests/version_tests/Cached_Conn_Test.dsp index a6082e06d53..4e4cf9bc247 100644 --- a/tests/version_tests/Cached_Conn_Test.dsp +++ b/tests/version_tests/Cached_Conn_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Cached_Conn_Test - Win32 DLL Debug
+CFG=Cached_Conn_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Cached_Conn_Test - Win32 DLL 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 "Cached_Conn_Test.mak" CFG="Cached_Conn_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Cached_Conn_Test.mak" CFG="Cached_Conn_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Cached_Conn_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Conn_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Conn_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Conn_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Conn_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Conn_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Conn_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Cached_Conn_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Cached_Conn_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Cached_Conn_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Cached_Conn_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=Cached_Conn_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Cached_Conn_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Cached_Conn_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cached_Conn_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Cached_Conn_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\Static Debug"
# PROP BASE Target_Dir ".\Cached_Conn_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Cached_Conn_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Cached_Conn_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cached_Conn_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\static Debug"
-# PROP BASE Target_Dir ".\Cached_Conn_Test"
-# 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 ".\Cached_Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Cached_Conn_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cached_Conn_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Cached_Conn_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 ".\Cached_Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cached_Conn_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Cached_Conn_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Cached_Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cached_Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cached_Conn_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cached_Conn_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Cached_Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cached_Conn_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cached_Conn_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Cached_Conn_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cached_Conn_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\static Release"
+# PROP BASE Output_Dir ".\Cached_Conn_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\Static Release"
# PROP BASE Target_Dir ".\Cached_Conn_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Cached_Conn_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Cached_Conn_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Cached_Conn_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cached_Conn_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Cached_Conn_Test\Release"
+# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\Release"
# PROP BASE Target_Dir ".\Cached_Conn_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Cached_Conn_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Cached_Conn_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Cached_Conn_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\DLL Release"
-# PROP BASE Target_Dir ".\Cached_Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Cached_Conn_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,17 +108,11 @@ LINK32=link.exe # Begin Target
-# Name "Cached_Conn_Test - Win32 DLL Debug"
-# Name "Cached_Conn_Test - Win32 static Debug"
-# Name "Cached_Conn_Test - Win32 DLL Unicode Debug"
-# Name "Cached_Conn_Test - Win32 static Unicode Debug"
-# Name "Cached_Conn_Test - Win32 static Unicode Release"
-# Name "Cached_Conn_Test - Win32 static Release"
-# Name "Cached_Conn_Test - Win32 DLL Unicode Release"
-# Name "Cached_Conn_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "Cached_Conn_Test - Win32 Static Debug"
+# Name "Cached_Conn_Test - Win32 Static Release"
+# Name "Cached_Conn_Test - Win32 Release"# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# PROP Default_Filter ".cpp"
# Begin Source File
SOURCE=..\Cached_Conn_Test.cpp
@@ -256,15 +120,11 @@ SOURCE=..\Cached_Conn_Test.cpp # End Group
# Begin Group "Header Files"
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# PROP Default_Filter ".h"
# Begin Source File
SOURCE=..\test_config.h
# End Source File
# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Capabilities_Test.dsp b/tests/version_tests/Capabilities_Test.dsp index ccddc5c60ce..3edd54e3915 100644 --- a/tests/version_tests/Capabilities_Test.dsp +++ b/tests/version_tests/Capabilities_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Capabilities_Test - Win32 DLL Unicode Release
+CFG=Capabilities_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Capabilities_Test - Win32 DLL Unicode Release !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 "Capabilities_Test.mak" CFG="Capabilities_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "Capabilities_Test.mak" CFG="Capabilities_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Capabilities_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Capabilities_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Capabilities_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Capabilities_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Capabilities_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Capabilities_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Capabilities_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Capabilities_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Capabilities_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Capabilities_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Capabilities_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Capabilities_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Capabilities_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "Capabilities_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Capabilities_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Capabilities_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Capabilities_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Capabilities_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Capabilities_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Capabilities_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Capabilities_Test\static Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Capabilities_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Capabilities_Test\Static Debug"
# PROP BASE Target_Dir ".\Capabilities_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Capabilities_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Capabilities_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Capabilities_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Capabilities_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Capabilities_Test\static Release"
+# PROP BASE Output_Dir ".\Capabilities_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Capabilities_Test\Static Release"
# PROP BASE Target_Dir ".\Capabilities_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Capabilities_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Capabilities_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Capabilities_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Capabilities_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Capabilities_Test\DLL Release"
+# PROP BASE Output_Dir ".\Capabilities_Test\Release"
+# PROP BASE Intermediate_Dir ".\Capabilities_Test\Release"
# PROP BASE Target_Dir ".\Capabilities_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Capabilities_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -134,119 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Capabilities_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Capabilities_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Capabilities_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Capabilities_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Capabilities_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Capabilities_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Capabilities_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Capabilities_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Capabilities_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 ".\Capabilities_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Capabilities_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Capabilities_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Capabilities_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Capabilities_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Capabilities_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Capabilities_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Capabilities_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Capabilities_Test\static Debug"
-# PROP BASE Target_Dir ".\Capabilities_Test"
-# 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 ".\Capabilities_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "Capabilities_Test - Win32 DLL Unicode Release"
-# Name "Capabilities_Test - Win32 static Unicode Release"
-# Name "Capabilities_Test - Win32 static Release"
-# Name "Capabilities_Test - Win32 DLL Release"
-# Name "Capabilities_Test - Win32 DLL Debug"
-# Name "Capabilities_Test - Win32 DLL Unicode Debug"
-# Name "Capabilities_Test - Win32 static Unicode Debug"
-# Name "Capabilities_Test - Win32 static Debug"
-# Begin Group "Source Files"
+# Name "Capabilities_Test - Win32 Static Debug"
+# Name "Capabilities_Test - Win32 Static Release"
+# Name "Capabilities_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Collection_Test.dsp b/tests/version_tests/Collection_Test.dsp index be477c4559a..5d2725f8a14 100644 --- a/tests/version_tests/Collection_Test.dsp +++ b/tests/version_tests/Collection_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Collection_Test - Win32 DLL Release
+CFG=Collection_Test - Win32 Release
!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 "Collection_Test.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 "Collection_Test.mak" CFG="Collection_Test - Win32 DLL Release"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Collection_Test.mak" CFG="Collection_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Collection_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Collection_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Collection_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Collection_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Collection_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Collection_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Collection_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Collection_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "Collection_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Collection_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Collection_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,71 +29,46 @@ CFG=Collection_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Collection_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Collection_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Collection_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Collection_Test\DLL Release"
-# PROP BASE Target_Dir ".\Collection_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Collection_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Collection_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Collection_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Collection_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Collection_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Collection_Test\Static Debug"
# PROP BASE Target_Dir ".\Collection_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Collection_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Collection_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Collection_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Collection_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Collection_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Collection_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Collection_Test\Static Release"
# PROP BASE Target_Dir ".\Collection_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Collection_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Collection_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Collection_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Collection_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Collection_Test\static Release"
+# PROP BASE Output_Dir ".\Collection_Test\Release"
+# PROP BASE Intermediate_Dir ".\Collection_Test\Release"
# PROP BASE Target_Dir ".\Collection_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Collection_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Collection_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Collection_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Collection_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Collection_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Collection_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Collection_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Collection_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Collection_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Collection_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 ".\Collection_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Collection_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Collection_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Collection_Test\static Debug"
-# PROP BASE Target_Dir ".\Collection_Test"
-# 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 ".\Collection_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Collection_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Collection_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Collection_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Collection_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Collection_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "Collection_Test - Win32 DLL Release"
-# Name "Collection_Test - Win32 DLL Unicode Release"
-# Name "Collection_Test - Win32 static Unicode Release"
-# Name "Collection_Test - Win32 static Release"
-# Name "Collection_Test - Win32 DLL Debug"
-# Name "Collection_Test - Win32 DLL Unicode Debug"
-# Name "Collection_Test - Win32 static Debug"
-# Name "Collection_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Collection_Test - Win32 Static Debug"
+# Name "Collection_Test - Win32 Static Release"
+# Name "Collection_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Conn_Test.dsp b/tests/version_tests/Conn_Test.dsp index fcb89507a38..c9b50eaf111 100644 --- a/tests/version_tests/Conn_Test.dsp +++ b/tests/version_tests/Conn_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Conn_Test - Win32 DLL Unicode Release
+CFG=Conn_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Conn_Test - Win32 DLL Unicode Release !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 "Conn_Test.mak" CFG="Conn_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Conn_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Conn_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Conn_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Conn_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Conn_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Conn_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "Conn_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Conn_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Conn_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Conn_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Conn_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Conn_Test\static Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Conn_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Conn_Test\Static Debug"
# PROP BASE Target_Dir ".\Conn_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Conn_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Conn_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Conn_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Conn_Test\static Release"
+# PROP BASE Output_Dir ".\Conn_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Conn_Test\Static Release"
# PROP BASE Target_Dir ".\Conn_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Conn_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Conn_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Conn_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Conn_Test\DLL Release"
+# PROP BASE Output_Dir ".\Conn_Test\Release"
+# PROP BASE Intermediate_Dir ".\Conn_Test\Release"
# PROP BASE Target_Dir ".\Conn_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Conn_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -134,119 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Conn_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Conn_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Conn_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Conn_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Conn_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 ".\Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Conn_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Conn_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Conn_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Conn_Test\static Debug"
-# PROP BASE Target_Dir ".\Conn_Test"
-# 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 ".\Conn_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "Conn_Test - Win32 DLL Unicode Release"
-# Name "Conn_Test - Win32 static Unicode Release"
-# Name "Conn_Test - Win32 static Release"
-# Name "Conn_Test - Win32 DLL Release"
-# Name "Conn_Test - Win32 DLL Debug"
-# Name "Conn_Test - Win32 DLL Unicode Debug"
-# Name "Conn_Test - Win32 static Unicode Debug"
-# Name "Conn_Test - Win32 static Debug"
-# Begin Group "Source Files"
+# Name "Conn_Test - Win32 Static Debug"
+# Name "Conn_Test - Win32 Static Release"
+# Name "Conn_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/DLL_Test.dsp b/tests/version_tests/DLL_Test.dsp index 919f5b69ab4..1d000612e80 100644 --- a/tests/version_tests/DLL_Test.dsp +++ b/tests/version_tests/DLL_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=DLL_Test - Win32 DLL Release
+CFG=DLL_Test - Win32 Release
!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 "DLL_Test.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 "DLL_Test.mak" CFG="DLL_Test - Win32 DLL Release"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "DLL_Test.mak" CFG="DLL_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "DLL_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLL_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLL_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLL_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLL_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLL_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLL_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLL_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "DLL_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLL_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLL_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,71 +29,46 @@ CFG=DLL_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "DLL_Test - Win32 DLL Release"
+!IF "$(CFG)" == "DLL_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\DLL_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\DLL_Test\DLL Release"
-# PROP BASE Target_Dir ".\DLL_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\DLL_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "DLL_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\DLL_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\DLL_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\DLL_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\DLL_Test\Static Debug"
# PROP BASE Target_Dir ".\DLL_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\DLL_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "DLL_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "DLL_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\DLL_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\DLL_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\DLL_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\DLL_Test\Static Release"
# PROP BASE Target_Dir ".\DLL_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\DLL_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "DLL_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "DLL_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\DLL_Test\static Release"
-# PROP BASE Intermediate_Dir ".\DLL_Test\static Release"
+# PROP BASE Output_Dir ".\DLL_Test\Release"
+# PROP BASE Intermediate_Dir ".\DLL_Test\Release"
# PROP BASE Target_Dir ".\DLL_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\DLL_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "DLL_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\DLL_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\DLL_Test\DLL Debug"
-# PROP BASE Target_Dir ".\DLL_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\DLL_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "DLL_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\DLL_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\DLL_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\DLL_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 ".\DLL_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "DLL_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\DLL_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\DLL_Test\static Debug"
-# PROP BASE Target_Dir ".\DLL_Test"
-# 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 ".\DLL_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "DLL_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\DLL_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\DLL_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\DLL_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\DLL_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "DLL_Test - Win32 DLL Release"
-# Name "DLL_Test - Win32 DLL Unicode Release"
-# Name "DLL_Test - Win32 static Unicode Release"
-# Name "DLL_Test - Win32 static Release"
-# Name "DLL_Test - Win32 DLL Debug"
-# Name "DLL_Test - Win32 DLL Unicode Debug"
-# Name "DLL_Test - Win32 static Debug"
-# Name "DLL_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "DLL_Test - Win32 Static Debug"
+# Name "DLL_Test - Win32 Static Release"
+# Name "DLL_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/DLList_Test.dsp b/tests/version_tests/DLList_Test.dsp index 4a8c69e5fd6..647c0642599 100644 --- a/tests/version_tests/DLList_Test.dsp +++ b/tests/version_tests/DLList_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=DLList_Test - Win32 DLL Debug
+CFG=DLList_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=DLList_Test - Win32 DLL 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 "DLList_Test.mak" CFG="DLList_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "DLList_Test.mak" CFG="DLList_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "DLList_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLList_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLList_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLList_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLList_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLList_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLList_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "DLList_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLList_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLList_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLList_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=DLList_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "DLList_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "DLList_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\DLList_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\DLList_Test\DLL Debug"
+# PROP BASE Output_Dir ".\DLList_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\DLList_Test\Static Debug"
# PROP BASE Target_Dir ".\DLList_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\DLList_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "DLList_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\DLList_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\DLList_Test\static Debug"
-# PROP BASE Target_Dir ".\DLList_Test"
-# 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 ".\DLList_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "DLList_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\DLList_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\DLList_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\DLList_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 ".\DLList_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "DLList_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\DLList_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\DLList_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\DLList_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\DLList_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "DLList_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "DLList_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\DLList_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\DLList_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\DLList_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\DLList_Test\Static Release"
# PROP BASE Target_Dir ".\DLList_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\DLList_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "DLList_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\DLList_Test\static Release"
-# PROP BASE Intermediate_Dir ".\DLList_Test\static Release"
-# PROP BASE Target_Dir ".\DLList_Test"
-# 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 ".\DLList_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "DLList_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\DLList_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\DLList_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\DLList_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\DLList_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "DLList_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "DLList_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\DLList_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\DLList_Test\DLL Release"
+# PROP BASE Output_Dir ".\DLList_Test\Release"
+# PROP BASE Intermediate_Dir ".\DLList_Test\Release"
# PROP BASE Target_Dir ".\DLList_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\DLList_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "DLList_Test - Win32 DLL Debug"
-# Name "DLList_Test - Win32 static Debug"
-# Name "DLList_Test - Win32 DLL Unicode Debug"
-# Name "DLList_Test - Win32 static Unicode Debug"
-# Name "DLList_Test - Win32 static Unicode Release"
-# Name "DLList_Test - Win32 static Release"
-# Name "DLList_Test - Win32 DLL Unicode Release"
-# Name "DLList_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "DLList_Test - Win32 Static Debug"
+# Name "DLList_Test - Win32 Static Release"
+# Name "DLList_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Dynamic_Priority_Test.dsp b/tests/version_tests/Dynamic_Priority_Test.dsp index 9b830d4ff85..9d7838a1a3e 100644 --- a/tests/version_tests/Dynamic_Priority_Test.dsp +++ b/tests/version_tests/Dynamic_Priority_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Dynamic_Priority_Test - Win32 DLL Debug
+CFG=Dynamic_Priority_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Dynamic_Priority_Test - Win32 DLL 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 "Dynamic_Priority_Test.mak" CFG="Dynamic_Priority_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Dynamic_Priority_Test.mak" CFG="Dynamic_Priority_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Dynamic_Priority_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Dynamic_Priority_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Dynamic_Priority_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Dynamic_Priority_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Dynamic_Priority_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Dynamic_Priority_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Dynamic_Priority_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Dynamic_Priority_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Dynamic_Priority_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Dynamic_Priority_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Dynamic_Priority_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=Dynamic_Priority_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Dynamic_Priority_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Dynamic_Priority_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Dynamic_Priority_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Dynamic_Priority_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\Static Debug"
# PROP BASE Target_Dir ".\Dynamic_Priority_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Dynamic_Priority_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Dynamic_Priority_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\static Debug"
-# PROP BASE Target_Dir ".\Dynamic_Priority_Test"
-# 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 ".\Dynamic_Priority_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Dynamic_Priority_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Dynamic_Priority_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 ".\Dynamic_Priority_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Dynamic_Priority_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Dynamic_Priority_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Dynamic_Priority_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Dynamic_Priority_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Dynamic_Priority_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\Static Release"
# PROP BASE Target_Dir ".\Dynamic_Priority_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Dynamic_Priority_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Dynamic_Priority_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\static Release"
-# PROP BASE Target_Dir ".\Dynamic_Priority_Test"
-# 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 ".\Dynamic_Priority_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Dynamic_Priority_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Dynamic_Priority_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Dynamic_Priority_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Dynamic_Priority_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Dynamic_Priority_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\DLL Release"
+# PROP BASE Output_Dir ".\Dynamic_Priority_Test\Release"
+# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\Release"
# PROP BASE Target_Dir ".\Dynamic_Priority_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Dynamic_Priority_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "Dynamic_Priority_Test - Win32 DLL Debug"
-# Name "Dynamic_Priority_Test - Win32 static Debug"
-# Name "Dynamic_Priority_Test - Win32 DLL Unicode Debug"
-# Name "Dynamic_Priority_Test - Win32 static Unicode Debug"
-# Name "Dynamic_Priority_Test - Win32 static Unicode Release"
-# Name "Dynamic_Priority_Test - Win32 static Release"
-# Name "Dynamic_Priority_Test - Win32 DLL Unicode Release"
-# Name "Dynamic_Priority_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "Dynamic_Priority_Test - Win32 Static Debug"
+# Name "Dynamic_Priority_Test - Win32 Static Release"
+# Name "Dynamic_Priority_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Enum_Interfaces_Test.dsp b/tests/version_tests/Enum_Interfaces_Test.dsp index 741c257768f..f001fe66e30 100644 --- a/tests/version_tests/Enum_Interfaces_Test.dsp +++ b/tests/version_tests/Enum_Interfaces_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Enum_Interfaces_Test - Win32 DLL Debug
+CFG=Enum_Interfaces_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Enum_Interfaces_Test - Win32 DLL 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 "Enum_Interfaces_Test.mak" CFG="Enum_Interfaces_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak" CFG="Enum_Interfaces_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Enum_Interfaces_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Enum_Interfaces_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Enum_Interfaces_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Enum_Interfaces_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Enum_Interfaces_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Enum_Interfaces_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Enum_Interfaces_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Enum_Interfaces_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Enum_Interfaces_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\Static Debug"
# PROP BASE Target_Dir ".\Enum_Interfaces_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Enum_Interfaces_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Enum_Interfaces_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Enum_Interfaces_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 ".\Enum_Interfaces_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Enum_Interfaces_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\static Debug"
-# PROP BASE Target_Dir ".\Enum_Interfaces_Test"
-# 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 ".\Enum_Interfaces_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Enum_Interfaces_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Enum_Interfaces_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Enum_Interfaces_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Enum_Interfaces_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Enum_Interfaces_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Enum_Interfaces_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Enum_Interfaces_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\DLL Release"
+# PROP BASE Output_Dir ".\Enum_Interfaces_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\Static Release"
# PROP BASE Target_Dir ".\Enum_Interfaces_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Enum_Interfaces_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Enum_Interfaces_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\static Release"
-# PROP BASE Target_Dir ".\Enum_Interfaces_Test"
-# 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 ".\Enum_Interfaces_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Enum_Interfaces_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Enum_Interfaces_Test\Release"
+# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\Release"
# PROP BASE Target_Dir ".\Enum_Interfaces_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Enum_Interfaces_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Enum_Interfaces_Test - Win32 DLL Debug"
-# Name "Enum_Interfaces_Test - Win32 DLL Unicode Debug"
-# Name "Enum_Interfaces_Test - Win32 static Debug"
-# Name "Enum_Interfaces_Test - Win32 static Unicode Debug"
-# Name "Enum_Interfaces_Test - Win32 DLL Unicode Release"
-# Name "Enum_Interfaces_Test - Win32 DLL Release"
-# Name "Enum_Interfaces_Test - Win32 static Release"
-# Name "Enum_Interfaces_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
+# Name "Enum_Interfaces_Test - Win32 Static Debug"
+# Name "Enum_Interfaces_Test - Win32 Static Release"
+# Name "Enum_Interfaces_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Env_Value_Test.dsp b/tests/version_tests/Env_Value_Test.dsp index c469802dcd0..33d9a8a1bf6 100644 --- a/tests/version_tests/Env_Value_Test.dsp +++ b/tests/version_tests/Env_Value_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Env_Value_Test - Win32 DLL Unicode Release
+CFG=Env_Value_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Env_Value_Test - Win32 DLL Unicode Release !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 "Env_Value_Test.mak" CFG="Env_Value_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "Env_Value_Test.mak" CFG="Env_Value_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Env_Value_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Env_Value_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Env_Value_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Env_Value_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Env_Value_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Env_Value_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Env_Value_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Env_Value_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Env_Value_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Env_Value_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Env_Value_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Env_Value_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Env_Value_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "Env_Value_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Env_Value_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Env_Value_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Env_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Env_Value_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Env_Value_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Env_Value_Test\DLL Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Env_Value_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Env_Value_Test\Static Debug"
# PROP BASE Target_Dir ".\Env_Value_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Env_Value_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Env_Value_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Env_Value_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Env_Value_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Env_Value_Test\Static Release"
# PROP BASE Target_Dir ".\Env_Value_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Env_Value_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Env_Value_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Env_Value_Test\static Release"
+# PROP BASE Output_Dir ".\Env_Value_Test\Release"
+# PROP BASE Intermediate_Dir ".\Env_Value_Test\Release"
# PROP BASE Target_Dir ".\Env_Value_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Env_Value_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Env_Value_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Env_Value_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Env_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Env_Value_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Env_Value_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Env_Value_Test\static Debug"
-# PROP BASE Target_Dir ".\Env_Value_Test"
-# 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 ".\Env_Value_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Env_Value_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Env_Value_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Env_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Env_Value_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Env_Value_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Env_Value_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Env_Value_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Env_Value_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 ".\Env_Value_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Env_Value_Test - Win32 DLL Unicode Release"
-# Name "Env_Value_Test - Win32 DLL Release"
-# Name "Env_Value_Test - Win32 static Unicode Release"
-# Name "Env_Value_Test - Win32 static Release"
-# Name "Env_Value_Test - Win32 DLL Debug"
-# Name "Env_Value_Test - Win32 static Debug"
-# Name "Env_Value_Test - Win32 static Unicode Debug"
-# Name "Env_Value_Test - Win32 DLL Unicode Debug"
-# Begin Group "Source Files"
+# Name "Env_Value_Test - Win32 Static Debug"
+# Name "Env_Value_Test - Win32 Static Release"
+# Name "Env_Value_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Future_Set_Test.dsp b/tests/version_tests/Future_Set_Test.dsp index 00bd74156ef..c84e4ec91ae 100644 --- a/tests/version_tests/Future_Set_Test.dsp +++ b/tests/version_tests/Future_Set_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Future_Set_Test - Win32 DLL Debug
+CFG=Future_Set_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "atomic_op_test.mak".
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Future_Set_Test.mak".
+!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 "atomic_op_test.mak" CFG="Future_Set_Test - Win32 DLL Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Future_Set_Test.mak" CFG="Future_Set_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Future_Set_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Set_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "Future_Set_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Future_Set_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Future_Set_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,96 +29,21 @@ CFG=Future_Set_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Future_Set_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Future_Set_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Future_Set_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Future_Set_Test\Static Debug"
# PROP BASE Target_Dir ".\Future_Set_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Future_Set_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Release"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Future_Set_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 ".\Future_Set_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Set_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Debug"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# 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 ".\Future_Set_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,21 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Future_Set_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Release"
+# PROP BASE Output_Dir ".\Future_Set_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Future_Set_Test\Static Release"
# PROP BASE Target_Dir ".\Future_Set_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Future_Set_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,48 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Set_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Future_Set_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Future_Set_Test\Release"
+# PROP BASE Intermediate_Dir ".\Future_Set_Test\Release"
# PROP BASE Target_Dir ".\Future_Set_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Future_Set_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -207,46 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Set_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Future_Set_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Future_Set_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Future_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Set_Test"
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "Future_Set_Test - Win32 DLL Debug"
-# Name "Future_Set_Test - Win32 DLL Release"
-# Name "Future_Set_Test - Win32 DLL Unicode Debug"
-# Name "Future_Set_Test - Win32 static Debug"
-# Name "Future_Set_Test - Win32 static Release"
-# Name "Future_Set_Test - Win32 static Unicode Debug"
-# Name "Future_Set_Test - Win32 static Unicode Release"
-# Name "Future_Set_Test - Win32 DLL Unicode Release"
-# Begin Group "Source Files"
+# Name "Future_Set_Test - Win32 Static Debug"
+# Name "Future_Set_Test - Win32 Static Release"
+# Name "Future_Set_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Future_Test.dsp b/tests/version_tests/Future_Test.dsp index 7f2c42f8c9e..99c67c8ca11 100644 --- a/tests/version_tests/Future_Test.dsp +++ b/tests/version_tests/Future_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Future_Test - Win32 static Unicode Debug
+CFG=Future_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Future_Test - Win32 static Unicode 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 "Future_Test.mak" CFG="Future_Test - Win32 static Unicode Debug"
+!MESSAGE NMAKE /f "Future_Test.mak" CFG="Future_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Future_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Future_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Future_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Future_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Future_Test - Win32 static Unicode Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Future_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Future_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Future_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Future_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Future_Test\Static Debug"
# PROP BASE Target_Dir ".\Future_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Future_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Future_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Future_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 ".\Future_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Future_Test\static Debug"
-# PROP BASE Target_Dir ".\Future_Test"
-# 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 ".\Future_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,102 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Future_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Future_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Future_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Future_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Future_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Future_Test\DLL Release"
-# PROP BASE Intermediate_Dir "Future_Test\DLL Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=1 /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386 /libpath:"..\..\ace"
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Future_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir "Future_Test\DLL Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 aceu.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 /machine:I386 /libpath:"..\..\ace"
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Future_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir "Future_Test\static Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
+# PROP BASE Output_Dir ".\Future_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Future_Test\Static Release"
+# PROP BASE Target_Dir ".\Future_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# PROP Target_Dir ".\Future_Test"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -212,26 +76,24 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 acesu.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 /machine:I386 /libpath:"..\..\ace"
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 /machine:I386
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Future_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Future_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Future_Test\static Release"
-# PROP BASE Intermediate_Dir "Future_Test\static Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
+# PROP BASE Output_Dir ".\Future_Test\Release"
+# PROP BASE Intermediate_Dir ".\Future_Test\Release"
+# PROP BASE Target_Dir ".\Future_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# PROP Target_Dir ".\Future_Test"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -239,22 +101,16 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 aces.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 /machine:I386 /libpath:"..\..\ace"
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 /machine:I386
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Future_Test - Win32 DLL Debug"
-# Name "Future_Test - Win32 DLL Unicode Debug"
-# Name "Future_Test - Win32 static Debug"
-# Name "Future_Test - Win32 static Unicode Debug"
-# Name "Future_Test - Win32 DLL Release"
-# Name "Future_Test - Win32 DLL Unicode Release"
-# Name "Future_Test - Win32 static Unicode Release"
-# Name "Future_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "Future_Test - Win32 Static Debug"
+# Name "Future_Test - Win32 Static Release"
+# Name "Future_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Handle_Set_Test.dsp b/tests/version_tests/Handle_Set_Test.dsp index 9dec855222c..454605385ee 100644 --- a/tests/version_tests/Handle_Set_Test.dsp +++ b/tests/version_tests/Handle_Set_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Handle_Set_Test - Win32 DLL Debug
+CFG=Handle_Set_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Handle_Set_Test - Win32 DLL 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 "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Handle_Set_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Handle_Set_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Handle_Set_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Handle_Set_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Handle_Set_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Handle_Set_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Handle_Set_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Handle_Set_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Handle_Set_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Handle_Set_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Handle_Set_Test\Static Debug"
# PROP BASE Target_Dir ".\Handle_Set_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Handle_Set_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Handle_Set_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Handle_Set_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Handle_Set_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 ".\Handle_Set_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Handle_Set_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Handle_Set_Test\static Debug"
-# PROP BASE Target_Dir ".\Handle_Set_Test"
-# 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 ".\Handle_Set_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Handle_Set_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Handle_Set_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Handle_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Handle_Set_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Handle_Set_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Handle_Set_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Handle_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Handle_Set_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Handle_Set_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Handle_Set_Test\DLL Release"
+# PROP BASE Output_Dir ".\Handle_Set_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Handle_Set_Test\Static Release"
# PROP BASE Target_Dir ".\Handle_Set_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Handle_Set_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Handle_Set_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Handle_Set_Test\static Release"
-# PROP BASE Target_Dir ".\Handle_Set_Test"
-# 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 ".\Handle_Set_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Handle_Set_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Handle_Set_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Handle_Set_Test\Release"
+# PROP BASE Intermediate_Dir ".\Handle_Set_Test\Release"
# PROP BASE Target_Dir ".\Handle_Set_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Handle_Set_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Handle_Set_Test - Win32 DLL Debug"
-# Name "Handle_Set_Test - Win32 DLL Unicode Debug"
-# Name "Handle_Set_Test - Win32 static Debug"
-# Name "Handle_Set_Test - Win32 static Unicode Debug"
-# Name "Handle_Set_Test - Win32 DLL Unicode Release"
-# Name "Handle_Set_Test - Win32 DLL Release"
-# Name "Handle_Set_Test - Win32 static Release"
-# Name "Handle_Set_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
+# Name "Handle_Set_Test - Win32 Static Debug"
+# Name "Handle_Set_Test - Win32 Static Release"
+# Name "Handle_Set_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp b/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp index d21a3fbee8c..5afddaa7ffb 100644 --- a/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp +++ b/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Hash_Map_Bucket_Iterator_Test - Win32 DLL Debug
+CFG=Hash_Map_Bucket_Iterator_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Hash_Map_Bucket_Iterator_Test - Win32 DLL 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 "Hash_Map_Bucket_Iterator_Test.mak" CFG="Hash_Map_Bucket_Iterator_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Hash_Map_Bucket_Iterator_Test.mak" CFG="Hash_Map_Bucket_Iterator_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=Hash_Map_Bucket_Iterator_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\Static Debug"
# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\static Debug"
-# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
-# 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 ".\Hash_Map_Bucket_Iterator_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_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 ".\Hash_Map_Bucket_Iterator_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\static Release"
+# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\Static Release"
# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\Release"
+# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\Release"
# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\DLL Release"
-# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "Hash_Map_Bucket_Iterator_Test - Win32 DLL Debug"
-# Name "Hash_Map_Bucket_Iterator_Test - Win32 static Debug"
-# Name "Hash_Map_Bucket_Iterator_Test - Win32 DLL Unicode Debug"
-# Name "Hash_Map_Bucket_Iterator_Test - Win32 static Unicode Debug"
-# Name "Hash_Map_Bucket_Iterator_Test - Win32 static Unicode Release"
-# Name "Hash_Map_Bucket_Iterator_Test - Win32 static Release"
-# Name "Hash_Map_Bucket_Iterator_Test - Win32 DLL Unicode Release"
-# Name "Hash_Map_Bucket_Iterator_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug"
+# Name "Hash_Map_Bucket_Iterator_Test - Win32 Static Release"
+# Name "Hash_Map_Bucket_Iterator_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
@@ -257,10 +121,6 @@ SOURCE=..\Hash_Map_Bucket_Iterator_Test.cpp # Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/tests/version_tests/Hash_Map_Manager_Test.dsp b/tests/version_tests/Hash_Map_Manager_Test.dsp index 152c260d1a2..27b28a530be 100644 --- a/tests/version_tests/Hash_Map_Manager_Test.dsp +++ b/tests/version_tests/Hash_Map_Manager_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Hash_Map_Manager_Test - Win32 DLL Debug
+CFG=Hash_Map_Manager_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Hash_Map_Manager_Test - Win32 DLL 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 "Hash_Map_Manager_Test.mak" CFG="Hash_Map_Manager_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak" CFG="Hash_Map_Manager_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Hash_Map_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Hash_Map_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,96 +29,21 @@ CFG=Hash_Map_Manager_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Hash_Map_Manager_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\Static Debug"
# PROP BASE Target_Dir ".\Hash_Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Hash_Map_Manager_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Hash_Map_Manager_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 ".\Hash_Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Hash_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Hash_Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\static Debug"
-# PROP BASE Target_Dir ".\Hash_Map_Manager_Test"
-# 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 ".\Hash_Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,71 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\DLL Release"
+# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\Static Release"
# PROP BASE Target_Dir ".\Hash_Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Hash_Map_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Hash_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Hash_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\static Release"
-# PROP BASE Target_Dir ".\Hash_Map_Manager_Test"
-# 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 ".\Hash_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\Release"
+# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\Release"
# PROP BASE Target_Dir ".\Hash_Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Hash_Map_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Hash_Map_Manager_Test - Win32 DLL Debug"
-# Name "Hash_Map_Manager_Test - Win32 DLL Unicode Debug"
-# Name "Hash_Map_Manager_Test - Win32 static Unicode Debug"
-# Name "Hash_Map_Manager_Test - Win32 static Debug"
-# Name "Hash_Map_Manager_Test - Win32 DLL Release"
-# Name "Hash_Map_Manager_Test - Win32 DLL Unicode Release"
-# Name "Hash_Map_Manager_Test - Win32 static Release"
-# Name "Hash_Map_Manager_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
+# Name "Hash_Map_Manager_Test - Win32 Static Debug"
+# Name "Hash_Map_Manager_Test - Win32 Static Release"
+# Name "Hash_Map_Manager_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
@@ -257,14 +121,6 @@ SOURCE=..\Hash_Map_Manager_Test.cpp # Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\Hash_Map_Manager_Test.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/tests/version_tests/High_Res_Timer_Test.dsp b/tests/version_tests/High_Res_Timer_Test.dsp index 2f591c7eb66..f8441eac5f5 100644 --- a/tests/version_tests/High_Res_Timer_Test.dsp +++ b/tests/version_tests/High_Res_Timer_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=High_Res_Timer_Test - Win32 DLL Debug
+CFG=High_Res_Timer_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=High_Res_Timer_Test - Win32 DLL 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 "High_Res_Timer_Test.mak" CFG="High_Res_Timer_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "High_Res_Timer_Test.mak" CFG="High_Res_Timer_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "High_Res_Timer_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "High_Res_Timer_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "High_Res_Timer_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "High_Res_Timer_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "High_Res_Timer_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "High_Res_Timer_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "High_Res_Timer_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "High_Res_Timer_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "High_Res_Timer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "High_Res_Timer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "High_Res_Timer_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=High_Res_Timer_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "High_Res_Timer_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "High_Res_Timer_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\High_Res_Timer_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\DLL Debug"
+# PROP BASE Output_Dir ".\High_Res_Timer_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\Static Debug"
# PROP BASE Target_Dir ".\High_Res_Timer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\High_Res_Timer_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\High_Res_Timer_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\static Debug"
-# PROP BASE Target_Dir ".\High_Res_Timer_Test"
-# 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 ".\High_Res_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\High_Res_Timer_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\High_Res_Timer_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 ".\High_Res_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\High_Res_Timer_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\High_Res_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\High_Res_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\High_Res_Timer_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\High_Res_Timer_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\Static Release"
# PROP BASE Target_Dir ".\High_Res_Timer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\High_Res_Timer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\High_Res_Timer_Test\static Release"
-# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\static Release"
-# PROP BASE Target_Dir ".\High_Res_Timer_Test"
-# 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 ".\High_Res_Timer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\High_Res_Timer_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\High_Res_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\High_Res_Timer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "High_Res_Timer_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\High_Res_Timer_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\DLL Release"
+# PROP BASE Output_Dir ".\High_Res_Timer_Test\Release"
+# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\Release"
# PROP BASE Target_Dir ".\High_Res_Timer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\High_Res_Timer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "High_Res_Timer_Test - Win32 DLL Debug"
-# Name "High_Res_Timer_Test - Win32 static Debug"
-# Name "High_Res_Timer_Test - Win32 DLL Unicode Debug"
-# Name "High_Res_Timer_Test - Win32 static Unicode Debug"
-# Name "High_Res_Timer_Test - Win32 static Unicode Release"
-# Name "High_Res_Timer_Test - Win32 static Release"
-# Name "High_Res_Timer_Test - Win32 DLL Unicode Release"
-# Name "High_Res_Timer_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "High_Res_Timer_Test - Win32 Static Debug"
+# Name "High_Res_Timer_Test - Win32 Static Release"
+# Name "High_Res_Timer_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/IOStream_Test.dsp b/tests/version_tests/IOStream_Test.dsp index 938464de834..38d9f6b01c6 100644 --- a/tests/version_tests/IOStream_Test.dsp +++ b/tests/version_tests/IOStream_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IOStream_Test - Win32 DLL Release
+CFG=IOStream_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=IOStream_Test - Win32 DLL Release !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 DLL Release"
+!MESSAGE NMAKE /f "IOStream_Test.mak" CFG="IOStream_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IOStream_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IOStream_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IOStream_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IOStream_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=IOStream_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IOStream_Test - Win32 DLL Release"
+!IF "$(CFG)" == "IOStream_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\IOStream_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\IOStream_Test\DLL Release"
-# PROP BASE Target_Dir ".\IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\IOStream_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\IOStream_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\IOStream_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\IOStream_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\IOStream_Test\Static Debug"
# PROP BASE Target_Dir ".\IOStream_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\IOStream_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\IOStream_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\IOStream_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\IOStream_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\IOStream_Test\Static Release"
# PROP BASE Target_Dir ".\IOStream_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\IOStream_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\IOStream_Test\static Release"
-# PROP BASE Intermediate_Dir ".\IOStream_Test\static Release"
+# PROP BASE Output_Dir ".\IOStream_Test\Release"
+# PROP BASE Intermediate_Dir ".\IOStream_Test\Release"
# PROP BASE Target_Dir ".\IOStream_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\IOStream_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\IOStream_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\IOStream_Test\DLL Debug"
-# PROP BASE Target_Dir ".\IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\IOStream_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\IOStream_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\IOStream_Test\DLL Unicode Debug"
-# 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"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\IOStream_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\IOStream_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\IOStream_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\IOStream_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\IOStream_Test\static Debug"
-# PROP BASE Target_Dir ".\IOStream_Test"
-# 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 ".\IOStream_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "IOStream_Test - Win32 DLL Release"
-# Name "IOStream_Test - Win32 DLL Unicode Release"
-# Name "IOStream_Test - Win32 static Unicode Release"
-# Name "IOStream_Test - Win32 static Release"
-# Name "IOStream_Test - Win32 DLL Debug"
-# Name "IOStream_Test - Win32 DLL Unicode Debug"
-# Name "IOStream_Test - Win32 static Unicode Debug"
-# Name "IOStream_Test - Win32 static Debug"
-# Begin Group "Source Files"
+# Name "IOStream_Test - Win32 Static Debug"
+# Name "IOStream_Test - Win32 Static Release"
+# Name "IOStream_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Lazy_Map_Manager_Test.dsp b/tests/version_tests/Lazy_Map_Manager_Test.dsp index 1cd0f007127..95f3d0e297a 100644 --- a/tests/version_tests/Lazy_Map_Manager_Test.dsp +++ b/tests/version_tests/Lazy_Map_Manager_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Lazy_Map_Manager_Test - Win32 DLL Debug
+CFG=Lazy_Map_Manager_Test - Win32 Release
!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 "Lazy_Map_Manager_Test.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 "Lazy_Map_Manager_Test.mak" CFG="Lazy_Map_Manager_Test - Win32 DLL Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Lazy_Map_Manager_Test.mak" CFG="Lazy_Map_Manager_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Lazy_Map_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Lazy_Map_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Lazy_Map_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Lazy_Map_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Lazy_Map_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Lazy_Map_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Lazy_Map_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Lazy_Map_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "Lazy_Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Lazy_Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Lazy_Map_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,96 +29,21 @@ CFG=Lazy_Map_Manager_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\Static Debug"
# PROP BASE Target_Dir ".\Lazy_Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Lazy_Map_Manager_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Lazy_Map_Manager_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 ".\Lazy_Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Lazy_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Lazy_Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\static Debug"
-# PROP BASE Target_Dir ".\Lazy_Map_Manager_Test"
-# 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 ".\Lazy_Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,71 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\DLL Release"
-# PROP BASE Target_Dir ".\Lazy_Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Lazy_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\Static Release"
# PROP BASE Target_Dir ".\Lazy_Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Lazy_Map_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\static Release"
-# PROP BASE Target_Dir ".\Lazy_Map_Manager_Test"
-# 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 ".\Lazy_Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\Release"
+# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\Release"
# PROP BASE Target_Dir ".\Lazy_Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Lazy_Map_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,23 +102,17 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "Lazy_Map_Manager_Test - Win32 DLL Debug"
-# Name "Lazy_Map_Manager_Test - Win32 DLL Unicode Debug"
-# Name "Lazy_Map_Manager_Test - Win32 static Unicode Debug"
-# Name "Lazy_Map_Manager_Test - Win32 static Debug"
-# Name "Lazy_Map_Manager_Test - Win32 DLL Release"
-# Name "Lazy_Map_Manager_Test - Win32 DLL Unicode Release"
-# Name "Lazy_Map_Manager_Test - Win32 static Release"
-# Name "Lazy_Map_Manager_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
+# Name "Lazy_Map_Manager_Test - Win32 Static Debug"
+# Name "Lazy_Map_Manager_Test - Win32 Static Release"
+# Name "Lazy_Map_Manager_Test - Win32 Release"# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# PROP Default_Filter ".cpp"
# Begin Source File
SOURCE=..\Lazy_Map_Manager_Test.cpp
@@ -256,19 +120,11 @@ SOURCE=..\Lazy_Map_Manager_Test.cpp # End Group
# Begin Group "Header Files"
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\Lazy_Map_Manager_Test.h
-# End Source File
+# PROP Default_Filter ".h"
# Begin Source File
SOURCE=..\test_config.h
# End Source File
# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/MM_Shared_Memory_Test.dsp b/tests/version_tests/MM_Shared_Memory_Test.dsp index 6fa31f97fb8..c4eb058bdd2 100644 --- a/tests/version_tests/MM_Shared_Memory_Test.dsp +++ b/tests/version_tests/MM_Shared_Memory_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=MM_Shared_Memory_Test - Win32 DLL Unicode Debug
+CFG=MM_Shared_Memory_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=MM_Shared_Memory_Test - Win32 DLL Unicode 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 "MM_Shared_Memory_Test.mak" CFG="MM_Shared_Memory_Test - Win32 DLL Unicode Debug"
+!MESSAGE NMAKE /f "MM_Shared_Memory_Test.mak" CFG="MM_Shared_Memory_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "MM_Shared_Memory_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "MM_Shared_Memory_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "MM_Shared_Memory_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "MM_Shared_Memory_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=MM_Shared_Memory_Test - Win32 DLL Unicode Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "MM_Shared_Memory_Test - Win32 DLL Unicode Debug"
+!IF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\DLL Unicode Debug"
+# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\Static Debug"
# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Unicode Debug"
-# PROP Intermediate_Dir ".\DLL Unicode Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\MM_Shared_Memory_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\DLL Debug"
-# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\MM_Shared_Memory_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\static Debug"
-# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"
-# 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 ".\MM_Shared_Memory_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\MM_Shared_Memory_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\MM_Shared_Memory_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\DLL Release"
+# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\Static Release"
# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\MM_Shared_Memory_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\static Release"
-# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\static Release"
-# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"
-# 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 ".\MM_Shared_Memory_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\Release"
+# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\Release"
# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\MM_Shared_Memory_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "MM_Shared_Memory_Test - Win32 DLL Unicode Debug"
-# Name "MM_Shared_Memory_Test - Win32 DLL Debug"
-# Name "MM_Shared_Memory_Test - Win32 static Debug"
-# Name "MM_Shared_Memory_Test - Win32 static Unicode Debug"
-# Name "MM_Shared_Memory_Test - Win32 DLL Unicode Release"
-# Name "MM_Shared_Memory_Test - Win32 DLL Release"
-# Name "MM_Shared_Memory_Test - Win32 static Release"
-# Name "MM_Shared_Memory_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
+# Name "MM_Shared_Memory_Test - Win32 Static Debug"
+# Name "MM_Shared_Memory_Test - Win32 Static Release"
+# Name "MM_Shared_Memory_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/MT_Reactor_Timer_Test.dsp b/tests/version_tests/MT_Reactor_Timer_Test.dsp index ff28b6599bb..e10e49e2c5d 100644 --- a/tests/version_tests/MT_Reactor_Timer_Test.dsp +++ b/tests/version_tests/MT_Reactor_Timer_Test.dsp @@ -1,31 +1,26 @@ -# Microsoft Developer Studio Project File - Name="Mt_Reactor_Timer_Test" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="MT_Reactor_Timer_Test" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Mt_Reactor_Timer_Test - Win32 DLL Release
+CFG=MT_Reactor_Timer_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Mt_Reactor_Timer_Test.mak".
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "MT_Reactor_Timer_Test.mak".
+!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 "Mt_Reactor_Timer_Test.mak" CFG="Mt_Reactor_Timer_Test - Win32 DLL Release"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "MT_Reactor_Timer_Test.mak" CFG="MT_Reactor_Timer_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Mt_Reactor_Timer_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mt_Reactor_Timer_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mt_Reactor_Timer_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mt_Reactor_Timer_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mt_Reactor_Timer_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mt_Reactor_Timer_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mt_Reactor_Timer_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mt_Reactor_Timer_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "MT_Reactor_Timer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "MT_Reactor_Timer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "MT_Reactor_Timer_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,71 +29,46 @@ CFG=Mt_Reactor_Timer_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 DLL Release"
+!IF "$(CFG)" == "MT_Reactor_Timer_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\DLL Release"
-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\MT_Reactor_Timer_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\MT_Reactor_Timer_Test\Static Debug"
+# PROP BASE Target_Dir ".\MT_Reactor_Timer_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# PROP Target_Dir ".\MT_Reactor_Timer_Test"
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "MT_Reactor_Timer_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"
+# PROP BASE Output_Dir ".\MT_Reactor_Timer_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\MT_Reactor_Timer_Test\Static Release"
+# PROP BASE Target_Dir ".\MT_Reactor_Timer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"
+# PROP Target_Dir ".\MT_Reactor_Timer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "MT_Reactor_Timer_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\static Release"
-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"
+# PROP BASE Output_Dir ".\MT_Reactor_Timer_Test\Release"
+# PROP BASE Intermediate_Dir ".\MT_Reactor_Timer_Test\Release"
+# PROP BASE Target_Dir ".\MT_Reactor_Timer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"
+# PROP Target_Dir ".\MT_Reactor_Timer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,126 +102,20 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_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 ".\Mt_Reactor_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\static Debug"
-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"
-# 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 ".\Mt_Reactor_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "Mt_Reactor_Timer_Test - Win32 DLL Release"
-# Name "Mt_Reactor_Timer_Test - Win32 DLL Unicode Release"
-# Name "Mt_Reactor_Timer_Test - Win32 static Unicode Release"
-# Name "Mt_Reactor_Timer_Test - Win32 static Release"
-# Name "Mt_Reactor_Timer_Test - Win32 DLL Debug"
-# Name "Mt_Reactor_Timer_Test - Win32 DLL Unicode Debug"
-# Name "Mt_Reactor_Timer_Test - Win32 static Debug"
-# Name "Mt_Reactor_Timer_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "MT_Reactor_Timer_Test - Win32 Static Debug"
+# Name "MT_Reactor_Timer_Test - Win32 Static Release"
+# Name "MT_Reactor_Timer_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\Mt_Reactor_Timer_Test.cpp
+SOURCE=..\MT_Reactor_Timer_Test.cpp
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/tests/version_tests/MT_SOCK_Test.dsp b/tests/version_tests/MT_SOCK_Test.dsp index 82c0dca5176..50918352e5f 100644 --- a/tests/version_tests/MT_SOCK_Test.dsp +++ b/tests/version_tests/MT_SOCK_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=MT_SOCK_Test - Win32 DLL Debug
+CFG=MT_SOCK_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=MT_SOCK_Test - Win32 DLL 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 "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "MT_SOCK_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "MT_SOCK_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "MT_SOCK_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "MT_SOCK_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=MT_SOCK_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "MT_SOCK_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "MT_SOCK_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\MT_SOCK_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\DLL Debug"
+# PROP BASE Output_Dir ".\MT_SOCK_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\Static Debug"
# PROP BASE Target_Dir ".\MT_SOCK_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\MT_SOCK_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\MT_SOCK_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\MT_SOCK_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 ".\MT_SOCK_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\MT_SOCK_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\static Debug"
-# PROP BASE Target_Dir ".\MT_SOCK_Test"
-# 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 ".\MT_SOCK_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\MT_SOCK_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\MT_SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\MT_SOCK_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\MT_SOCK_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\DLL Release"
-# PROP BASE Target_Dir ".\MT_SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\MT_SOCK_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\MT_SOCK_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\MT_SOCK_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\Static Release"
# PROP BASE Target_Dir ".\MT_SOCK_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\MT_SOCK_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\MT_SOCK_Test\static Release"
-# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\static Release"
-# PROP BASE Target_Dir ".\MT_SOCK_Test"
-# 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 ".\MT_SOCK_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\MT_SOCK_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\MT_SOCK_Test\Release"
+# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\Release"
# PROP BASE Target_Dir ".\MT_SOCK_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\MT_SOCK_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,39 +102,17 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "MT_SOCK_Test - Win32 DLL Debug"
-# Name "MT_SOCK_Test - Win32 DLL Unicode Debug"
-# Name "MT_SOCK_Test - Win32 static Debug"
-# Name "MT_SOCK_Test - Win32 static Unicode Debug"
-# Name "MT_SOCK_Test - Win32 DLL Release"
-# Name "MT_SOCK_Test - Win32 DLL Unicode Release"
-# Name "MT_SOCK_Test - Win32 static Release"
-# Name "MT_SOCK_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
+# Name "MT_SOCK_Test - Win32 Static Debug"
+# Name "MT_SOCK_Test - Win32 Static Release"
+# Name "MT_SOCK_Test - Win32 Release"# Begin Source File
SOURCE=..\MT_SOCK_Test.cpp
# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Malloc_Test.dsp b/tests/version_tests/Malloc_Test.dsp index 4cde26a3a0d..c572b40e023 100644 --- a/tests/version_tests/Malloc_Test.dsp +++ b/tests/version_tests/Malloc_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Malloc_Test - Win32 DLL Debug
+CFG=Malloc_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Malloc_Test - Win32 DLL 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 "Malloc_Test.mak" CFG="Malloc_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Malloc_Test.mak" CFG="Malloc_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Malloc_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Malloc_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Malloc_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Malloc_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Malloc_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Malloc_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Malloc_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Malloc_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Malloc_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Malloc_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Malloc_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=Malloc_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Malloc_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Malloc_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Malloc_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Malloc_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Malloc_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Malloc_Test\Static Debug"
# PROP BASE Target_Dir ".\Malloc_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Malloc_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Malloc_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Malloc_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Malloc_Test\static Debug"
-# PROP BASE Target_Dir ".\Malloc_Test"
-# 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 ".\Malloc_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Malloc_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Malloc_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Malloc_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Malloc_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 ".\Malloc_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Malloc_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Malloc_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Malloc_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Malloc_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Malloc_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Malloc_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Malloc_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Malloc_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Malloc_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Malloc_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Malloc_Test\Static Release"
# PROP BASE Target_Dir ".\Malloc_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Malloc_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Malloc_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Malloc_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Malloc_Test\static Release"
-# PROP BASE Target_Dir ".\Malloc_Test"
-# 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 ".\Malloc_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Malloc_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Malloc_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Malloc_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Malloc_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Malloc_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Malloc_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Malloc_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Malloc_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Malloc_Test\DLL Release"
+# PROP BASE Output_Dir ".\Malloc_Test\Release"
+# PROP BASE Intermediate_Dir ".\Malloc_Test\Release"
# PROP BASE Target_Dir ".\Malloc_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Malloc_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "Malloc_Test - Win32 DLL Debug"
-# Name "Malloc_Test - Win32 static Debug"
-# Name "Malloc_Test - Win32 DLL Unicode Debug"
-# Name "Malloc_Test - Win32 static Unicode Debug"
-# Name "Malloc_Test - Win32 static Unicode Release"
-# Name "Malloc_Test - Win32 static Release"
-# Name "Malloc_Test - Win32 DLL Unicode Release"
-# Name "Malloc_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "Malloc_Test - Win32 Static Debug"
+# Name "Malloc_Test - Win32 Static Release"
+# Name "Malloc_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Map_Manager_Test.dsp b/tests/version_tests/Map_Manager_Test.dsp index a4d0d8edea3..21d3fc58fd8 100644 --- a/tests/version_tests/Map_Manager_Test.dsp +++ b/tests/version_tests/Map_Manager_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Map_Manager_Test - Win32 DLL Debug
+CFG=Map_Manager_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Map_Manager_Test - Win32 DLL 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 "Map_Manager_Test.mak" CFG="Map_Manager_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Map_Manager_Test.mak" CFG="Map_Manager_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Map_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Map_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Map_Manager_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Map_Manager_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Map_Manager_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Map_Manager_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Map_Manager_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Map_Manager_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Map_Manager_Test\Static Debug"
# PROP BASE Target_Dir ".\Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Map_Manager_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Map_Manager_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Map_Manager_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 ".\Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Map_Manager_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Map_Manager_Test\static Debug"
-# PROP BASE Target_Dir ".\Map_Manager_Test"
-# 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 ".\Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Map_Manager_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Map_Manager_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Map_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Map_Manager_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Map_Manager_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Map_Manager_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Map_Manager_Test\Static Release"
# PROP BASE Target_Dir ".\Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Map_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Map_Manager_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Map_Manager_Test\DLL Release"
+# PROP BASE Output_Dir ".\Map_Manager_Test\Release"
+# PROP BASE Intermediate_Dir ".\Map_Manager_Test\Release"
# PROP BASE Target_Dir ".\Map_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Map_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,69 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Map_Manager_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Map_Manager_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Map_Manager_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Map_Manager_Test\static Release"
-# PROP BASE Target_Dir ".\Map_Manager_Test"
-# 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 ".\Map_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "Map_Manager_Test - Win32 DLL Debug"
-# Name "Map_Manager_Test - Win32 DLL Unicode Debug"
-# Name "Map_Manager_Test - Win32 static Debug"
-# Name "Map_Manager_Test - Win32 static Unicode Debug"
-# Name "Map_Manager_Test - Win32 DLL Unicode Release"
-# Name "Map_Manager_Test - Win32 DLL Release"
-# Name "Map_Manager_Test - Win32 static Unicode Release"
-# Name "Map_Manager_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "Map_Manager_Test - Win32 Static Debug"
+# Name "Map_Manager_Test - Win32 Static Release"
+# Name "Map_Manager_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Map_Test.dsp b/tests/version_tests/Map_Test.dsp index 729448b3a14..2d0c6dad81f 100644 --- a/tests/version_tests/Map_Test.dsp +++ b/tests/version_tests/Map_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Map_Test - Win32 DLL Release
+CFG=Map_Test - Win32 Release
!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 "Map_Test.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 "Map_Test.mak" CFG="Map_Test - Win32 DLL Release"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Map_Test.mak" CFG="Map_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Map_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Map_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "Map_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Map_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Map_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,71 +29,46 @@ CFG=Map_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Map_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Map_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Map_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Map_Test\DLL Release"
-# PROP BASE Target_Dir ".\Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Map_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Map_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Map_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Map_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Map_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Map_Test\Static Debug"
# PROP BASE Target_Dir ".\Map_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Map_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Map_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Map_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Map_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Map_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Map_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Map_Test\Static Release"
# PROP BASE Target_Dir ".\Map_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Map_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Map_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Map_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Map_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Map_Test\static Release"
+# PROP BASE Output_Dir ".\Map_Test\Release"
+# PROP BASE Intermediate_Dir ".\Map_Test\Release"
# PROP BASE Target_Dir ".\Map_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Map_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Map_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Map_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Map_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Map_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Map_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Map_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Map_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Map_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 ".\Map_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Map_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Map_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Map_Test\static Debug"
-# PROP BASE Target_Dir ".\Map_Test"
-# 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 ".\Map_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Map_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Map_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Map_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Map_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "Map_Test - Win32 DLL Release"
-# Name "Map_Test - Win32 DLL Unicode Release"
-# Name "Map_Test - Win32 static Unicode Release"
-# Name "Map_Test - Win32 static Release"
-# Name "Map_Test - Win32 DLL Debug"
-# Name "Map_Test - Win32 DLL Unicode Debug"
-# Name "Map_Test - Win32 static Debug"
-# Name "Map_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Map_Test - Win32 Static Debug"
+# Name "Map_Test - Win32 Static Release"
+# Name "Map_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Mem_Map_Test.dsp b/tests/version_tests/Mem_Map_Test.dsp index 183da55607b..6777e24296c 100644 --- a/tests/version_tests/Mem_Map_Test.dsp +++ b/tests/version_tests/Mem_Map_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Mem_Map_Test - Win32 DLL Debug
+CFG=Mem_Map_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Mem_Map_Test - Win32 DLL 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 "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Mem_Map_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Mem_Map_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Mem_Map_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Mem_Map_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Mem_Map_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Mem_Map_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Mem_Map_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Mem_Map_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Mem_Map_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Mem_Map_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Mem_Map_Test\Static Debug"
# PROP BASE Target_Dir ".\Mem_Map_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Mem_Map_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Mem_Map_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Mem_Map_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Mem_Map_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 ".\Mem_Map_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Mem_Map_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Mem_Map_Test\static Debug"
-# PROP BASE Target_Dir ".\Mem_Map_Test"
-# 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 ".\Mem_Map_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Mem_Map_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Mem_Map_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Mem_Map_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Mem_Map_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Mem_Map_Test\DLL Release"
+# PROP BASE Output_Dir ".\Mem_Map_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Mem_Map_Test\Static Release"
# PROP BASE Target_Dir ".\Mem_Map_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Mem_Map_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,73 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Mem_Map_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Mem_Map_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Mem_Map_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Mem_Map_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Mem_Map_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Mem_Map_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Mem_Map_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Mem_Map_Test\static Release"
+# PROP BASE Output_Dir ".\Mem_Map_Test\Release"
+# PROP BASE Intermediate_Dir ".\Mem_Map_Test\Release"
# PROP BASE Target_Dir ".\Mem_Map_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Mem_Map_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Mem_Map_Test - Win32 DLL Debug"
-# Name "Mem_Map_Test - Win32 DLL Unicode Debug"
-# Name "Mem_Map_Test - Win32 static Debug"
-# Name "Mem_Map_Test - Win32 static Unicode Debug"
-# Name "Mem_Map_Test - Win32 DLL Release"
-# Name "Mem_Map_Test - Win32 DLL Unicode Release"
-# Name "Mem_Map_Test - Win32 static Unicode Release"
-# Name "Mem_Map_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "Mem_Map_Test - Win32 Static Debug"
+# Name "Mem_Map_Test - Win32 Static Release"
+# Name "Mem_Map_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Message_Block_Test.dsp b/tests/version_tests/Message_Block_Test.dsp index 099f460b37a..1c30c18f247 100644 --- a/tests/version_tests/Message_Block_Test.dsp +++ b/tests/version_tests/Message_Block_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Message_Block_Test - Win32 DLL Release
+CFG=Message_Block_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Message_Block_Test - Win32 DLL Release !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 "Message_Block_Test.mak" CFG="Message_Block_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Message_Block_Test.mak" CFG="Message_Block_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Message_Block_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Block_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Block_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Block_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Message_Block_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Message_Block_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Message_Block_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Block_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Message_Block_Test\DLL Release"
-# PROP BASE Target_Dir ".\Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Message_Block_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Block_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Message_Block_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Message_Block_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Message_Block_Test\Static Debug"
# PROP BASE Target_Dir ".\Message_Block_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Block_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Block_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Message_Block_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Message_Block_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Message_Block_Test\Static Release"
# PROP BASE Target_Dir ".\Message_Block_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Block_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Block_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Message_Block_Test\static Release"
+# PROP BASE Output_Dir ".\Message_Block_Test\Release"
+# PROP BASE Intermediate_Dir ".\Message_Block_Test\Release"
# PROP BASE Target_Dir ".\Message_Block_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Block_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Block_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Message_Block_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Message_Block_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Block_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Message_Block_Test\static Debug"
-# PROP BASE Target_Dir ".\Message_Block_Test"
-# 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 ".\Message_Block_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Block_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Message_Block_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Message_Block_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 ".\Message_Block_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Block_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Message_Block_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Message_Block_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Message_Block_Test - Win32 DLL Release"
-# Name "Message_Block_Test - Win32 DLL Unicode Release"
-# Name "Message_Block_Test - Win32 static Unicode Release"
-# Name "Message_Block_Test - Win32 static Release"
-# Name "Message_Block_Test - Win32 static Unicode Debug"
-# Name "Message_Block_Test - Win32 static Debug"
-# Name "Message_Block_Test - Win32 DLL Unicode Debug"
-# Name "Message_Block_Test - Win32 DLL Debug"
-# Begin Group "Source Files"
+# Name "Message_Block_Test - Win32 Static Debug"
+# Name "Message_Block_Test - Win32 Static Release"
+# Name "Message_Block_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Message_Queue_Notifications_Test.dsp b/tests/version_tests/Message_Queue_Notifications_Test.dsp index a51140c8a69..7c5a8653762 100644 --- a/tests/version_tests/Message_Queue_Notifications_Test.dsp +++ b/tests/version_tests/Message_Queue_Notifications_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Message_Queue_Notifications_Test - Win32 DLL Release
+CFG=Message_Queue_Notifications_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Message_Queue_Notifications_Test - Win32 DLL Release !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 "Message_Queue_Notifications_Test.mak" CFG="Message_Queue_Notifications_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak" CFG="Message_Queue_Notifications_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Message_Queue_Notifications_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Notifications_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Notifications_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Notifications_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Message_Queue_Notifications_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\DLL Release"
-# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Message_Queue_Notifications_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\Static Debug"
# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Queue_Notifications_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\Static Release"
# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Queue_Notifications_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\static Release"
+# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\Release"
+# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\Release"
# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Queue_Notifications_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Message_Queue_Notifications_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\static Debug"
-# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"
-# 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 ".\Message_Queue_Notifications_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Message_Queue_Notifications_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 ".\Message_Queue_Notifications_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Message_Queue_Notifications_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Message_Queue_Notifications_Test - Win32 DLL Release"
-# Name "Message_Queue_Notifications_Test - Win32 DLL Unicode Release"
-# Name "Message_Queue_Notifications_Test - Win32 static Unicode Release"
-# Name "Message_Queue_Notifications_Test - Win32 static Release"
-# Name "Message_Queue_Notifications_Test - Win32 static Unicode Debug"
-# Name "Message_Queue_Notifications_Test - Win32 static Debug"
-# Name "Message_Queue_Notifications_Test - Win32 DLL Unicode Debug"
-# Name "Message_Queue_Notifications_Test - Win32 DLL Debug"
-# Begin Group "Source Files"
+# Name "Message_Queue_Notifications_Test - Win32 Static Debug"
+# Name "Message_Queue_Notifications_Test - Win32 Static Release"
+# Name "Message_Queue_Notifications_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Message_Queue_Test.dsp b/tests/version_tests/Message_Queue_Test.dsp index 1111a9f2acb..10f9b2634fe 100644 --- a/tests/version_tests/Message_Queue_Test.dsp +++ b/tests/version_tests/Message_Queue_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Message_Queue_Test - Win32 DLL Debug
+CFG=Message_Queue_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Message_Queue_Test - Win32 DLL 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 "Message_Queue_Test.mak" CFG="Message_Queue_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Message_Queue_Test.mak" CFG="Message_Queue_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Message_Queue_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Message_Queue_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,96 +29,21 @@ CFG=Message_Queue_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Message_Queue_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Message_Queue_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Queue_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Message_Queue_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Message_Queue_Test\Static Debug"
# PROP BASE Target_Dir ".\Message_Queue_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Queue_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Queue_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Message_Queue_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 ".\Message_Queue_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Queue_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Message_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Message_Queue_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Message_Queue_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Test\static Debug"
-# PROP BASE Target_Dir ".\Message_Queue_Test"
-# 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 ".\Message_Queue_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,21 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Queue_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Message_Queue_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Message_Queue_Test\Static Release"
# PROP BASE Target_Dir ".\Message_Queue_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Queue_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Queue_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Test\DLL Release"
+# PROP BASE Output_Dir ".\Message_Queue_Test\Release"
+# PROP BASE Intermediate_Dir ".\Message_Queue_Test\Release"
# PROP BASE Target_Dir ".\Message_Queue_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Message_Queue_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,69 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Queue_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Message_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Message_Queue_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Message_Queue_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Message_Queue_Test\static Release"
-# PROP BASE Target_Dir ".\Message_Queue_Test"
-# 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 ".\Message_Queue_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "Message_Queue_Test - Win32 DLL Debug"
-# Name "Message_Queue_Test - Win32 DLL Unicode Debug"
-# Name "Message_Queue_Test - Win32 static Unicode Debug"
-# Name "Message_Queue_Test - Win32 static Debug"
-# Name "Message_Queue_Test - Win32 DLL Unicode Release"
-# Name "Message_Queue_Test - Win32 DLL Release"
-# Name "Message_Queue_Test - Win32 static Unicode Release"
-# Name "Message_Queue_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "Message_Queue_Test - Win32 Static Debug"
+# Name "Message_Queue_Test - Win32 Static Release"
+# Name "Message_Queue_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
@@ -257,14 +121,14 @@ SOURCE=..\Message_Queue_Test.cpp # Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
# Begin Source File
SOURCE=..\test_config.h
# End Source File
# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Naming_Test.dsp b/tests/version_tests/Naming_Test.dsp index 45056bb309b..d69d76c301a 100644 --- a/tests/version_tests/Naming_Test.dsp +++ b/tests/version_tests/Naming_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Naming_Test - Win32 DLL Debug
+CFG=Naming_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Naming_Test - Win32 DLL 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 "Naming_Test.mak" CFG="Naming_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Naming_Test.mak" CFG="Naming_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Naming_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Naming_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Naming_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Naming_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,96 +29,21 @@ CFG=Naming_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Naming_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Naming_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Naming_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Naming_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Naming_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Naming_Test\Static Debug"
# PROP BASE Target_Dir ".\Naming_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Naming_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Naming_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Naming_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Naming_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 ".\Naming_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Naming_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Naming_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Naming_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Naming_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Naming_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Naming_Test\static Debug"
-# PROP BASE Target_Dir ".\Naming_Test"
-# 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 ".\Naming_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,71 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Naming_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Naming_Test\DLL Release"
-# PROP BASE Target_Dir ".\Naming_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Naming_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Naming_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Naming_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Naming_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Naming_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Naming_Test\Static Release"
# PROP BASE Target_Dir ".\Naming_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Naming_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Naming_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Naming_Test\static Release"
-# PROP BASE Target_Dir ".\Naming_Test"
-# 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 ".\Naming_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Naming_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Naming_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Naming_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Naming_Test\Release"
+# PROP BASE Intermediate_Dir ".\Naming_Test\Release"
# PROP BASE Target_Dir ".\Naming_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Naming_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Naming_Test - Win32 DLL Debug"
-# Name "Naming_Test - Win32 DLL Unicode Debug"
-# Name "Naming_Test - Win32 static Unicode Debug"
-# Name "Naming_Test - Win32 static Debug"
-# Name "Naming_Test - Win32 DLL Release"
-# Name "Naming_Test - Win32 DLL Unicode Release"
-# Name "Naming_Test - Win32 static Release"
-# Name "Naming_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
+# Name "Naming_Test - Win32 Static Debug"
+# Name "Naming_Test - Win32 Static Release"
+# Name "Naming_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/New_Fail_Test.dsp b/tests/version_tests/New_Fail_Test.dsp index ecc9f598c68..ef64d656f2b 100644 --- a/tests/version_tests/New_Fail_Test.dsp +++ b/tests/version_tests/New_Fail_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=New_Fail_Test - Win32 DLL Release
+CFG=New_Fail_Test - Win32 Release
!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 "New_Fail_Test.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 "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 DLL Release"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "New_Fail_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "New_Fail_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "New_Fail_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "New_Fail_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "New_Fail_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "New_Fail_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "New_Fail_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "New_Fail_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "New_Fail_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "New_Fail_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "New_Fail_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,71 +29,46 @@ CFG=New_Fail_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "New_Fail_Test - Win32 DLL Release"
+!IF "$(CFG)" == "New_Fail_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\New_Fail_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\New_Fail_Test\DLL Release"
-# PROP BASE Target_Dir ".\New_Fail_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\New_Fail_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\New_Fail_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\New_Fail_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\New_Fail_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\New_Fail_Test\Static Debug"
# PROP BASE Target_Dir ".\New_Fail_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\New_Fail_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\New_Fail_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\New_Fail_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\New_Fail_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\New_Fail_Test\Static Release"
# PROP BASE Target_Dir ".\New_Fail_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\New_Fail_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\New_Fail_Test\static Release"
-# PROP BASE Intermediate_Dir ".\New_Fail_Test\static Release"
+# PROP BASE Output_Dir ".\New_Fail_Test\Release"
+# PROP BASE Intermediate_Dir ".\New_Fail_Test\Release"
# PROP BASE Target_Dir ".\New_Fail_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\New_Fail_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\New_Fail_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\New_Fail_Test\DLL Debug"
-# PROP BASE Target_Dir ".\New_Fail_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\New_Fail_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\New_Fail_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\New_Fail_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\New_Fail_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 ".\New_Fail_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\New_Fail_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\New_Fail_Test\static Debug"
-# PROP BASE Target_Dir ".\New_Fail_Test"
-# 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 ".\New_Fail_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "New_Fail_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\New_Fail_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\New_Fail_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\New_Fail_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\New_Fail_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "New_Fail_Test - Win32 DLL Release"
-# Name "New_Fail_Test - Win32 DLL Unicode Release"
-# Name "New_Fail_Test - Win32 static Unicode Release"
-# Name "New_Fail_Test - Win32 static Release"
-# Name "New_Fail_Test - Win32 DLL Debug"
-# Name "New_Fail_Test - Win32 DLL Unicode Debug"
-# Name "New_Fail_Test - Win32 static Debug"
-# Name "New_Fail_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "New_Fail_Test - Win32 Static Debug"
+# Name "New_Fail_Test - Win32 Static Release"
+# Name "New_Fail_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Notify_Performance_Test.dsp b/tests/version_tests/Notify_Performance_Test.dsp index eed0ca4e2cc..da6fcf210ab 100644 --- a/tests/version_tests/Notify_Performance_Test.dsp +++ b/tests/version_tests/Notify_Performance_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Notify_Performance_Test - Win32 DLL Release
+CFG=Notify_Performance_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Notify_Performance_Test - Win32 DLL Release !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 "Notify_Performance_Test.mak" CFG="Notify_Performance_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Notify_Performance_Test.mak" CFG="Notify_Performance_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Notify_Performance_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Notify_Performance_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Notify_Performance_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Notify_Performance_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Notify_Performance_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Notify_Performance_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Notify_Performance_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Notify_Performance_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\DLL Release"
-# PROP BASE Target_Dir ".\Notify_Performance_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Notify_Performance_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Notify_Performance_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Notify_Performance_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\Static Debug"
# PROP BASE Target_Dir ".\Notify_Performance_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Notify_Performance_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Notify_Performance_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Notify_Performance_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\Static Release"
# PROP BASE Target_Dir ".\Notify_Performance_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Notify_Performance_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Notify_Performance_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\static Release"
+# PROP BASE Output_Dir ".\Notify_Performance_Test\Release"
+# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\Release"
# PROP BASE Target_Dir ".\Notify_Performance_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Notify_Performance_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,139 +102,17 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Notify_Performance_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Notify_Performance_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Notify_Performance_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Notify_Performance_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Notify_Performance_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 ".\Notify_Performance_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Notify_Performance_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\static Debug"
-# PROP BASE Target_Dir ".\Notify_Performance_Test"
-# 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 ".\Notify_Performance_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Notify_Performance_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Notify_Performance_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Notify_Performance_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Notify_Performance_Test - Win32 DLL Release"
-# Name "Notify_Performance_Test - Win32 DLL Unicode Release"
-# Name "Notify_Performance_Test - Win32 static Unicode Release"
-# Name "Notify_Performance_Test - Win32 static Release"
-# Name "Notify_Performance_Test - Win32 DLL Debug"
-# Name "Notify_Performance_Test - Win32 DLL Unicode Debug"
-# Name "Notify_Performance_Test - Win32 static Debug"
-# Name "Notify_Performance_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
+# Name "Notify_Performance_Test - Win32 Static Debug"
+# Name "Notify_Performance_Test - Win32 Static Release"
+# Name "Notify_Performance_Test - Win32 Release"# Begin Source File
SOURCE=..\Notify_Performance_Test.cpp
# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Object_Manager_Test.dsp b/tests/version_tests/Object_Manager_Test.dsp index 0cf492586f9..9f83569a7c3 100644 --- a/tests/version_tests/Object_Manager_Test.dsp +++ b/tests/version_tests/Object_Manager_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Object_Manager_Test - Win32 DLL Debug
+CFG=Object_Manager_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Object_Manager_Test - Win32 DLL 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 "Object_Manager_Test.mak" CFG="Object_Manager_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Object_Manager_Test.mak" CFG="Object_Manager_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Object_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Object_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Object_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Object_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Object_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Object_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Object_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Object_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Object_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Object_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Object_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,21 +29,21 @@ CFG=Object_Manager_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Object_Manager_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Object_Manager_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Object_Manager_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Object_Manager_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Object_Manager_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\Static Debug"
# PROP BASE Target_Dir ".\Object_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Object_Manager_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -57,73 +52,23 @@ 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 /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Object_Manager_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Object_Manager_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Object_Manager_Test\DLL Release"
-# PROP BASE Target_Dir ".\Object_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Object_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Object_Manager_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Object_Manager_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Object_Manager_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Object_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Object_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Object_Manager_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Object_Manager_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Object_Manager_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Object_Manager_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Object_Manager_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\Static Release"
# PROP BASE Target_Dir ".\Object_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Object_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Object_Manager_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Object_Manager_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Object_Manager_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Object_Manager_Test\static Release"
+# PROP BASE Output_Dir ".\Object_Manager_Test\Release"
+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\Release"
# PROP BASE Target_Dir ".\Object_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Object_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,96 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Object_Manager_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Object_Manager_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Object_Manager_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Object_Manager_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 ".\Object_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Object_Manager_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Object_Manager_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Object_Manager_Test\static Debug"
-# PROP BASE Target_Dir ".\Object_Manager_Test"
-# 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 ".\Object_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Object_Manager_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Object_Manager_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Object_Manager_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Object_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Object_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Object_Manager_Test - Win32 DLL Debug"
-# Name "Object_Manager_Test - Win32 DLL Release"
-# Name "Object_Manager_Test - Win32 DLL Unicode Release"
-# Name "Object_Manager_Test - Win32 static Unicode Release"
-# Name "Object_Manager_Test - Win32 static Release"
-# Name "Object_Manager_Test - Win32 DLL Unicode Debug"
-# Name "Object_Manager_Test - Win32 static Debug"
-# Name "Object_Manager_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Object_Manager_Test - Win32 Static Debug"
+# Name "Object_Manager_Test - Win32 Static Release"
+# Name "Object_Manager_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/OrdMultiSet_Test.dsp b/tests/version_tests/OrdMultiSet_Test.dsp index 7b9e52e222e..5fdb882b306 100644 --- a/tests/version_tests/OrdMultiSet_Test.dsp +++ b/tests/version_tests/OrdMultiSet_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=OrdMultiSet_Test - Win32 DLL Unicode Release
+CFG=OrdMultiSet_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=OrdMultiSet_Test - Win32 DLL Unicode Release !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 "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "OrdMultiSet_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "OrdMultiSet_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "OrdMultiSet_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "OrdMultiSet_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "OrdMultiSet_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "OrdMultiSet_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "OrdMultiSet_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "OrdMultiSet_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "OrdMultiSet_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "OrdMultiSet_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "OrdMultiSet_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=OrdMultiSet_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "OrdMultiSet_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "OrdMultiSet_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\OrdMultiSet_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\OrdMultiSet_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\OrdMultiSet_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\OrdMultiSet_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\DLL Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\OrdMultiSet_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\Static Debug"
# PROP BASE Target_Dir ".\OrdMultiSet_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\OrdMultiSet_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\OrdMultiSet_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\OrdMultiSet_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\Static Release"
# PROP BASE Target_Dir ".\OrdMultiSet_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\OrdMultiSet_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\OrdMultiSet_Test\static Release"
-# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\static Release"
+# PROP BASE Output_Dir ".\OrdMultiSet_Test\Release"
+# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\Release"
# PROP BASE Target_Dir ".\OrdMultiSet_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\OrdMultiSet_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\OrdMultiSet_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\DLL Debug"
-# PROP BASE Target_Dir ".\OrdMultiSet_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\OrdMultiSet_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\OrdMultiSet_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\static Debug"
-# PROP BASE Target_Dir ".\OrdMultiSet_Test"
-# 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 ".\OrdMultiSet_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\OrdMultiSet_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\OrdMultiSet_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\OrdMultiSet_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "OrdMultiSet_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\OrdMultiSet_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\OrdMultiSet_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 ".\OrdMultiSet_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "OrdMultiSet_Test - Win32 DLL Unicode Release"
-# Name "OrdMultiSet_Test - Win32 DLL Release"
-# Name "OrdMultiSet_Test - Win32 static Unicode Release"
-# Name "OrdMultiSet_Test - Win32 static Release"
-# Name "OrdMultiSet_Test - Win32 DLL Debug"
-# Name "OrdMultiSet_Test - Win32 static Debug"
-# Name "OrdMultiSet_Test - Win32 static Unicode Debug"
-# Name "OrdMultiSet_Test - Win32 DLL Unicode Debug"
-# Begin Group "Source Files"
+# Name "OrdMultiSet_Test - Win32 Static Debug"
+# Name "OrdMultiSet_Test - Win32 Static Release"
+# Name "OrdMultiSet_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Pipe_Test.dsp b/tests/version_tests/Pipe_Test.dsp index 1395a298968..a76871f082a 100644 --- a/tests/version_tests/Pipe_Test.dsp +++ b/tests/version_tests/Pipe_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Pipe_Test - Win32 DLL Release
+CFG=Pipe_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Pipe_Test - Win32 DLL Release !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 "Pipe_Test.mak" CFG="Pipe_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Pipe_Test.mak" CFG="Pipe_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Pipe_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Pipe_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Pipe_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Pipe_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Pipe_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Pipe_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Pipe_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Pipe_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Pipe_Test\DLL Release"
-# PROP BASE Target_Dir ".\Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Pipe_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Pipe_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Pipe_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Pipe_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Pipe_Test\Static Debug"
# PROP BASE Target_Dir ".\Pipe_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Pipe_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Pipe_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Pipe_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Pipe_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Pipe_Test\Static Release"
# PROP BASE Target_Dir ".\Pipe_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Pipe_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Pipe_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Pipe_Test\static Release"
+# PROP BASE Output_Dir ".\Pipe_Test\Release"
+# PROP BASE Intermediate_Dir ".\Pipe_Test\Release"
# PROP BASE Target_Dir ".\Pipe_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Pipe_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Pipe_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Pipe_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Pipe_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 ".\Pipe_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Pipe_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Pipe_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Pipe_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Pipe_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Pipe_Test\static Debug"
-# PROP BASE Target_Dir ".\Pipe_Test"
-# 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 ".\Pipe_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Pipe_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Pipe_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Pipe_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Pipe_Test - Win32 DLL Release"
-# Name "Pipe_Test - Win32 DLL Unicode Release"
-# Name "Pipe_Test - Win32 static Unicode Release"
-# Name "Pipe_Test - Win32 static Release"
-# Name "Pipe_Test - Win32 DLL Unicode Debug"
-# Name "Pipe_Test - Win32 DLL Debug"
-# Name "Pipe_Test - Win32 static Debug"
-# Name "Pipe_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Pipe_Test - Win32 Static Debug"
+# Name "Pipe_Test - Win32 Static Release"
+# Name "Pipe_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Priority_Buffer_Test.dsp b/tests/version_tests/Priority_Buffer_Test.dsp index e3fd7e6d26c..a04338c3b9b 100644 --- a/tests/version_tests/Priority_Buffer_Test.dsp +++ b/tests/version_tests/Priority_Buffer_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Priority_Buffer_Test - Win32 DLL Unicode Release
+CFG=Priority_Buffer_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Priority_Buffer_Test - Win32 DLL Unicode Release !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 "Priority_Buffer_Test.mak" CFG="Priority_Buffer_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "Priority_Buffer_Test.mak" CFG="Priority_Buffer_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Priority_Buffer_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Buffer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Buffer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Buffer_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Priority_Buffer_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Priority_Buffer_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "Priority_Buffer_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Buffer_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Priority_Buffer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Buffer_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\DLL Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Priority_Buffer_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\Static Debug"
# PROP BASE Target_Dir ".\Priority_Buffer_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Buffer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Buffer_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\static Release"
+# PROP BASE Output_Dir ".\Priority_Buffer_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\Static Release"
# PROP BASE Target_Dir ".\Priority_Buffer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Buffer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Buffer_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Priority_Buffer_Test\Release"
+# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\Release"
# PROP BASE Target_Dir ".\Priority_Buffer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Buffer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Buffer_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Priority_Buffer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Buffer_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Priority_Buffer_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 ".\Priority_Buffer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Buffer_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\static Debug"
-# PROP BASE Target_Dir ".\Priority_Buffer_Test"
-# 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 ".\Priority_Buffer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Buffer_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Priority_Buffer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Priority_Buffer_Test - Win32 DLL Unicode Release"
-# Name "Priority_Buffer_Test - Win32 DLL Release"
-# Name "Priority_Buffer_Test - Win32 static Release"
-# Name "Priority_Buffer_Test - Win32 static Unicode Release"
-# Name "Priority_Buffer_Test - Win32 DLL Debug"
-# Name "Priority_Buffer_Test - Win32 DLL Unicode Debug"
-# Name "Priority_Buffer_Test - Win32 static Debug"
-# Name "Priority_Buffer_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Priority_Buffer_Test - Win32 Static Debug"
+# Name "Priority_Buffer_Test - Win32 Static Release"
+# Name "Priority_Buffer_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Priority_Reactor_Test.dsp b/tests/version_tests/Priority_Reactor_Test.dsp index f08e35b4181..1f917c5c69d 100644 --- a/tests/version_tests/Priority_Reactor_Test.dsp +++ b/tests/version_tests/Priority_Reactor_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Priority_Reactor_Test - Win32 DLL Debug
+CFG=Priority_Reactor_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Priority_Reactor_Test - Win32 DLL 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 "Priority_Reactor_Test.mak" CFG="Priority_Reactor_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Priority_Reactor_Test.mak" CFG="Priority_Reactor_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Priority_Reactor_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Reactor_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Reactor_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Reactor_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Priority_Reactor_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Priority_Reactor_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Priority_Reactor_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Reactor_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Priority_Reactor_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\Static Debug"
# PROP BASE Target_Dir ".\Priority_Reactor_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Reactor_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Reactor_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Priority_Reactor_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 ".\Priority_Reactor_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Reactor_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\static Debug"
-# PROP BASE Target_Dir ".\Priority_Reactor_Test"
-# 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 ".\Priority_Reactor_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Reactor_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Priority_Reactor_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Priority_Reactor_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Reactor_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Priority_Reactor_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Priority_Reactor_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Reactor_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\DLL Release"
-# PROP BASE Target_Dir ".\Priority_Reactor_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Priority_Reactor_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Reactor_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\static Release"
+# PROP BASE Output_Dir ".\Priority_Reactor_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\Static Release"
# PROP BASE Target_Dir ".\Priority_Reactor_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Reactor_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Reactor_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Priority_Reactor_Test\Release"
+# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\Release"
# PROP BASE Target_Dir ".\Priority_Reactor_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Reactor_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,39 +102,17 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Priority_Reactor_Test - Win32 DLL Debug"
-# Name "Priority_Reactor_Test - Win32 DLL Unicode Debug"
-# Name "Priority_Reactor_Test - Win32 static Debug"
-# Name "Priority_Reactor_Test - Win32 static Unicode Debug"
-# Name "Priority_Reactor_Test - Win32 DLL Unicode Release"
-# Name "Priority_Reactor_Test - Win32 DLL Release"
-# Name "Priority_Reactor_Test - Win32 static Release"
-# Name "Priority_Reactor_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
+# Name "Priority_Reactor_Test - Win32 Static Debug"
+# Name "Priority_Reactor_Test - Win32 Static Release"
+# Name "Priority_Reactor_Test - Win32 Release"# Begin Source File
SOURCE=..\Priority_Reactor_Test.cpp
# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Priority_Task_Test.dsp b/tests/version_tests/Priority_Task_Test.dsp index 26e7fadde37..9c3252247aa 100644 --- a/tests/version_tests/Priority_Task_Test.dsp +++ b/tests/version_tests/Priority_Task_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Priority_Task_Test - Win32 DLL Debug
+CFG=Priority_Task_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Priority_Task_Test - Win32 DLL 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 "Priority_Task_Test.mak" CFG="Priority_Task_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Priority_Task_Test.mak" CFG="Priority_Task_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Priority_Task_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Task_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Task_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Task_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Priority_Task_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Priority_Task_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Priority_Task_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Task_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Task_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Priority_Task_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Priority_Task_Test\Static Debug"
# PROP BASE Target_Dir ".\Priority_Task_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Task_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Task_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Task_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Priority_Task_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 ".\Priority_Task_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Task_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Task_Test\static Debug"
-# PROP BASE Target_Dir ".\Priority_Task_Test"
-# 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 ".\Priority_Task_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Priority_Task_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Priority_Task_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Priority_Task_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Task_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Priority_Task_Test\static Release"
+# PROP BASE Output_Dir ".\Priority_Task_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Priority_Task_Test\Static Release"
# PROP BASE Target_Dir ".\Priority_Task_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Task_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -159,71 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Task_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Priority_Task_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Priority_Task_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Task_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Priority_Task_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Priority_Task_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Priority_Task_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Priority_Task_Test\DLL Release"
+# PROP BASE Output_Dir ".\Priority_Task_Test\Release"
+# PROP BASE Intermediate_Dir ".\Priority_Task_Test\Release"
# PROP BASE Target_Dir ".\Priority_Task_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Priority_Task_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "Priority_Task_Test - Win32 DLL Debug"
-# Name "Priority_Task_Test - Win32 DLL Unicode Debug"
-# Name "Priority_Task_Test - Win32 static Debug"
-# Name "Priority_Task_Test - Win32 static Unicode Debug"
-# Name "Priority_Task_Test - Win32 static Release"
-# Name "Priority_Task_Test - Win32 static Unicode Release"
-# Name "Priority_Task_Test - Win32 DLL Unicode Release"
-# Name "Priority_Task_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "Priority_Task_Test - Win32 Static Debug"
+# Name "Priority_Task_Test - Win32 Static Release"
+# Name "Priority_Task_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Process_Manager_Test.dsp b/tests/version_tests/Process_Manager_Test.dsp index 268e985d4dc..a2d1ba4fc51 100644 --- a/tests/version_tests/Process_Manager_Test.dsp +++ b/tests/version_tests/Process_Manager_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Process_Manager_Test - Win32 DLL Unicode Release
+CFG=Process_Manager_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Process_Manager_Test - Win32 DLL Unicode Release !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 "Process_Manager_Test.mak" CFG="Process_Manager_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "Process_Manager_Test.mak" CFG="Process_Manager_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Process_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Process_Manager_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Process_Manager_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "Process_Manager_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Manager_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Process_Manager_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Process_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Process_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Manager_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Manager_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Process_Manager_Test\DLL Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Process_Manager_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Process_Manager_Test\Static Debug"
# PROP BASE Target_Dir ".\Process_Manager_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Process_Manager_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Process_Manager_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Manager_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Process_Manager_Test\static Release"
+# PROP BASE Output_Dir ".\Process_Manager_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Process_Manager_Test\Static Release"
# PROP BASE Target_Dir ".\Process_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Process_Manager_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Process_Manager_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Manager_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Process_Manager_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Process_Manager_Test\Release"
+# PROP BASE Intermediate_Dir ".\Process_Manager_Test\Release"
# PROP BASE Target_Dir ".\Process_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Manager_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Manager_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Process_Manager_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Process_Manager_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 ".\Process_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Manager_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Manager_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Process_Manager_Test\static Debug"
-# PROP BASE Target_Dir ".\Process_Manager_Test"
-# 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 ".\Process_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Manager_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Manager_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Process_Manager_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Process_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Process_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Manager_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Manager_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Process_Manager_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Process_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Process_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Process_Manager_Test - Win32 DLL Unicode Release"
-# Name "Process_Manager_Test - Win32 DLL Release"
-# Name "Process_Manager_Test - Win32 static Release"
-# Name "Process_Manager_Test - Win32 static Unicode Release"
-# Name "Process_Manager_Test - Win32 DLL Unicode Debug"
-# Name "Process_Manager_Test - Win32 static Debug"
-# Name "Process_Manager_Test - Win32 static Unicode Debug"
-# Name "Process_Manager_Test - Win32 DLL Debug"
-# Begin Group "Source Files"
+# Name "Process_Manager_Test - Win32 Static Debug"
+# Name "Process_Manager_Test - Win32 Static Release"
+# Name "Process_Manager_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Process_Mutex_Test.dsp b/tests/version_tests/Process_Mutex_Test.dsp index c58b44aa951..79eb98958f9 100644 --- a/tests/version_tests/Process_Mutex_Test.dsp +++ b/tests/version_tests/Process_Mutex_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Process_Mutex_Test - Win32 DLL Unicode Release
+CFG=Process_Mutex_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Process_Mutex_Test - Win32 DLL Unicode Release !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 "Process_Mutex_Test.mak" CFG="Process_Mutex_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "Process_Mutex_Test.mak" CFG="Process_Mutex_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Process_Mutex_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Mutex_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Mutex_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Mutex_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Process_Mutex_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Process_Mutex_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "Process_Mutex_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Mutex_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Process_Mutex_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Mutex_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\DLL Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Process_Mutex_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\Static Debug"
# PROP BASE Target_Dir ".\Process_Mutex_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Mutex_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Mutex_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\static Release"
+# PROP BASE Output_Dir ".\Process_Mutex_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\Static Release"
# PROP BASE Target_Dir ".\Process_Mutex_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Mutex_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Mutex_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Process_Mutex_Test\Release"
+# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\Release"
# PROP BASE Target_Dir ".\Process_Mutex_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Mutex_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Mutex_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Process_Mutex_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 ".\Process_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Mutex_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\static Debug"
-# PROP BASE Target_Dir ".\Process_Mutex_Test"
-# 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 ".\Process_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Mutex_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Process_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Mutex_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Process_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Process_Mutex_Test - Win32 DLL Unicode Release"
-# Name "Process_Mutex_Test - Win32 DLL Release"
-# Name "Process_Mutex_Test - Win32 static Release"
-# Name "Process_Mutex_Test - Win32 static Unicode Release"
-# Name "Process_Mutex_Test - Win32 DLL Unicode Debug"
-# Name "Process_Mutex_Test - Win32 static Debug"
-# Name "Process_Mutex_Test - Win32 static Unicode Debug"
-# Name "Process_Mutex_Test - Win32 DLL Debug"
-# Begin Group "Source Files"
+# Name "Process_Mutex_Test - Win32 Static Debug"
+# Name "Process_Mutex_Test - Win32 Static Release"
+# Name "Process_Mutex_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Process_Strategy_Test.dsp b/tests/version_tests/Process_Strategy_Test.dsp index 80b9da92724..057de6c4c6a 100644 --- a/tests/version_tests/Process_Strategy_Test.dsp +++ b/tests/version_tests/Process_Strategy_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Process_Strategy_Test - Win32 DLL Debug
+CFG=Process_Strategy_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Process_Strategy_Test - Win32 DLL 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 "Process_Strategy_Test.mak" CFG="Process_Strategy_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Process_Strategy_Test.mak" CFG="Process_Strategy_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Process_Strategy_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Strategy_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Strategy_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Process_Strategy_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Process_Strategy_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Process_Strategy_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Process_Strategy_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Strategy_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Process_Strategy_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\Static Debug"
# PROP BASE Target_Dir ".\Process_Strategy_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Strategy_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Strategy_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Process_Strategy_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 ".\Process_Strategy_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Strategy_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\static Debug"
-# PROP BASE Target_Dir ".\Process_Strategy_Test"
-# 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 ".\Process_Strategy_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Process_Strategy_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Process_Strategy_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Process_Strategy_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Strategy_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Process_Strategy_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Process_Strategy_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Strategy_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\DLL Release"
+# PROP BASE Output_Dir ".\Process_Strategy_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\Static Release"
# PROP BASE Target_Dir ".\Process_Strategy_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Strategy_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Strategy_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\static Release"
-# PROP BASE Target_Dir ".\Process_Strategy_Test"
-# 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 ".\Process_Strategy_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Process_Strategy_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Process_Strategy_Test\Release"
+# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\Release"
# PROP BASE Target_Dir ".\Process_Strategy_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Process_Strategy_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Process_Strategy_Test - Win32 DLL Debug"
-# Name "Process_Strategy_Test - Win32 DLL Unicode Debug"
-# Name "Process_Strategy_Test - Win32 static Debug"
-# Name "Process_Strategy_Test - Win32 static Unicode Debug"
-# Name "Process_Strategy_Test - Win32 DLL Unicode Release"
-# Name "Process_Strategy_Test - Win32 DLL Release"
-# Name "Process_Strategy_Test - Win32 static Release"
-# Name "Process_Strategy_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
+# Name "Process_Strategy_Test - Win32 Static Debug"
+# Name "Process_Strategy_Test - Win32 Static Release"
+# Name "Process_Strategy_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/RB_Tree_Test.dsp b/tests/version_tests/RB_Tree_Test.dsp index 91189e4908a..7c212155bb7 100644 --- a/tests/version_tests/RB_Tree_Test.dsp +++ b/tests/version_tests/RB_Tree_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=RB_Tree_Test - Win32 DLL Debug
+CFG=RB_Tree_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=RB_Tree_Test - Win32 DLL 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 "RB_Tree_Test.mak" CFG="RB_Tree_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "RB_Tree_Test.mak" CFG="RB_Tree_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "RB_Tree_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "RB_Tree_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "RB_Tree_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "RB_Tree_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "RB_Tree_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "RB_Tree_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "RB_Tree_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "RB_Tree_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "RB_Tree_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "RB_Tree_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "RB_Tree_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=RB_Tree_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "RB_Tree_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "RB_Tree_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\RB_Tree_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\RB_Tree_Test\DLL Debug"
+# PROP BASE Output_Dir ".\RB_Tree_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\RB_Tree_Test\Static Debug"
# PROP BASE Target_Dir ".\RB_Tree_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\RB_Tree_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\RB_Tree_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\RB_Tree_Test\static Debug"
-# PROP BASE Target_Dir ".\RB_Tree_Test"
-# 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 ".\RB_Tree_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\RB_Tree_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\RB_Tree_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\RB_Tree_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 ".\RB_Tree_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\RB_Tree_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\RB_Tree_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\RB_Tree_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\RB_Tree_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\RB_Tree_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\RB_Tree_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\RB_Tree_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\RB_Tree_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\RB_Tree_Test\static Release"
-# PROP BASE Intermediate_Dir ".\RB_Tree_Test\static Release"
+# PROP BASE Output_Dir ".\RB_Tree_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\RB_Tree_Test\Static Release"
# PROP BASE Target_Dir ".\RB_Tree_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\RB_Tree_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\RB_Tree_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\RB_Tree_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\RB_Tree_Test\Release"
+# PROP BASE Intermediate_Dir ".\RB_Tree_Test\Release"
# PROP BASE Target_Dir ".\RB_Tree_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\RB_Tree_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "RB_Tree_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\RB_Tree_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\RB_Tree_Test\DLL Release"
-# PROP BASE Target_Dir ".\RB_Tree_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\RB_Tree_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,17 +108,11 @@ LINK32=link.exe # Begin Target
-# Name "RB_Tree_Test - Win32 DLL Debug"
-# Name "RB_Tree_Test - Win32 static Debug"
-# Name "RB_Tree_Test - Win32 DLL Unicode Debug"
-# Name "RB_Tree_Test - Win32 static Unicode Debug"
-# Name "RB_Tree_Test - Win32 static Unicode Release"
-# Name "RB_Tree_Test - Win32 static Release"
-# Name "RB_Tree_Test - Win32 DLL Unicode Release"
-# Name "RB_Tree_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "RB_Tree_Test - Win32 Static Debug"
+# Name "RB_Tree_Test - Win32 Static Release"
+# Name "RB_Tree_Test - Win32 Release"# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# PROP Default_Filter ".cpp"
# Begin Source File
SOURCE=..\RB_Tree_Test.cpp
@@ -256,15 +120,11 @@ SOURCE=..\RB_Tree_Test.cpp # End Group
# Begin Group "Header Files"
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# PROP Default_Filter ".h"
# Begin Source File
SOURCE=..\test_config.h
# End Source File
# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Reactor_Exception_Test.dsp b/tests/version_tests/Reactor_Exception_Test.dsp deleted file mode 100644 index d384898fbb0..00000000000 --- a/tests/version_tests/Reactor_Exception_Test.dsp +++ /dev/null @@ -1,270 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Reactor_Exception_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Reactor_Exception_Test - Win32 DLL Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Reactor_Exception_Test.mak".
-!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 "Reactor_Exception_Test.mak" CFG="Reactor_Exception_Test - Win32 DLL Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Reactor_Exception_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exception_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exception_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exception_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exception_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exception_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exception_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exception_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Reactor_Exception_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Exception_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Exception_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Reactor_Exception_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Exception_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /out:".\DLL Debug\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Exception_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Exception_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Exception_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Reactor_Exception_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 ".\Reactor_Exception_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /out:".\DLL Unicode Debug\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Exception_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Exception_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Exception_Test\static Debug"
-# PROP BASE Target_Dir ".\Reactor_Exception_Test"
-# 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 ".\Reactor_Exception_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Exception_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Exception_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Exception_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Reactor_Exception_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Exception_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Exception_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Exception_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Exception_Test\DLL Release"
-# PROP BASE Target_Dir ".\Reactor_Exception_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Exception_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /out:".\DLL Release\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Exception_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Exception_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Exception_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Reactor_Exception_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Exception_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /out:".\DLL Unicode Release\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Exception_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Exception_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Exception_Test\static Release"
-# PROP BASE Target_Dir ".\Reactor_Exception_Test"
-# 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 ".\Reactor_Exception_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Release\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Exception_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Exception_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Exception_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Reactor_Exception_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Exception_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Reactor_Exception_Test - Win32 DLL Debug"
-# Name "Reactor_Exception_Test - Win32 DLL Unicode Debug"
-# Name "Reactor_Exception_Test - Win32 static Debug"
-# Name "Reactor_Exception_Test - Win32 static Unicode Debug"
-# Name "Reactor_Exception_Test - Win32 DLL Release"
-# Name "Reactor_Exception_Test - Win32 DLL Unicode Release"
-# Name "Reactor_Exception_Test - Win32 static Release"
-# Name "Reactor_Exception_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\Reactor_Exceptions_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/tests/version_tests/Reactor_Exceptions_Test.dsp b/tests/version_tests/Reactor_Exceptions_Test.dsp new file mode 100644 index 00000000000..5dae7d33ccd --- /dev/null +++ b/tests/version_tests/Reactor_Exceptions_Test.dsp @@ -0,0 +1,134 @@ +# Microsoft Developer Studio Project File - Name="Reactor_Exceptions_Test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Reactor_Exceptions_Test - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "Reactor_Exceptions_Test.mak".
+!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 "Reactor_Exceptions_Test.mak" CFG="Reactor_Exceptions_Test - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Reactor_Exceptions_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Exceptions_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Exceptions_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Static Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Reactor_Exceptions_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Reactor_Exceptions_Test\Static Debug"
+# PROP BASE Target_Dir ".\Reactor_Exceptions_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\Reactor_Exceptions_Test"
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
+# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+
+!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Static Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Reactor_Exceptions_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Reactor_Exceptions_Test\Static Release"
+# PROP BASE Target_Dir ".\Reactor_Exceptions_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\Reactor_Exceptions_Test"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
+# 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 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 /machine:I386
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+
+!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Reactor_Exceptions_Test\Release"
+# PROP BASE Intermediate_Dir ".\Reactor_Exceptions_Test\Release"
+# PROP BASE Target_Dir ".\Reactor_Exceptions_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\Reactor_Exceptions_Test"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
+# 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 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 /machine:I386
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Reactor_Exceptions_Test - Win32 Static Debug"
+# Name "Reactor_Exceptions_Test - Win32 Static Release"
+# Name "Reactor_Exceptions_Test - Win32 Release"# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=..\Reactor_Exceptions_Test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\test_config.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/tests/version_tests/Reactor_Notify_Test.dsp b/tests/version_tests/Reactor_Notify_Test.dsp index 3fc93dccd4a..102674d315b 100644 --- a/tests/version_tests/Reactor_Notify_Test.dsp +++ b/tests/version_tests/Reactor_Notify_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Reactor_Notify_Test - Win32 DLL Release
+CFG=Reactor_Notify_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Reactor_Notify_Test - Win32 DLL Release !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 "Reactor_Notify_Test.mak" CFG="Reactor_Notify_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Reactor_Notify_Test.mak" CFG="Reactor_Notify_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reactor_Notify_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Notify_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Notify_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Notify_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Reactor_Notify_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Reactor_Notify_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Reactor_Notify_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Notify_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\DLL Release"
-# PROP BASE Target_Dir ".\Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Notify_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Notify_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Reactor_Notify_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\Static Debug"
# PROP BASE Target_Dir ".\Reactor_Notify_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Notify_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Notify_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Reactor_Notify_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\Static Release"
# PROP BASE Target_Dir ".\Reactor_Notify_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Notify_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Notify_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\static Release"
+# PROP BASE Output_Dir ".\Reactor_Notify_Test\Release"
+# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\Release"
# PROP BASE Target_Dir ".\Reactor_Notify_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Notify_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Notify_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Reactor_Notify_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 ".\Reactor_Notify_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Notify_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Notify_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Notify_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\static Debug"
-# PROP BASE Target_Dir ".\Reactor_Notify_Test"
-# 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 ".\Reactor_Notify_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Notify_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Notify_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Reactor_Notify_Test - Win32 DLL Release"
-# Name "Reactor_Notify_Test - Win32 DLL Unicode Release"
-# Name "Reactor_Notify_Test - Win32 static Unicode Release"
-# Name "Reactor_Notify_Test - Win32 static Release"
-# Name "Reactor_Notify_Test - Win32 DLL Unicode Debug"
-# Name "Reactor_Notify_Test - Win32 DLL Debug"
-# Name "Reactor_Notify_Test - Win32 static Debug"
-# Name "Reactor_Notify_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Reactor_Notify_Test - Win32 Static Debug"
+# Name "Reactor_Notify_Test - Win32 Static Release"
+# Name "Reactor_Notify_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Reactor_Performance_Test.dsp b/tests/version_tests/Reactor_Performance_Test.dsp index 4ed6040e2fe..90fba9c2158 100644 --- a/tests/version_tests/Reactor_Performance_Test.dsp +++ b/tests/version_tests/Reactor_Performance_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Reactor_Performance_Test - Win32 DLL Debug
+CFG=Reactor_Performance_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Reactor_Performance_Test - Win32 DLL 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 "Reactor_Performance_Test.mak" CFG="Reactor_Performance_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Reactor_Performance_Test.mak" CFG="Reactor_Performance_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reactor_Performance_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Performance_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Performance_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Performance_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Reactor_Performance_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Reactor_Performance_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Reactor_Performance_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Performance_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Reactor_Performance_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\Static Debug"
# PROP BASE Target_Dir ".\Reactor_Performance_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Performance_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Performance_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Reactor_Performance_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 ".\Reactor_Performance_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Performance_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\static Debug"
-# PROP BASE Target_Dir ".\Reactor_Performance_Test"
-# 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 ".\Reactor_Performance_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Performance_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Reactor_Performance_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Performance_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Performance_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Reactor_Performance_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\Static Release"
# PROP BASE Target_Dir ".\Reactor_Performance_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Performance_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,48 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Performance_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Reactor_Performance_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Performance_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Performance_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\DLL Release"
+# PROP BASE Output_Dir ".\Reactor_Performance_Test\Release"
+# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\Release"
# PROP BASE Target_Dir ".\Reactor_Performance_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Performance_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,66 +104,15 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Performance_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\static Release"
-# PROP BASE Target_Dir ".\Reactor_Performance_Test"
-# 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 ".\Reactor_Performance_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "Reactor_Performance_Test - Win32 DLL Debug"
-# Name "Reactor_Performance_Test - Win32 DLL Unicode Debug"
-# Name "Reactor_Performance_Test - Win32 static Debug"
-# Name "Reactor_Performance_Test - Win32 static Unicode Debug"
-# Name "Reactor_Performance_Test - Win32 DLL Unicode Release"
-# Name "Reactor_Performance_Test - Win32 static Unicode Release"
-# Name "Reactor_Performance_Test - Win32 DLL Release"
-# Name "Reactor_Performance_Test - Win32 static Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
+# Name "Reactor_Performance_Test - Win32 Static Debug"
+# Name "Reactor_Performance_Test - Win32 Static Release"
+# Name "Reactor_Performance_Test - Win32 Release"# Begin Source File
SOURCE=..\Reactor_Performance_Test.cpp
# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\Reactor_Performance_Test.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Reactor_Timer_Test.dsp b/tests/version_tests/Reactor_Timer_Test.dsp index 3d0acd8a827..c9a27aed925 100644 --- a/tests/version_tests/Reactor_Timer_Test.dsp +++ b/tests/version_tests/Reactor_Timer_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Reactor_Timer_Test - Win32 DLL Release
+CFG=Reactor_Timer_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Reactor_Timer_Test - Win32 DLL Release !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 "Reactor_Timer_Test.mak" CFG="Reactor_Timer_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Reactor_Timer_Test.mak" CFG="Reactor_Timer_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reactor_Timer_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Timer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Timer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactor_Timer_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Reactor_Timer_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Reactor_Timer_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Reactor_Timer_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Timer_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\DLL Release"
-# PROP BASE Target_Dir ".\Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Timer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Timer_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Reactor_Timer_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\Static Debug"
# PROP BASE Target_Dir ".\Reactor_Timer_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Timer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Timer_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\static Release"
+# PROP BASE Output_Dir ".\Reactor_Timer_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\Static Release"
# PROP BASE Target_Dir ".\Reactor_Timer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Timer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactor_Timer_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Reactor_Timer_Test\Release"
+# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\Release"
# PROP BASE Target_Dir ".\Reactor_Timer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactor_Timer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Timer_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Timer_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Reactor_Timer_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 ".\Reactor_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Timer_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\static Debug"
-# PROP BASE Target_Dir ".\Reactor_Timer_Test"
-# 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 ".\Reactor_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactor_Timer_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactor_Timer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Reactor_Timer_Test - Win32 DLL Release"
-# Name "Reactor_Timer_Test - Win32 DLL Unicode Release"
-# Name "Reactor_Timer_Test - Win32 static Release"
-# Name "Reactor_Timer_Test - Win32 static Unicode Release"
-# Name "Reactor_Timer_Test - Win32 DLL Debug"
-# Name "Reactor_Timer_Test - Win32 DLL Unicode Debug"
-# Name "Reactor_Timer_Test - Win32 static Debug"
-# Name "Reactor_Timer_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Reactor_Timer_Test - Win32 Static Debug"
+# Name "Reactor_Timer_Test - Win32 Static Release"
+# Name "Reactor_Timer_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Reactors_Test.dsp b/tests/version_tests/Reactors_Test.dsp index 3f68edcf8bb..1ce0ab06dc9 100644 --- a/tests/version_tests/Reactors_Test.dsp +++ b/tests/version_tests/Reactors_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Reactors_Test - Win32 DLL Release
+CFG=Reactors_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Reactors_Test - Win32 DLL Release !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 "Reactors_Test.mak" CFG="Reactors_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Reactors_Test.mak" CFG="Reactors_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reactors_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactors_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactors_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reactors_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Reactors_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Reactors_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Reactors_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactors_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Reactors_Test\DLL Release"
-# PROP BASE Target_Dir ".\Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactors_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactors_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactors_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Reactors_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Reactors_Test\Static Debug"
# PROP BASE Target_Dir ".\Reactors_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactors_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactors_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Reactors_Test\static Release"
+# PROP BASE Output_Dir ".\Reactors_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Reactors_Test\Static Release"
# PROP BASE Target_Dir ".\Reactors_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactors_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reactors_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reactors_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Reactors_Test\Release"
+# PROP BASE Intermediate_Dir ".\Reactors_Test\Release"
# PROP BASE Target_Dir ".\Reactors_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reactors_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactors_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Reactors_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactors_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactors_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactors_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Reactors_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 ".\Reactors_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactors_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Reactors_Test\static Debug"
-# PROP BASE Target_Dir ".\Reactors_Test"
-# 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 ".\Reactors_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reactors_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reactors_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reactors_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Reactors_Test - Win32 DLL Release"
-# Name "Reactors_Test - Win32 DLL Unicode Release"
-# Name "Reactors_Test - Win32 static Release"
-# Name "Reactors_Test - Win32 static Unicode Release"
-# Name "Reactors_Test - Win32 DLL Debug"
-# Name "Reactors_Test - Win32 DLL Unicode Debug"
-# Name "Reactors_Test - Win32 static Debug"
-# Name "Reactors_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Reactors_Test - Win32 Static Debug"
+# Name "Reactors_Test - Win32 Static Release"
+# Name "Reactors_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Reader_Writer_Test.dsp b/tests/version_tests/Reader_Writer_Test.dsp index 379336fa9ee..1c313b51e90 100644 --- a/tests/version_tests/Reader_Writer_Test.dsp +++ b/tests/version_tests/Reader_Writer_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Reader_Writer_Test - Win32 DLL Unicode Release
+CFG=Reader_Writer_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Reader_Writer_Test - Win32 DLL Unicode Release !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 "Reader_Writer_Test.mak" CFG="Reader_Writer_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "Reader_Writer_Test.mak" CFG="Reader_Writer_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Reader_Writer_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reader_Writer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reader_Writer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reader_Writer_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Reader_Writer_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Reader_Writer_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "Reader_Writer_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reader_Writer_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reader_Writer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reader_Writer_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\DLL Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Reader_Writer_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\Static Debug"
# PROP BASE Target_Dir ".\Reader_Writer_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reader_Writer_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reader_Writer_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\static Release"
+# PROP BASE Output_Dir ".\Reader_Writer_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\Static Release"
# PROP BASE Target_Dir ".\Reader_Writer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reader_Writer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reader_Writer_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Reader_Writer_Test\Release"
+# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\Release"
# PROP BASE Target_Dir ".\Reader_Writer_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reader_Writer_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reader_Writer_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reader_Writer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reader_Writer_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Reader_Writer_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 ".\Reader_Writer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reader_Writer_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reader_Writer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reader_Writer_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\static Debug"
-# PROP BASE Target_Dir ".\Reader_Writer_Test"
-# 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 ".\Reader_Writer_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Reader_Writer_Test - Win32 DLL Unicode Release"
-# Name "Reader_Writer_Test - Win32 DLL Release"
-# Name "Reader_Writer_Test - Win32 static Release"
-# Name "Reader_Writer_Test - Win32 static Unicode Release"
-# Name "Reader_Writer_Test - Win32 DLL Debug"
-# Name "Reader_Writer_Test - Win32 DLL Unicode Debug"
-# Name "Reader_Writer_Test - Win32 static Unicode Debug"
-# Name "Reader_Writer_Test - Win32 static Debug"
-# Begin Group "Source Files"
+# Name "Reader_Writer_Test - Win32 Static Debug"
+# Name "Reader_Writer_Test - Win32 Static Release"
+# Name "Reader_Writer_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Recursive_Mutex_Test.dsp b/tests/version_tests/Recursive_Mutex_Test.dsp index 35cfae84e05..29261849648 100644 --- a/tests/version_tests/Recursive_Mutex_Test.dsp +++ b/tests/version_tests/Recursive_Mutex_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Recursive_Mutex_Test - Win32 DLL Release
+CFG=Recursive_Mutex_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Recursive_Mutex_Test - Win32 DLL Release !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 "Recursive_Mutex_Test.mak" CFG="Recursive_Mutex_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak" CFG="Recursive_Mutex_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Recursive_Mutex_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Recursive_Mutex_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Recursive_Mutex_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Recursive_Mutex_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Recursive_Mutex_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Recursive_Mutex_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Recursive_Mutex_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Recursive_Mutex_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\DLL Release"
-# PROP BASE Target_Dir ".\Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Recursive_Mutex_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Recursive_Mutex_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Recursive_Mutex_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\Static Debug"
# PROP BASE Target_Dir ".\Recursive_Mutex_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Recursive_Mutex_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Recursive_Mutex_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\static Release"
+# PROP BASE Output_Dir ".\Recursive_Mutex_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\Static Release"
# PROP BASE Target_Dir ".\Recursive_Mutex_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Recursive_Mutex_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Recursive_Mutex_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Recursive_Mutex_Test\Release"
+# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\Release"
# PROP BASE Target_Dir ".\Recursive_Mutex_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Recursive_Mutex_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Recursive_Mutex_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Recursive_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Recursive_Mutex_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Recursive_Mutex_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 ".\Recursive_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Recursive_Mutex_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\static Debug"
-# PROP BASE Target_Dir ".\Recursive_Mutex_Test"
-# 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 ".\Recursive_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Recursive_Mutex_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Recursive_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Recursive_Mutex_Test - Win32 DLL Release"
-# Name "Recursive_Mutex_Test - Win32 DLL Unicode Release"
-# Name "Recursive_Mutex_Test - Win32 static Release"
-# Name "Recursive_Mutex_Test - Win32 static Unicode Release"
-# Name "Recursive_Mutex_Test - Win32 DLL Debug"
-# Name "Recursive_Mutex_Test - Win32 DLL Unicode Debug"
-# Name "Recursive_Mutex_Test - Win32 static Debug"
-# Name "Recursive_Mutex_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Recursive_Mutex_Test - Win32 Static Debug"
+# Name "Recursive_Mutex_Test - Win32 Static Release"
+# Name "Recursive_Mutex_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Reverse_Lock_Test.dsp b/tests/version_tests/Reverse_Lock_Test.dsp index b5ac92117e2..647c332d3ed 100644 --- a/tests/version_tests/Reverse_Lock_Test.dsp +++ b/tests/version_tests/Reverse_Lock_Test.dsp @@ -4,28 +4,23 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Reverse_Lock_Test - Win32 DLL Release
+CFG=Reverse_Lock_Test - Win32 Release
!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 "Reverse_Lock_Test.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 "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 DLL Release"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 Release"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Reverse_Lock_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reverse_Lock_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reverse_Lock_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reverse_Lock_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reverse_Lock_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reverse_Lock_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reverse_Lock_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Reverse_Lock_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "Reverse_Lock_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reverse_Lock_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Reverse_Lock_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -34,71 +29,46 @@ CFG=Reverse_Lock_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Reverse_Lock_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Reverse_Lock_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reverse_Lock_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\DLL Release"
-# PROP BASE Target_Dir ".\Reverse_Lock_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reverse_Lock_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reverse_Lock_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Reverse_Lock_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\Static Debug"
# PROP BASE Target_Dir ".\Reverse_Lock_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reverse_Lock_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reverse_Lock_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Reverse_Lock_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\Static Release"
# PROP BASE Target_Dir ".\Reverse_Lock_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reverse_Lock_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Reverse_Lock_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\static Release"
+# PROP BASE Output_Dir ".\Reverse_Lock_Test\Release"
+# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\Release"
# PROP BASE Target_Dir ".\Reverse_Lock_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Reverse_Lock_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reverse_Lock_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Reverse_Lock_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reverse_Lock_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reverse_Lock_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Reverse_Lock_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 ".\Reverse_Lock_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reverse_Lock_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\static Debug"
-# PROP BASE Target_Dir ".\Reverse_Lock_Test"
-# 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 ".\Reverse_Lock_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Reverse_Lock_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Reverse_Lock_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Reverse_Lock_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Reverse_Lock_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "Reverse_Lock_Test - Win32 DLL Release"
-# Name "Reverse_Lock_Test - Win32 DLL Unicode Release"
-# Name "Reverse_Lock_Test - Win32 static Unicode Release"
-# Name "Reverse_Lock_Test - Win32 static Release"
-# Name "Reverse_Lock_Test - Win32 DLL Debug"
-# Name "Reverse_Lock_Test - Win32 DLL Unicode Debug"
-# Name "Reverse_Lock_Test - Win32 static Debug"
-# Name "Reverse_Lock_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Reverse_Lock_Test - Win32 Static Debug"
+# Name "Reverse_Lock_Test - Win32 Static Release"
+# Name "Reverse_Lock_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/SOCK_Connector_Test.dsp b/tests/version_tests/SOCK_Connector_Test.dsp index 941695c7d88..37a2f36f93d 100644 --- a/tests/version_tests/SOCK_Connector_Test.dsp +++ b/tests/version_tests/SOCK_Connector_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=SOCK_Connector_Test - Win32 DLL Release
+CFG=SOCK_Connector_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=SOCK_Connector_Test - Win32 DLL Release !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 "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SOCK_Connector_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Connector_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Connector_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Connector_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Connector_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Connector_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Connector_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Connector_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Connector_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Connector_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Connector_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=SOCK_Connector_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "SOCK_Connector_Test - Win32 DLL Release"
+!IF "$(CFG)" == "SOCK_Connector_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Connector_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\DLL Release"
-# PROP BASE Target_Dir ".\SOCK_Connector_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SOCK_Connector_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Connector_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\SOCK_Connector_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\Static Debug"
# PROP BASE Target_Dir ".\SOCK_Connector_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Connector_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Connector_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\SOCK_Connector_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\Static Release"
# PROP BASE Target_Dir ".\SOCK_Connector_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Connector_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Connector_Test\static Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\static Release"
+# PROP BASE Output_Dir ".\SOCK_Connector_Test\Release"
+# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\Release"
# PROP BASE Target_Dir ".\SOCK_Connector_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Connector_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Connector_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\SOCK_Connector_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 ".\SOCK_Connector_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Connector_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\DLL Debug"
-# PROP BASE Target_Dir ".\SOCK_Connector_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SOCK_Connector_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Connector_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\static Debug"
-# PROP BASE Target_Dir ".\SOCK_Connector_Test"
-# 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 ".\SOCK_Connector_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Connector_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Connector_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\SOCK_Connector_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SOCK_Connector_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "SOCK_Connector_Test - Win32 DLL Release"
-# Name "SOCK_Connector_Test - Win32 DLL Unicode Release"
-# Name "SOCK_Connector_Test - Win32 static Unicode Release"
-# Name "SOCK_Connector_Test - Win32 static Release"
-# Name "SOCK_Connector_Test - Win32 DLL Unicode Debug"
-# Name "SOCK_Connector_Test - Win32 DLL Debug"
-# Name "SOCK_Connector_Test - Win32 static Debug"
-# Name "SOCK_Connector_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "SOCK_Connector_Test - Win32 Static Debug"
+# Name "SOCK_Connector_Test - Win32 Static Release"
+# Name "SOCK_Connector_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/SOCK_Send_Recv_Test.dsp b/tests/version_tests/SOCK_Send_Recv_Test.dsp index fb75b60fa90..0dc91d6b0c7 100644 --- a/tests/version_tests/SOCK_Send_Recv_Test.dsp +++ b/tests/version_tests/SOCK_Send_Recv_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=SOCK_Send_Recv_Test - Win32 DLL Debug
+CFG=SOCK_Send_Recv_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=SOCK_Send_Recv_Test - Win32 DLL 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 "SOCK_Send_Recv_Test.mak" CFG="SOCK_Send_Recv_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "SOCK_Send_Recv_Test.mak" CFG="SOCK_Send_Recv_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SOCK_Send_Recv_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Send_Recv_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Send_Recv_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Send_Recv_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Send_Recv_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Send_Recv_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Send_Recv_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Send_Recv_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Send_Recv_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Send_Recv_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Send_Recv_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,96 +29,21 @@ CFG=SOCK_Send_Recv_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\DLL Debug"
+# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\Static Debug"
# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Send_Recv_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\SOCK_Send_Recv_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 ".\SOCK_Send_Recv_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SOCK_Send_Recv_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\static Debug"
-# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"
-# 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 ".\SOCK_Send_Recv_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,21 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\Static Release"
# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Send_Recv_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\DLL Release"
+# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\Release"
+# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\Release"
# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Send_Recv_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,69 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SOCK_Send_Recv_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Send_Recv_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\static Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\static Release"
-# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"
-# 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 ".\SOCK_Send_Recv_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "SOCK_Send_Recv_Test - Win32 DLL Debug"
-# Name "SOCK_Send_Recv_Test - Win32 DLL Unicode Debug"
-# Name "SOCK_Send_Recv_Test - Win32 static Unicode Debug"
-# Name "SOCK_Send_Recv_Test - Win32 static Debug"
-# Name "SOCK_Send_Recv_Test - Win32 DLL Unicode Release"
-# Name "SOCK_Send_Recv_Test - Win32 DLL Release"
-# Name "SOCK_Send_Recv_Test - Win32 static Unicode Release"
-# Name "SOCK_Send_Recv_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "SOCK_Send_Recv_Test - Win32 Static Debug"
+# Name "SOCK_Send_Recv_Test - Win32 Static Release"
+# Name "SOCK_Send_Recv_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/SOCK_Test.dsp b/tests/version_tests/SOCK_Test.dsp index d854e8fddb2..157678207ad 100644 --- a/tests/version_tests/SOCK_Test.dsp +++ b/tests/version_tests/SOCK_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=SOCK_Test - Win32 DLL Debug
+CFG=SOCK_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=SOCK_Test - Win32 DLL 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 "SOCK_Test.mak" CFG="SOCK_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "SOCK_Test.mak" CFG="SOCK_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SOCK_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,96 +29,21 @@ CFG=SOCK_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "SOCK_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "SOCK_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Test\DLL Debug"
+# PROP BASE Output_Dir ".\SOCK_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\SOCK_Test\Static Debug"
# PROP BASE Target_Dir ".\SOCK_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\SOCK_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 ".\SOCK_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SOCK_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SOCK_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\SOCK_Test\static Debug"
-# PROP BASE Target_Dir ".\SOCK_Test"
-# 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 ".\SOCK_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -134,21 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\SOCK_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\SOCK_Test\Static Release"
# PROP BASE Target_Dir ".\SOCK_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Test\DLL Release"
+# PROP BASE Output_Dir ".\SOCK_Test\Release"
+# PROP BASE Intermediate_Dir ".\SOCK_Test\Release"
# PROP BASE Target_Dir ".\SOCK_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SOCK_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,69 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SOCK_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SOCK_Test\static Release"
-# PROP BASE Intermediate_Dir ".\SOCK_Test\static Release"
-# PROP BASE Target_Dir ".\SOCK_Test"
-# 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 ".\SOCK_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "SOCK_Test - Win32 DLL Debug"
-# Name "SOCK_Test - Win32 DLL Unicode Debug"
-# Name "SOCK_Test - Win32 static Unicode Debug"
-# Name "SOCK_Test - Win32 static Debug"
-# Name "SOCK_Test - Win32 DLL Unicode Release"
-# Name "SOCK_Test - Win32 DLL Release"
-# Name "SOCK_Test - Win32 static Unicode Release"
-# Name "SOCK_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "SOCK_Test - Win32 Static Debug"
+# Name "SOCK_Test - Win32 Static Release"
+# Name "SOCK_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/SPIPE_Test.dsp b/tests/version_tests/SPIPE_Test.dsp index 01991da3145..337c67b3d7d 100644 --- a/tests/version_tests/SPIPE_Test.dsp +++ b/tests/version_tests/SPIPE_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=SPIPE_Test - Win32 DLL Release
+CFG=SPIPE_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=SPIPE_Test - Win32 DLL Release !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 "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SPIPE_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SPIPE_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SPIPE_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SPIPE_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=SPIPE_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "SPIPE_Test - Win32 DLL Release"
+!IF "$(CFG)" == "SPIPE_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SPIPE_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\SPIPE_Test\DLL Release"
-# PROP BASE Target_Dir ".\SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SPIPE_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SPIPE_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\SPIPE_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\SPIPE_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\SPIPE_Test\Static Debug"
# PROP BASE Target_Dir ".\SPIPE_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SPIPE_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SPIPE_Test\static Release"
-# PROP BASE Intermediate_Dir ".\SPIPE_Test\static Release"
+# PROP BASE Output_Dir ".\SPIPE_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\SPIPE_Test\Static Release"
# PROP BASE Target_Dir ".\SPIPE_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SPIPE_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SPIPE_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\SPIPE_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\SPIPE_Test\Release"
+# PROP BASE Intermediate_Dir ".\SPIPE_Test\Release"
# PROP BASE Target_Dir ".\SPIPE_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SPIPE_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SPIPE_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SPIPE_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\SPIPE_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 ".\SPIPE_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SPIPE_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\SPIPE_Test\DLL Debug"
-# PROP BASE Target_Dir ".\SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SPIPE_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SPIPE_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SPIPE_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SPIPE_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SPIPE_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\SPIPE_Test\static Debug"
-# PROP BASE Target_Dir ".\SPIPE_Test"
-# 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 ".\SPIPE_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "SPIPE_Test - Win32 DLL Release"
-# Name "SPIPE_Test - Win32 DLL Unicode Release"
-# Name "SPIPE_Test - Win32 static Release"
-# Name "SPIPE_Test - Win32 static Unicode Release"
-# Name "SPIPE_Test - Win32 DLL Unicode Debug"
-# Name "SPIPE_Test - Win32 DLL Debug"
-# Name "SPIPE_Test - Win32 static Unicode Debug"
-# Name "SPIPE_Test - Win32 static Debug"
-# Begin Group "Source Files"
+# Name "SPIPE_Test - Win32 Static Debug"
+# Name "SPIPE_Test - Win32 Static Release"
+# Name "SPIPE_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/SString_Test.dsp b/tests/version_tests/SString_Test.dsp index aa3142339ca..d78ee62ffb5 100644 --- a/tests/version_tests/SString_Test.dsp +++ b/tests/version_tests/SString_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=SString_Test - Win32 DLL Release
+CFG=SString_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=SString_Test - Win32 DLL Release !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 "SString_Test.mak" CFG="SString_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SString_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SString_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SString_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SString_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=SString_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "SString_Test - Win32 DLL Release"
+!IF "$(CFG)" == "SString_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SString_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\SString_Test\DLL Release"
-# PROP BASE Target_Dir ".\SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SString_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SString_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\SString_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\SString_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\SString_Test\Static Debug"
# PROP BASE Target_Dir ".\SString_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SString_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SString_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "SString_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SString_Test\static Release"
-# PROP BASE Intermediate_Dir ".\SString_Test\static Release"
+# PROP BASE Output_Dir ".\SString_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\SString_Test\Static Release"
# PROP BASE Target_Dir ".\SString_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SString_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SString_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "SString_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SString_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\SString_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\SString_Test\Release"
+# PROP BASE Intermediate_Dir ".\SString_Test\Release"
# PROP BASE Target_Dir ".\SString_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SString_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SString_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SString_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SString_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SString_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\SString_Test\static Debug"
-# PROP BASE Target_Dir ".\SString_Test"
-# 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 ".\SString_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SString_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\SString_Test\DLL Debug"
-# PROP BASE Target_Dir ".\SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SString_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SString_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SString_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\SString_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 ".\SString_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "SString_Test - Win32 DLL Release"
-# Name "SString_Test - Win32 DLL Unicode Release"
-# Name "SString_Test - Win32 static Release"
-# Name "SString_Test - Win32 static Unicode Release"
-# Name "SString_Test - Win32 static Unicode Debug"
-# Name "SString_Test - Win32 static Debug"
-# Name "SString_Test - Win32 DLL Debug"
-# Name "SString_Test - Win32 DLL Unicode Debug"
-# Begin Group "Source Files"
+# Name "SString_Test - Win32 Static Debug"
+# Name "SString_Test - Win32 Static Release"
+# Name "SString_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/SV_Shared_Memory_Test.dsp b/tests/version_tests/SV_Shared_Memory_Test.dsp index 731393fbe31..879f30e8720 100644 --- a/tests/version_tests/SV_Shared_Memory_Test.dsp +++ b/tests/version_tests/SV_Shared_Memory_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=SV_Shared_Memory_Test - Win32 DLL Debug
+CFG=SV_Shared_Memory_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=SV_Shared_Memory_Test - Win32 DLL 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 "SV_Shared_Memory_Test.mak" CFG="SV_Shared_Memory_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "SV_Shared_Memory_Test.mak" CFG="SV_Shared_Memory_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "SV_Shared_Memory_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SV_Shared_Memory_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SV_Shared_Memory_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SV_Shared_Memory_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=SV_Shared_Memory_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "SV_Shared_Memory_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\DLL Debug"
+# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\Static Debug"
# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SV_Shared_Memory_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\SV_Shared_Memory_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 ".\SV_Shared_Memory_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\static Debug"
-# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"
-# 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 ".\SV_Shared_Memory_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SV_Shared_Memory_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\Static Release"
# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SV_Shared_Memory_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\DLL Release"
+# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\Release"
+# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\Release"
# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\SV_Shared_Memory_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,69 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\SV_Shared_Memory_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\static Release"
-# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\static Release"
-# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"
-# 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 ".\SV_Shared_Memory_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "SV_Shared_Memory_Test - Win32 DLL Debug"
-# Name "SV_Shared_Memory_Test - Win32 DLL Unicode Debug"
-# Name "SV_Shared_Memory_Test - Win32 static Debug"
-# Name "SV_Shared_Memory_Test - Win32 static Unicode Debug"
-# Name "SV_Shared_Memory_Test - Win32 DLL Unicode Release"
-# Name "SV_Shared_Memory_Test - Win32 DLL Release"
-# Name "SV_Shared_Memory_Test - Win32 static Unicode Release"
-# Name "SV_Shared_Memory_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "SV_Shared_Memory_Test - Win32 Static Debug"
+# Name "SV_Shared_Memory_Test - Win32 Static Release"
+# Name "SV_Shared_Memory_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Semaphore_Test.dsp b/tests/version_tests/Semaphore_Test.dsp index 0985eb10d04..1a3d8778cae 100644 --- a/tests/version_tests/Semaphore_Test.dsp +++ b/tests/version_tests/Semaphore_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Semaphore_Test - Win32 DLL Debug
+CFG=Semaphore_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Semaphore_Test - Win32 DLL 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 "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Semaphore_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Semaphore_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Semaphore_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Semaphore_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Semaphore_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Semaphore_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Semaphore_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Semaphore_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Semaphore_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Semaphore_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Semaphore_Test\Static Debug"
# PROP BASE Target_Dir ".\Semaphore_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Semaphore_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Semaphore_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Semaphore_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Semaphore_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 ".\Semaphore_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Semaphore_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Semaphore_Test\static Debug"
-# PROP BASE Target_Dir ".\Semaphore_Test"
-# 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 ".\Semaphore_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Semaphore_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Semaphore_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Semaphore_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Semaphore_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Semaphore_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Semaphore_Test\DLL Release"
+# PROP BASE Output_Dir ".\Semaphore_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Semaphore_Test\Static Release"
# PROP BASE Target_Dir ".\Semaphore_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Semaphore_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Semaphore_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Semaphore_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Semaphore_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Semaphore_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Semaphore_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Semaphore_Test\static Release"
-# PROP BASE Target_Dir ".\Semaphore_Test"
-# 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 ".\Semaphore_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Semaphore_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Semaphore_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Semaphore_Test\Release"
+# PROP BASE Intermediate_Dir ".\Semaphore_Test\Release"
# PROP BASE Target_Dir ".\Semaphore_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Semaphore_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,23 +102,17 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Semaphore_Test - Win32 DLL Debug"
-# Name "Semaphore_Test - Win32 DLL Unicode Debug"
-# Name "Semaphore_Test - Win32 static Debug"
-# Name "Semaphore_Test - Win32 static Unicode Debug"
-# Name "Semaphore_Test - Win32 DLL Release"
-# Name "Semaphore_Test - Win32 DLL Unicode Release"
-# Name "Semaphore_Test - Win32 static Release"
-# Name "Semaphore_Test - Win32 static Unicode Release"
-# Begin Group "Source Files"
+# Name "Semaphore_Test - Win32 Static Debug"
+# Name "Semaphore_Test - Win32 Static Release"
+# Name "Semaphore_Test - Win32 Release"# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# PROP Default_Filter "cpp"
# Begin Source File
SOURCE=..\Semaphore_Test.cpp
@@ -256,15 +120,11 @@ SOURCE=..\Semaphore_Test.cpp # End Group
# Begin Group "Header Files"
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# PROP Default_Filter "h"
# Begin Source File
SOURCE=..\test_config.h
# End Source File
# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Service_Config_Test.dsp b/tests/version_tests/Service_Config_Test.dsp index 6feea5eee4d..0a3e0f50fc6 100644 --- a/tests/version_tests/Service_Config_Test.dsp +++ b/tests/version_tests/Service_Config_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Service_Config_Test - Win32 DLL Debug
+CFG=Service_Config_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Service_Config_Test - Win32 DLL 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 "Service_Config_Test.mak" CFG="Service_Config_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Service_Config_Test.mak" CFG="Service_Config_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Service_Config_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Service_Config_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Service_Config_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Service_Config_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Service_Config_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Service_Config_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Service_Config_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Service_Config_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Service_Config_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Service_Config_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Service_Config_Test\Static Debug"
# PROP BASE Target_Dir ".\Service_Config_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Service_Config_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Service_Config_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Service_Config_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Service_Config_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 ".\Service_Config_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Service_Config_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Service_Config_Test\static Debug"
-# PROP BASE Target_Dir ".\Service_Config_Test"
-# 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 ".\Service_Config_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Service_Config_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Service_Config_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Service_Config_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Service_Config_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Service_Config_Test\DLL Release"
+# PROP BASE Output_Dir ".\Service_Config_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Service_Config_Test\Static Release"
# PROP BASE Target_Dir ".\Service_Config_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Service_Config_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,73 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Service_Config_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Service_Config_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Service_Config_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Service_Config_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Service_Config_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Service_Config_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Service_Config_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Service_Config_Test\static Release"
+# PROP BASE Output_Dir ".\Service_Config_Test\Release"
+# PROP BASE Intermediate_Dir ".\Service_Config_Test\Release"
# PROP BASE Target_Dir ".\Service_Config_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Service_Config_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Service_Config_Test - Win32 DLL Debug"
-# Name "Service_Config_Test - Win32 DLL Unicode Debug"
-# Name "Service_Config_Test - Win32 static Debug"
-# Name "Service_Config_Test - Win32 static Unicode Debug"
-# Name "Service_Config_Test - Win32 DLL Release"
-# Name "Service_Config_Test - Win32 DLL Unicode Release"
-# Name "Service_Config_Test - Win32 static Unicode Release"
-# Name "Service_Config_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "Service_Config_Test - Win32 Static Debug"
+# Name "Service_Config_Test - Win32 Static Release"
+# Name "Service_Config_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Sigset_Op_Test.dsp b/tests/version_tests/Sigset_Op_Test.dsp deleted file mode 100644 index 12a7a2b533e..00000000000 --- a/tests/version_tests/Sigset_Op_Test.dsp +++ /dev/null @@ -1,270 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Sigset_Op_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Sigset_Op_Test - Win32 DLL Unicode Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Sigset_Op_Test.mak".
-!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 "Sigset_Op_Test.mak" CFG="Sigset_Op_Test - Win32 DLL Unicode Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Sigset_Op_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Op_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Op_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Op_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Op_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Op_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Op_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Op_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Sigset_Op_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Sigset_Op_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Sigset_Op_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Sigset_Op_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Sigset_Op_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /out:".\DLL Unicode Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Sigset_Op_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Sigset_Op_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Sigset_Op_Test\DLL Release"
-# PROP BASE Target_Dir ".\Sigset_Op_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Sigset_Op_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /out:".\DLL Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Sigset_Op_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Sigset_Op_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Sigset_Op_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Sigset_Op_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Sigset_Op_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Sigset_Op_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Sigset_Op_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Sigset_Op_Test\static Release"
-# PROP BASE Target_Dir ".\Sigset_Op_Test"
-# 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 ".\Sigset_Op_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Sigset_Op_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Sigset_Op_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Sigset_Op_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Sigset_Op_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Sigset_Op_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /out:".\DLL Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Sigset_Op_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Sigset_Op_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Sigset_Op_Test\static Debug"
-# PROP BASE Target_Dir ".\Sigset_Op_Test"
-# 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 ".\Sigset_Op_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Sigset_Op_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Sigset_Op_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Sigset_Op_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Sigset_Op_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Sigset_Op_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Sigset_Op_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Sigset_Op_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Sigset_Op_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Sigset_Op_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 ".\Sigset_Op_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /out:".\DLL Unicode Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Sigset_Op_Test - Win32 DLL Unicode Release"
-# Name "Sigset_Op_Test - Win32 DLL Release"
-# Name "Sigset_Op_Test - Win32 static Unicode Release"
-# Name "Sigset_Op_Test - Win32 static Release"
-# Name "Sigset_Op_Test - Win32 DLL Debug"
-# Name "Sigset_Op_Test - Win32 static Debug"
-# Name "Sigset_Op_Test - Win32 static Unicode Debug"
-# Name "Sigset_Op_Test - Win32 DLL Unicode Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\Sigset_Ops_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/tests/version_tests/Sigset_Ops_Test.dsp b/tests/version_tests/Sigset_Ops_Test.dsp new file mode 100644 index 00000000000..7267d9f3f40 --- /dev/null +++ b/tests/version_tests/Sigset_Ops_Test.dsp @@ -0,0 +1,134 @@ +# Microsoft Developer Studio Project File - Name="Sigset_Ops_Test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Sigset_Ops_Test - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "Sigset_Ops_Test.mak".
+!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 "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Sigset_Ops_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Sigset_Ops_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Sigset_Ops_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Sigset_Ops_Test - Win32 Static Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Sigset_Ops_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Sigset_Ops_Test\Static Debug"
+# PROP BASE Target_Dir ".\Sigset_Ops_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\Sigset_Ops_Test"
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
+# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+
+!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Static Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Sigset_Ops_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Sigset_Ops_Test\Static Release"
+# PROP BASE Target_Dir ".\Sigset_Ops_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\Sigset_Ops_Test"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
+# 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 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 /machine:I386
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+
+!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Sigset_Ops_Test\Release"
+# PROP BASE Intermediate_Dir ".\Sigset_Ops_Test\Release"
+# PROP BASE Target_Dir ".\Sigset_Ops_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\Sigset_Ops_Test"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
+# 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 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 /machine:I386
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Sigset_Ops_Test - Win32 Static Debug"
+# Name "Sigset_Ops_Test - Win32 Static Release"
+# Name "Sigset_Ops_Test - Win32 Release"# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=..\Sigset_Ops_Test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\test_config.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/tests/version_tests/Simple_Message_Block_Test.dsp b/tests/version_tests/Simple_Message_Block_Test.dsp index 7d5d86ae01a..89581d9f1be 100644 --- a/tests/version_tests/Simple_Message_Block_Test.dsp +++ b/tests/version_tests/Simple_Message_Block_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Simple_Message_Block_Test - Win32 DLL Debug
+CFG=Simple_Message_Block_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Simple_Message_Block_Test - Win32 DLL 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 "Simple_Message_Block_Test.mak" CFG="Simple_Message_Block_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak" CFG="Simple_Message_Block_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Simple_Message_Block_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Simple_Message_Block_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Simple_Message_Block_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Simple_Message_Block_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Simple_Message_Block_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Simple_Message_Block_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Simple_Message_Block_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Simple_Message_Block_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Simple_Message_Block_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\Static Debug"
# PROP BASE Target_Dir ".\Simple_Message_Block_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Simple_Message_Block_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Simple_Message_Block_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Simple_Message_Block_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 ".\Simple_Message_Block_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Simple_Message_Block_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\static Debug"
-# PROP BASE Target_Dir ".\Simple_Message_Block_Test"
-# 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 ".\Simple_Message_Block_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Simple_Message_Block_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Simple_Message_Block_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Simple_Message_Block_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\DLL Release"
+# PROP BASE Output_Dir ".\Simple_Message_Block_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\Static Release"
# PROP BASE Target_Dir ".\Simple_Message_Block_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Simple_Message_Block_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,73 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Simple_Message_Block_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Simple_Message_Block_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Simple_Message_Block_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Simple_Message_Block_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Simple_Message_Block_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\static Release"
+# PROP BASE Output_Dir ".\Simple_Message_Block_Test\Release"
+# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\Release"
# PROP BASE Target_Dir ".\Simple_Message_Block_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Simple_Message_Block_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Simple_Message_Block_Test - Win32 DLL Debug"
-# Name "Simple_Message_Block_Test - Win32 DLL Unicode Debug"
-# Name "Simple_Message_Block_Test - Win32 static Debug"
-# Name "Simple_Message_Block_Test - Win32 static Unicode Debug"
-# Name "Simple_Message_Block_Test - Win32 DLL Release"
-# Name "Simple_Message_Block_Test - Win32 DLL Unicode Release"
-# Name "Simple_Message_Block_Test - Win32 static Unicode Release"
-# Name "Simple_Message_Block_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "Simple_Message_Block_Test - Win32 Static Debug"
+# Name "Simple_Message_Block_Test - Win32 Static Release"
+# Name "Simple_Message_Block_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Svc_Handler_Test.dsp b/tests/version_tests/Svc_Handler_Test.dsp index b7013614625..b77412e49ae 100644 --- a/tests/version_tests/Svc_Handler_Test.dsp +++ b/tests/version_tests/Svc_Handler_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Svc_Handler_Test - Win32 DLL Release
+CFG=Svc_Handler_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Svc_Handler_Test - Win32 DLL Release !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 "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Svc_Handler_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Svc_Handler_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Svc_Handler_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Svc_Handler_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Svc_Handler_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Svc_Handler_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Svc_Handler_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Svc_Handler_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Svc_Handler_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Svc_Handler_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Svc_Handler_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Svc_Handler_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Svc_Handler_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Svc_Handler_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Svc_Handler_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\DLL Release"
-# PROP BASE Target_Dir ".\Svc_Handler_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Svc_Handler_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Svc_Handler_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Svc_Handler_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\Static Debug"
# PROP BASE Target_Dir ".\Svc_Handler_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Svc_Handler_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Svc_Handler_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\static Release"
+# PROP BASE Output_Dir ".\Svc_Handler_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\Static Release"
# PROP BASE Target_Dir ".\Svc_Handler_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Svc_Handler_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Svc_Handler_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Svc_Handler_Test\Release"
+# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\Release"
# PROP BASE Target_Dir ".\Svc_Handler_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Svc_Handler_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Svc_Handler_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Svc_Handler_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Svc_Handler_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Svc_Handler_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\static Debug"
-# PROP BASE Target_Dir ".\Svc_Handler_Test"
-# 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 ".\Svc_Handler_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Svc_Handler_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Svc_Handler_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Svc_Handler_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Svc_Handler_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Svc_Handler_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Svc_Handler_Test - Win32 DLL Release"
-# Name "Svc_Handler_Test - Win32 DLL Unicode Release"
-# Name "Svc_Handler_Test - Win32 static Release"
-# Name "Svc_Handler_Test - Win32 static Unicode Release"
-# Name "Svc_Handler_Test - Win32 static Unicode Debug"
-# Name "Svc_Handler_Test - Win32 static Debug"
-# Name "Svc_Handler_Test - Win32 DLL Unicode Debug"
-# Name "Svc_Handler_Test - Win32 DLL Debug"
-# Begin Group "Source Files"
+# Name "Svc_Handler_Test - Win32 Static Debug"
+# Name "Svc_Handler_Test - Win32 Static Release"
+# Name "Svc_Handler_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/TSS_Test.dsp b/tests/version_tests/TSS_Test.dsp index ad051cb0c3b..69d82990e6f 100644 --- a/tests/version_tests/TSS_Test.dsp +++ b/tests/version_tests/TSS_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=TSS_Test - Win32 DLL Debug
+CFG=TSS_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=TSS_Test - Win32 DLL 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 "TSS_Test.mak" CFG="TSS_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "TSS_Test.mak" CFG="TSS_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "TSS_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "TSS_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "TSS_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "TSS_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=TSS_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "TSS_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "TSS_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\TSS_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\TSS_Test\DLL Debug"
+# PROP BASE Output_Dir ".\TSS_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\TSS_Test\Static Debug"
# PROP BASE Target_Dir ".\TSS_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\TSS_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\TSS_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\TSS_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\TSS_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 ".\TSS_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\TSS_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\TSS_Test\static Debug"
-# PROP BASE Target_Dir ".\TSS_Test"
-# 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 ".\TSS_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\TSS_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\TSS_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\TSS_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\TSS_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "TSS_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\TSS_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\TSS_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\TSS_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\TSS_Test\Static Release"
# PROP BASE Target_Dir ".\TSS_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\TSS_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "TSS_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\TSS_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\TSS_Test\DLL Release"
+# PROP BASE Output_Dir ".\TSS_Test\Release"
+# PROP BASE Intermediate_Dir ".\TSS_Test\Release"
# PROP BASE Target_Dir ".\TSS_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\TSS_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,69 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\TSS_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\TSS_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\TSS_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\TSS_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\TSS_Test\static Release"
-# PROP BASE Intermediate_Dir ".\TSS_Test\static Release"
-# PROP BASE Target_Dir ".\TSS_Test"
-# 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 ".\TSS_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "TSS_Test - Win32 DLL Debug"
-# Name "TSS_Test - Win32 DLL Unicode Debug"
-# Name "TSS_Test - Win32 static Debug"
-# Name "TSS_Test - Win32 static Unicode Debug"
-# Name "TSS_Test - Win32 DLL Unicode Release"
-# Name "TSS_Test - Win32 DLL Release"
-# Name "TSS_Test - Win32 static Unicode Release"
-# Name "TSS_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "TSS_Test - Win32 Static Debug"
+# Name "TSS_Test - Win32 Static Release"
+# Name "TSS_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Task_Test.dsp b/tests/version_tests/Task_Test.dsp index 038c6523af7..af009ad4aa2 100644 --- a/tests/version_tests/Task_Test.dsp +++ b/tests/version_tests/Task_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Task_Test - Win32 DLL Release
+CFG=Task_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Task_Test - Win32 DLL Release !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 "Task_Test.mak" CFG="Task_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Task_Test.mak" CFG="Task_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Task_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Task_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Task_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Task_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Task_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Task_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Task_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Task_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Task_Test\DLL Release"
-# PROP BASE Target_Dir ".\Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Task_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Task_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Task_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Task_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Task_Test\Static Debug"
# PROP BASE Target_Dir ".\Task_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Task_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Task_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Task_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Task_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Task_Test\static Release"
+# PROP BASE Output_Dir ".\Task_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Task_Test\Static Release"
# PROP BASE Target_Dir ".\Task_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Task_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Task_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Task_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Task_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Task_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Task_Test\Release"
+# PROP BASE Intermediate_Dir ".\Task_Test\Release"
# PROP BASE Target_Dir ".\Task_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Task_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Task_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Task_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Task_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Task_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Task_Test\static Debug"
-# PROP BASE Target_Dir ".\Task_Test"
-# 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 ".\Task_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Task_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Task_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Task_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 ".\Task_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Task_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Task_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Task_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Task_Test - Win32 DLL Release"
-# Name "Task_Test - Win32 DLL Unicode Release"
-# Name "Task_Test - Win32 static Release"
-# Name "Task_Test - Win32 static Unicode Release"
-# Name "Task_Test - Win32 static Unicode Debug"
-# Name "Task_Test - Win32 static Debug"
-# Name "Task_Test - Win32 DLL Unicode Debug"
-# Name "Task_Test - Win32 DLL Debug"
-# Begin Group "Source Files"
+# Name "Task_Test - Win32 Static Debug"
+# Name "Task_Test - Win32 Static Release"
+# Name "Task_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Thread_Manager_Test.dsp b/tests/version_tests/Thread_Manager_Test.dsp index 09e6091ad4f..a3bd635b443 100644 --- a/tests/version_tests/Thread_Manager_Test.dsp +++ b/tests/version_tests/Thread_Manager_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Thread_Manager_Test - Win32 DLL Debug
+CFG=Thread_Manager_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Thread_Manager_Test - Win32 DLL 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 "Thread_Manager_Test.mak" CFG="Thread_Manager_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Thread_Manager_Test.mak" CFG="Thread_Manager_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Thread_Manager_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Thread_Manager_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Thread_Manager_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Thread_Manager_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Manager_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Thread_Manager_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\Static Debug"
# PROP BASE Target_Dir ".\Thread_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Manager_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Manager_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Thread_Manager_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 ".\Thread_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Manager_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\static Debug"
-# PROP BASE Target_Dir ".\Thread_Manager_Test"
-# 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 ".\Thread_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,71 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Manager_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Thread_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Manager_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Manager_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\DLL Release"
+# PROP BASE Output_Dir ".\Thread_Manager_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\Static Release"
# PROP BASE Target_Dir ".\Thread_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Manager_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\static Release"
-# PROP BASE Target_Dir ".\Thread_Manager_Test"
-# 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 ".\Thread_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Manager_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Thread_Manager_Test\Release"
+# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\Release"
# PROP BASE Target_Dir ".\Thread_Manager_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Manager_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -207,46 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Manager_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Thread_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Manager_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Thread_Manager_Test - Win32 DLL Debug"
-# Name "Thread_Manager_Test - Win32 DLL Unicode Debug"
-# Name "Thread_Manager_Test - Win32 static Debug"
-# Name "Thread_Manager_Test - Win32 static Unicode Debug"
-# Name "Thread_Manager_Test - Win32 DLL Release"
-# Name "Thread_Manager_Test - Win32 static Release"
-# Name "Thread_Manager_Test - Win32 static Unicode Release"
-# Name "Thread_Manager_Test - Win32 DLL Unicode Release"
-# Begin Group "Source Files"
+# Name "Thread_Manager_Test - Win32 Static Debug"
+# Name "Thread_Manager_Test - Win32 Static Release"
+# Name "Thread_Manager_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
@@ -261,10 +125,6 @@ SOURCE=..\Thread_Manager_Test.cpp SOURCE=..\test_config.h
# End Source File
-# Begin Source File
-
-SOURCE=..\Thread_Manager_Test.h
-# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/tests/version_tests/Thread_Mutex_Test.dsp b/tests/version_tests/Thread_Mutex_Test.dsp index fe3ea709a23..3511baab428 100644 --- a/tests/version_tests/Thread_Mutex_Test.dsp +++ b/tests/version_tests/Thread_Mutex_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Thread_Mutex_Test - Win32 DLL Release
+CFG=Thread_Mutex_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Thread_Mutex_Test - Win32 DLL Release !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 "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Thread_Mutex_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Mutex_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Mutex_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Mutex_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Mutex_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Mutex_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Mutex_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Mutex_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Mutex_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Mutex_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Mutex_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Thread_Mutex_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Thread_Mutex_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Thread_Mutex_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Mutex_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\DLL Release"
-# PROP BASE Target_Dir ".\Thread_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Mutex_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Mutex_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Thread_Mutex_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\Static Debug"
# PROP BASE Target_Dir ".\Thread_Mutex_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Mutex_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Mutex_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Thread_Mutex_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\Static Release"
# PROP BASE Target_Dir ".\Thread_Mutex_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Mutex_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Mutex_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\static Release"
+# PROP BASE Output_Dir ".\Thread_Mutex_Test\Release"
+# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\Release"
# PROP BASE Target_Dir ".\Thread_Mutex_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Mutex_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Mutex_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Thread_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Mutex_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Thread_Mutex_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 ".\Thread_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Mutex_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\static Debug"
-# PROP BASE Target_Dir ".\Thread_Mutex_Test"
-# 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 ".\Thread_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Mutex_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Mutex_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Thread_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Mutex_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Thread_Mutex_Test - Win32 DLL Release"
-# Name "Thread_Mutex_Test - Win32 DLL Unicode Release"
-# Name "Thread_Mutex_Test - Win32 static Unicode Release"
-# Name "Thread_Mutex_Test - Win32 static Release"
-# Name "Thread_Mutex_Test - Win32 DLL Debug"
-# Name "Thread_Mutex_Test - Win32 DLL Unicode Debug"
-# Name "Thread_Mutex_Test - Win32 static Debug"
-# Name "Thread_Mutex_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Thread_Mutex_Test - Win32 Static Debug"
+# Name "Thread_Mutex_Test - Win32 Static Release"
+# Name "Thread_Mutex_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Thread_Pool_Reactor_Test.dsp b/tests/version_tests/Thread_Pool_Reactor_Test.dsp index 7b30dbd22e1..b95a6757c85 100644 --- a/tests/version_tests/Thread_Pool_Reactor_Test.dsp +++ b/tests/version_tests/Thread_Pool_Reactor_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Thread_Pool_Reactor_Test - Win32 DLL Debug
+CFG=Thread_Pool_Reactor_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Thread_Pool_Reactor_Test - Win32 DLL 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 "Thread_Pool_Reactor_Test.mak" CFG="Thread_Pool_Reactor_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Thread_Pool_Reactor_Test.mak" CFG="Thread_Pool_Reactor_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Reactor_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=Thread_Pool_Reactor_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\Static Debug"
# PROP BASE Target_Dir ".\Thread_Pool_Reactor_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Pool_Reactor_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\static Debug"
-# PROP BASE Target_Dir ".\Thread_Pool_Reactor_Test"
-# 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 ".\Thread_Pool_Reactor_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Thread_Pool_Reactor_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 ".\Thread_Pool_Reactor_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Thread_Pool_Reactor_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Pool_Reactor_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Thread_Pool_Reactor_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Pool_Reactor_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\static Release"
+# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\Static Release"
# PROP BASE Target_Dir ".\Thread_Pool_Reactor_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Pool_Reactor_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\Release"
+# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\Release"
# PROP BASE Target_Dir ".\Thread_Pool_Reactor_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Pool_Reactor_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\DLL Release"
-# PROP BASE Target_Dir ".\Thread_Pool_Reactor_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Pool_Reactor_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,17 +108,11 @@ LINK32=link.exe # Begin Target
-# Name "Thread_Pool_Reactor_Test - Win32 DLL Debug"
-# Name "Thread_Pool_Reactor_Test - Win32 static Debug"
-# Name "Thread_Pool_Reactor_Test - Win32 DLL Unicode Debug"
-# Name "Thread_Pool_Reactor_Test - Win32 static Unicode Debug"
-# Name "Thread_Pool_Reactor_Test - Win32 static Unicode Release"
-# Name "Thread_Pool_Reactor_Test - Win32 static Release"
-# Name "Thread_Pool_Reactor_Test - Win32 DLL Unicode Release"
-# Name "Thread_Pool_Reactor_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "Thread_Pool_Reactor_Test - Win32 Static Debug"
+# Name "Thread_Pool_Reactor_Test - Win32 Static Release"
+# Name "Thread_Pool_Reactor_Test - Win32 Release"# Begin Group "Source Files"
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# PROP Default_Filter ".cpp"
# Begin Source File
SOURCE=..\Thread_Pool_Reactor_Test.cpp
@@ -256,15 +120,11 @@ SOURCE=..\Thread_Pool_Reactor_Test.cpp # End Group
# Begin Group "Header Files"
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# PROP Default_Filter ".h"
# Begin Source File
SOURCE=..\test_config.h
# End Source File
# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
# End Target
# End Project
diff --git a/tests/version_tests/Thread_Pool_Test.dsp b/tests/version_tests/Thread_Pool_Test.dsp index b6d724e5eca..be8be022276 100644 --- a/tests/version_tests/Thread_Pool_Test.dsp +++ b/tests/version_tests/Thread_Pool_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Thread_Pool_Test - Win32 DLL Release
+CFG=Thread_Pool_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Thread_Pool_Test - Win32 DLL Release !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 "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Thread_Pool_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Thread_Pool_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Thread_Pool_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Thread_Pool_Test - Win32 DLL Release"
+!IF "$(CFG)" == "Thread_Pool_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Pool_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\DLL Release"
-# PROP BASE Target_Dir ".\Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Pool_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Pool_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Thread_Pool_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\Static Debug"
# PROP BASE Target_Dir ".\Thread_Pool_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Pool_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Pool_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\static Release"
+# PROP BASE Output_Dir ".\Thread_Pool_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\Static Release"
# PROP BASE Target_Dir ".\Thread_Pool_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Pool_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -109,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Thread_Pool_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Thread_Pool_Test\Release"
+# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\Release"
# PROP BASE Target_Dir ".\Thread_Pool_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Thread_Pool_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Pool_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Pool_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Pool_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Thread_Pool_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 ".\Thread_Pool_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Pool_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\static Debug"
-# PROP BASE Target_Dir ".\Thread_Pool_Test"
-# 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 ".\Thread_Pool_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Thread_Pool_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Thread_Pool_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Thread_Pool_Test - Win32 DLL Release"
-# Name "Thread_Pool_Test - Win32 DLL Unicode Release"
-# Name "Thread_Pool_Test - Win32 static Release"
-# Name "Thread_Pool_Test - Win32 static Unicode Release"
-# Name "Thread_Pool_Test - Win32 DLL Debug"
-# Name "Thread_Pool_Test - Win32 DLL Unicode Debug"
-# Name "Thread_Pool_Test - Win32 static Debug"
-# Name "Thread_Pool_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Thread_Pool_Test - Win32 Static Debug"
+# Name "Thread_Pool_Test - Win32 Static Release"
+# Name "Thread_Pool_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Time_Service_Test.dsp b/tests/version_tests/Time_Service_Test.dsp index a92523decaa..fd62929a899 100644 --- a/tests/version_tests/Time_Service_Test.dsp +++ b/tests/version_tests/Time_Service_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Time_Service_Test - Win32 DLL Unicode Release
+CFG=Time_Service_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Time_Service_Test - Win32 DLL Unicode Release !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 "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 DLL Unicode Release"
+!MESSAGE NMAKE /f "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Time_Service_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Time_Service_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Time_Service_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Time_Service_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=Time_Service_Test - Win32 DLL Unicode Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Time_Service_Test - Win32 DLL Unicode Release"
+!IF "$(CFG)" == "Time_Service_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Time_Service_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Time_Service_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Time_Service_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Time_Service_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Time_Service_Test\DLL Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Time_Service_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Time_Service_Test\Static Debug"
# PROP BASE Target_Dir ".\Time_Service_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Time_Service_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Time_Service_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Time_Service_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Time_Service_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Time_Service_Test\Static Release"
# PROP BASE Target_Dir ".\Time_Service_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Time_Service_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Time_Service_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Time_Service_Test\static Release"
+# PROP BASE Output_Dir ".\Time_Service_Test\Release"
+# PROP BASE Intermediate_Dir ".\Time_Service_Test\Release"
# PROP BASE Target_Dir ".\Time_Service_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Time_Service_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Time_Service_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Time_Service_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Time_Service_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Time_Service_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Time_Service_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Time_Service_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 ".\Time_Service_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Time_Service_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Time_Service_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Time_Service_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Time_Service_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Time_Service_Test\static Debug"
-# PROP BASE Target_Dir ".\Time_Service_Test"
-# 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 ".\Time_Service_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Time_Service_Test - Win32 DLL Unicode Release"
-# Name "Time_Service_Test - Win32 DLL Release"
-# Name "Time_Service_Test - Win32 static Unicode Release"
-# Name "Time_Service_Test - Win32 static Release"
-# Name "Time_Service_Test - Win32 DLL Debug"
-# Name "Time_Service_Test - Win32 DLL Unicode Debug"
-# Name "Time_Service_Test - Win32 static Unicode Debug"
-# Name "Time_Service_Test - Win32 static Debug"
-# Begin Group "Source Files"
+# Name "Time_Service_Test - Win32 Static Debug"
+# Name "Time_Service_Test - Win32 Static Release"
+# Name "Time_Service_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Time_Value_Test.dsp b/tests/version_tests/Time_Value_Test.dsp index c22abafcaec..3a6cd636eb5 100644 --- a/tests/version_tests/Time_Value_Test.dsp +++ b/tests/version_tests/Time_Value_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Time_Value_Test - Win32 DLL Debug
+CFG=Time_Value_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Time_Value_Test - Win32 DLL 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 "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Time_Value_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Time_Value_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Time_Value_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Time_Value_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Time_Value_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Time_Value_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Time_Value_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Time_Value_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Time_Value_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Time_Value_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Time_Value_Test\Static Debug"
# PROP BASE Target_Dir ".\Time_Value_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Time_Value_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Time_Value_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Time_Value_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Time_Value_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 ".\Time_Value_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Time_Value_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Time_Value_Test\static Debug"
-# PROP BASE Target_Dir ".\Time_Value_Test"
-# 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 ".\Time_Value_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Time_Value_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Time_Value_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Time_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Time_Value_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Time_Value_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Time_Value_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Time_Value_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Time_Value_Test\Static Release"
# PROP BASE Target_Dir ".\Time_Value_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Time_Value_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Time_Value_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Time_Value_Test\DLL Release"
+# PROP BASE Output_Dir ".\Time_Value_Test\Release"
+# PROP BASE Intermediate_Dir ".\Time_Value_Test\Release"
# PROP BASE Target_Dir ".\Time_Value_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Time_Value_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,69 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Time_Value_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Time_Value_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Time_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Time_Value_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Time_Value_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Time_Value_Test\static Release"
-# PROP BASE Target_Dir ".\Time_Value_Test"
-# 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 ".\Time_Value_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "Time_Value_Test - Win32 DLL Debug"
-# Name "Time_Value_Test - Win32 DLL Unicode Debug"
-# Name "Time_Value_Test - Win32 static Debug"
-# Name "Time_Value_Test - Win32 static Unicode Debug"
-# Name "Time_Value_Test - Win32 DLL Unicode Release"
-# Name "Time_Value_Test - Win32 DLL Release"
-# Name "Time_Value_Test - Win32 static Unicode Release"
-# Name "Time_Value_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "Time_Value_Test - Win32 Static Debug"
+# Name "Time_Value_Test - Win32 Static Release"
+# Name "Time_Value_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Timeprobe_Test.dsp b/tests/version_tests/Timeprobe_Test.dsp index d62183a8384..d791f4e3d67 100644 --- a/tests/version_tests/Timeprobe_Test.dsp +++ b/tests/version_tests/Timeprobe_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Timeprobe_Test - Win32 DLL Debug
+CFG=Timeprobe_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Timeprobe_Test - Win32 DLL 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 "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Timeprobe_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Timeprobe_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Timeprobe_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Timeprobe_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,46 +29,21 @@ CFG=Timeprobe_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Timeprobe_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Timeprobe_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Timeprobe_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Timeprobe_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Timeprobe_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\Static Debug"
# PROP BASE Target_Dir ".\Timeprobe_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Timeprobe_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Timeprobe_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Timeprobe_Test\static Debug"
-# PROP BASE Target_Dir ".\Timeprobe_Test"
-# 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 ".\Timeprobe_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -84,96 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Timeprobe_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Timeprobe_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Timeprobe_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 ".\Timeprobe_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Timeprobe_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Timeprobe_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Timeprobe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Timeprobe_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Timeprobe_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Timeprobe_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Timeprobe_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\Static Release"
# PROP BASE Target_Dir ".\Timeprobe_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Timeprobe_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Timeprobe_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Timeprobe_Test\static Release"
-# PROP BASE Target_Dir ".\Timeprobe_Test"
-# 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 ".\Timeprobe_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,46 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Timeprobe_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Timeprobe_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Timeprobe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Timeprobe_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Timeprobe_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Timeprobe_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Timeprobe_Test\DLL Release"
+# PROP BASE Output_Dir ".\Timeprobe_Test\Release"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\Release"
# PROP BASE Target_Dir ".\Timeprobe_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Timeprobe_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -238,15 +108,9 @@ LINK32=link.exe # Begin Target
-# Name "Timeprobe_Test - Win32 DLL Debug"
-# Name "Timeprobe_Test - Win32 static Debug"
-# Name "Timeprobe_Test - Win32 DLL Unicode Debug"
-# Name "Timeprobe_Test - Win32 static Unicode Debug"
-# Name "Timeprobe_Test - Win32 static Unicode Release"
-# Name "Timeprobe_Test - Win32 static Release"
-# Name "Timeprobe_Test - Win32 DLL Unicode Release"
-# Name "Timeprobe_Test - Win32 DLL Release"
-# Begin Group "Source Files"
+# Name "Timeprobe_Test - Win32 Static Debug"
+# Name "Timeprobe_Test - Win32 Static Release"
+# Name "Timeprobe_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Timer_Queue_Test.dsp b/tests/version_tests/Timer_Queue_Test.dsp index 5cb5fe07a59..13bca056c05 100644 --- a/tests/version_tests/Timer_Queue_Test.dsp +++ b/tests/version_tests/Timer_Queue_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Timer_Queue_Test - Win32 DLL Debug
+CFG=Timer_Queue_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Timer_Queue_Test - Win32 DLL 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 "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Timer_Queue_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Timer_Queue_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Timer_Queue_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Timer_Queue_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,21 +29,21 @@ CFG=Timer_Queue_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Timer_Queue_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Timer_Queue_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Timer_Queue_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Timer_Queue_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\Static Debug"
# PROP BASE Target_Dir ".\Timer_Queue_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Timer_Queue_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -57,73 +52,23 @@ 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 /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Timer_Queue_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\DLL Release"
-# PROP BASE Target_Dir ".\Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Timer_Queue_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Timer_Queue_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\DLL Unicode Release"
-# PROP BASE Target_Dir ".\Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Timer_Queue_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Timer_Queue_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Timer_Queue_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\Static Release"
# PROP BASE Target_Dir ".\Timer_Queue_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Timer_Queue_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Timer_Queue_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\static Release"
+# PROP BASE Output_Dir ".\Timer_Queue_Test\Release"
+# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\Release"
# PROP BASE Target_Dir ".\Timer_Queue_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Timer_Queue_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,96 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Timer_Queue_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Timer_Queue_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 ".\Timer_Queue_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Timer_Queue_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\static Debug"
-# PROP BASE Target_Dir ".\Timer_Queue_Test"
-# 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 ".\Timer_Queue_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Timer_Queue_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Timer_Queue_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Timer_Queue_Test - Win32 DLL Debug"
-# Name "Timer_Queue_Test - Win32 DLL Release"
-# Name "Timer_Queue_Test - Win32 DLL Unicode Release"
-# Name "Timer_Queue_Test - Win32 static Unicode Release"
-# Name "Timer_Queue_Test - Win32 static Release"
-# Name "Timer_Queue_Test - Win32 DLL Unicode Debug"
-# Name "Timer_Queue_Test - Win32 static Debug"
-# Name "Timer_Queue_Test - Win32 static Unicode Debug"
-# Begin Group "Source Files"
+# Name "Timer_Queue_Test - Win32 Static Debug"
+# Name "Timer_Queue_Test - Win32 Static Release"
+# Name "Timer_Queue_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Tokens_Test.dsp b/tests/version_tests/Tokens_Test.dsp index 0334faa1f49..fc34a4098de 100644 --- a/tests/version_tests/Tokens_Test.dsp +++ b/tests/version_tests/Tokens_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Tokens_Test - Win32 static Debug
+CFG=Tokens_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Tokens_Test - Win32 static 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 "Tokens_Test.mak" CFG="Tokens_Test - Win32 static Debug"
+!MESSAGE NMAKE /f "Tokens_Test.mak" CFG="Tokens_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Tokens_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Tokens_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Tokens_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Tokens_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,21 +29,21 @@ CFG=Tokens_Test - Win32 static Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Tokens_Test - Win32 static Debug"
+!IF "$(CFG)" == "Tokens_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Tokens_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Tokens_Test\static Debug"
+# PROP BASE Output_Dir ".\Tokens_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Tokens_Test\Static Debug"
# PROP BASE Target_Dir ".\Tokens_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Debug"
-# PROP Intermediate_Dir ".\static Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Tokens_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -59,146 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Tokens_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Tokens_Test\DLL Debug"
-# PROP BASE Target_Dir ".\Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Tokens_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Tokens_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Tokens_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Tokens_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 ".\Tokens_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Tokens_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Tokens_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Tokens_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Tokens_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Tokens_Test\DLL Release"
-# PROP BASE Target_Dir ".\Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Tokens_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Tokens_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Tokens_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\Tokens_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Tokens_Test\Static Release"
# PROP BASE Target_Dir ".\Tokens_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Tokens_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Tokens_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Tokens_Test\static Release"
-# PROP BASE Target_Dir ".\Tokens_Test"
-# 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 ".\Tokens_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -209,21 +79,21 @@ 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 /machine:I386
# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Tokens_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Tokens_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Tokens_Test\Release"
+# PROP BASE Intermediate_Dir ".\Tokens_Test\Release"
# PROP BASE Target_Dir ".\Tokens_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Tokens_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -232,21 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "Tokens_Test - Win32 static Debug"
-# Name "Tokens_Test - Win32 DLL Debug"
-# Name "Tokens_Test - Win32 DLL Unicode Debug"
-# Name "Tokens_Test - Win32 static Unicode Debug"
-# Name "Tokens_Test - Win32 DLL Release"
-# Name "Tokens_Test - Win32 static Unicode Release"
-# Name "Tokens_Test - Win32 static Release"
-# Name "Tokens_Test - Win32 DLL Unicode Release"
-# Begin Group "Source Files"
+# Name "Tokens_Test - Win32 Static Debug"
+# Name "Tokens_Test - Win32 Static Release"
+# Name "Tokens_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/UPIPE_SAP_Test.dsp b/tests/version_tests/UPIPE_SAP_Test.dsp index 0dc7793bdd3..390715b857c 100644 --- a/tests/version_tests/UPIPE_SAP_Test.dsp +++ b/tests/version_tests/UPIPE_SAP_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=UPIPE_SAP_Test - Win32 DLL Release
+CFG=UPIPE_SAP_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=UPIPE_SAP_Test - Win32 DLL Release !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 "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 DLL Release"
+!MESSAGE NMAKE /f "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "UPIPE_SAP_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "UPIPE_SAP_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "UPIPE_SAP_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "UPIPE_SAP_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,46 @@ CFG=UPIPE_SAP_Test - Win32 DLL Release CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "UPIPE_SAP_Test - Win32 DLL Release"
+!IF "$(CFG)" == "UPIPE_SAP_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\UPIPE_SAP_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\DLL Release"
-# PROP BASE Target_Dir ".\UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\UPIPE_SAP_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\UPIPE_SAP_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\DLL Unicode Release"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\UPIPE_SAP_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\Static Debug"
# PROP BASE Target_Dir ".\UPIPE_SAP_Test"
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\UPIPE_SAP_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# 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 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 /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 static Unicode Release"
+!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\UPIPE_SAP_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\static Unicode Release"
+# PROP BASE Output_Dir ".\UPIPE_SAP_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\Static Release"
# PROP BASE Target_Dir ".\UPIPE_SAP_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\UPIPE_SAP_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -107,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 static Release"
+!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\UPIPE_SAP_Test\static Release"
-# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\static Release"
+# PROP BASE Output_Dir ".\UPIPE_SAP_Test\Release"
+# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\Release"
# PROP BASE Target_Dir ".\UPIPE_SAP_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Release"
-# PROP Intermediate_Dir ".\static Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\UPIPE_SAP_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -132,121 +102,15 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\UPIPE_SAP_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\UPIPE_SAP_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 ".\UPIPE_SAP_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\UPIPE_SAP_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\UPIPE_SAP_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\UPIPE_SAP_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\static Debug"
-# PROP BASE Target_Dir ".\UPIPE_SAP_Test"
-# 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 ".\UPIPE_SAP_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\UPIPE_SAP_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\DLL Debug"
-# PROP BASE Target_Dir ".\UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\UPIPE_SAP_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
!ENDIF
# Begin Target
-# Name "UPIPE_SAP_Test - Win32 DLL Release"
-# Name "UPIPE_SAP_Test - Win32 DLL Unicode Release"
-# Name "UPIPE_SAP_Test - Win32 static Unicode Release"
-# Name "UPIPE_SAP_Test - Win32 static Release"
-# Name "UPIPE_SAP_Test - Win32 DLL Unicode Debug"
-# Name "UPIPE_SAP_Test - Win32 static Unicode Debug"
-# Name "UPIPE_SAP_Test - Win32 static Debug"
-# Name "UPIPE_SAP_Test - Win32 DLL Debug"
-# Begin Group "Source Files"
+# Name "UPIPE_SAP_Test - Win32 Static Debug"
+# Name "UPIPE_SAP_Test - Win32 Static Release"
+# Name "UPIPE_SAP_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
diff --git a/tests/version_tests/Upgradable_RW_Test.dsp b/tests/version_tests/Upgradable_RW_Test.dsp index 811b5a46aab..19b569577ea 100644 --- a/tests/version_tests/Upgradable_RW_Test.dsp +++ b/tests/version_tests/Upgradable_RW_Test.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Upgradable_RW_Test - Win32 DLL Debug
+CFG=Upgradable_RW_Test - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,18 +13,13 @@ CFG=Upgradable_RW_Test - Win32 DLL 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 "Upgradable_RW_Test.mak" CFG="Upgradable_RW_Test - Win32 DLL Debug"
+!MESSAGE NMAKE /f "Upgradable_RW_Test.mak" CFG="Upgradable_RW_Test - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Upgradable_RW_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Upgradable_RW_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Upgradable_RW_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Upgradable_RW_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Upgradable_RW_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Upgradable_RW_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Upgradable_RW_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Upgradable_RW_Test - Win32 static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Upgradable_RW_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Upgradable_RW_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Upgradable_RW_Test - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -34,71 +29,21 @@ CFG=Upgradable_RW_Test - Win32 DLL Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Upgradable_RW_Test - Win32 DLL Debug"
+!IF "$(CFG)" == "Upgradable_RW_Test - Win32 Static Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Upgradable_RW_Test\DLL Debug"
-# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\DLL Debug"
+# PROP BASE Output_Dir ".\Upgradable_RW_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\Static Debug"
# PROP BASE Target_Dir ".\Upgradable_RW_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Upgradable_RW_Test"
# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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"
-
-!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Upgradable_RW_Test\DLL Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\DLL Unicode Debug"
-# PROP BASE Target_Dir ".\Upgradable_RW_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 ".\Upgradable_RW_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Upgradable_RW_Test\static Debug"
-# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\static Debug"
-# PROP BASE Target_Dir ".\Upgradable_RW_Test"
-# 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 ".\Upgradable_RW_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -109,46 +54,21 @@ 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 static Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Upgradable_RW_Test\static Unicode Debug"
-# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\static Unicode Debug"
-# PROP BASE Target_Dir ".\Upgradable_RW_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Upgradable_RW_Test"
-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 DLL Unicode Release"
+!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 Static Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Upgradable_RW_Test\DLL Unicode Release"
-# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\DLL Unicode Release"
+# PROP BASE Output_Dir ".\Upgradable_RW_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\Static Release"
# PROP BASE Target_Dir ".\Upgradable_RW_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Unicode Release"
-# PROP Intermediate_Dir ".\DLL Unicode Release"
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Upgradable_RW_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -157,23 +77,23 @@ 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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 DLL Release"
+!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Upgradable_RW_Test\DLL Release"
-# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\DLL Release"
+# PROP BASE Output_Dir ".\Upgradable_RW_Test\Release"
+# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\Release"
# PROP BASE Target_Dir ".\Upgradable_RW_Test"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\Upgradable_RW_Test"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -184,69 +104,13 @@ 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 /machine:I386
# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 static Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Upgradable_RW_Test\static Unicode Release"
-# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\static Unicode Release"
-# PROP BASE Target_Dir ".\Upgradable_RW_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ".\Upgradable_RW_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Upgradable_RW_Test - Win32 static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Upgradable_RW_Test\static Release"
-# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\static Release"
-# PROP BASE Target_Dir ".\Upgradable_RW_Test"
-# 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 ".\Upgradable_RW_Test"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# 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 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 /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
-
!ENDIF
# Begin Target
-# Name "Upgradable_RW_Test - Win32 DLL Debug"
-# Name "Upgradable_RW_Test - Win32 DLL Unicode Debug"
-# Name "Upgradable_RW_Test - Win32 static Debug"
-# Name "Upgradable_RW_Test - Win32 static Unicode Debug"
-# Name "Upgradable_RW_Test - Win32 DLL Unicode Release"
-# Name "Upgradable_RW_Test - Win32 DLL Release"
-# Name "Upgradable_RW_Test - Win32 static Unicode Release"
-# Name "Upgradable_RW_Test - Win32 static Release"
-# Begin Group "Source Files"
+# Name "Upgradable_RW_Test - Win32 Static Debug"
+# Name "Upgradable_RW_Test - Win32 Static Release"
+# Name "Upgradable_RW_Test - Win32 Release"# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
@@ -261,10 +125,6 @@ SOURCE=..\Upgradable_RW_Test.cpp SOURCE=..\test_config.h
# End Source File
-# Begin Source File
-
-SOURCE=..\Upgradable_RW_Test_Errno.h
-# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/tests/version_tests/version_tests.dsw b/tests/version_tests/version_tests.dsw index 707f8b69775..b62357f75d2 100644 --- a/tests/version_tests/version_tests.dsw +++ b/tests/version_tests/version_tests.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "Ace_Init_Test"=.\ACE_Init_Test.dsp - Package Owner=<4>
+Project: "Atomic_Op_Test.dsp"=.\Atomic_Op_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "Atomic_Op_Test"=.\Atomic_Op_Test.dsp - Package Owner=<4>
+Project: "Auto_IncDec_Test.dsp"=.\Auto_IncDec_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -27,7 +27,7 @@ Package=<4> ###############################################################################
-Project: "Auto_IncDec_Test"=.\Auto_IncDec_Test.dsp - Package Owner=<4>
+Project: "Barrier_Test.dsp"=.\Barrier_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -39,7 +39,7 @@ Package=<4> ###############################################################################
-Project: "Barrier_Test"=.\Barrier_Test.dsp - Package Owner=<4>
+Project: "Basic_Types_Test.dsp"=.\Basic_Types_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -51,7 +51,7 @@ Package=<4> ###############################################################################
-Project: "Basic_Types_Test"=.\Basic_Types_Test.dsp - Package Owner=<4>
+Project: "Buffer_Stream_Test.dsp"=.\Buffer_Stream_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -63,7 +63,7 @@ Package=<4> ###############################################################################
-Project: "Buffer_Stream_Test"=.\Buffer_Stream_Test.dsp - Package Owner=<4>
+Project: "Cached_Accept_Conn_Test.dsp"=.\Cached_Accept_Conn_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -75,7 +75,7 @@ Package=<4> ###############################################################################
-Project: "CDR_File_Test"=.\CDR_File_Test.dsp - Package Owner=<4>
+Project: "Cached_Conn_Test.dsp"=.\Cached_Conn_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -87,7 +87,7 @@ Package=<4> ###############################################################################
-Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>
+Project: "Cache_Map_Manager_Test.dsp"=.\Cache_Map_Manager_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -99,7 +99,7 @@ Package=<4> ###############################################################################
-Project: "Cache_Map_Manager_Test"=.\Cache_Map_Manager_Test.dsp - Package Owner=<4>
+Project: "Capabilities_Test.dsp"=.\Capabilities_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -111,7 +111,7 @@ Package=<4> ###############################################################################
-Project: "Cached_Accept_Conn_Test"=.\Cached_Accept_Conn_Test.dsp - Package Owner=<4>
+Project: "CDR_File_Test.dsp"=.\CDR_File_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -123,7 +123,7 @@ Package=<4> ###############################################################################
-Project: "Cached_Conn_Test"=.\Cached_Conn_Test.dsp - Package Owner=<4>
+Project: "CDR_Test.dsp"=.\CDR_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -135,7 +135,7 @@ Package=<4> ###############################################################################
-Project: "Capabilities_Test"=.\Capabilities_Test.dsp - Package Owner=<4>
+Project: "Collection_Test.dsp"=.\Collection_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -147,7 +147,7 @@ Package=<4> ###############################################################################
-Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>
+Project: "Conn_Test.dsp"=.\Conn_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -159,7 +159,7 @@ Package=<4> ###############################################################################
-Project: "Conn_Test"=.\Conn_Test.dsp - Package Owner=<4>
+Project: "DLList_Test.dsp"=.\DLList_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -171,7 +171,7 @@ Package=<4> ###############################################################################
-Project: "DLL_Test"=.\DLL_Test.dsp - Package Owner=<4>
+Project: "DLL_Test.dsp"=.\DLL_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -183,7 +183,7 @@ Package=<4> ###############################################################################
-Project: "DLList_Test"=.\DLList_Test.dsp - Package Owner=<4>
+Project: "Dynamic_Priority_Test.dsp"=.\Dynamic_Priority_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -195,7 +195,7 @@ Package=<4> ###############################################################################
-Project: "Dynamic_Priority_Test"=.\Dynamic_Priority_Test.dsp - Package Owner=<4>
+Project: "Enum_Interfaces_Test.dsp"=.\Enum_Interfaces_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -207,7 +207,7 @@ Package=<4> ###############################################################################
-Project: "Enum_Interfaces_Test"=.\Enum_Interfaces_Test.dsp - Package Owner=<4>
+Project: "Env_Value_Test.dsp"=.\Env_Value_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -219,7 +219,7 @@ Package=<4> ###############################################################################
-Project: "Env_Value_Test"=.\Env_Value_Test.dsp - Package Owner=<4>
+Project: "Future_Set_Test.dsp"=.\Future_Set_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -231,7 +231,7 @@ Package=<4> ###############################################################################
-Project: "Future_Set_Test"=.\Future_Set_Test.dsp - Package Owner=<4>
+Project: "Future_Test.dsp"=.\Future_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -243,7 +243,7 @@ Package=<4> ###############################################################################
-Project: "Future_Test"=.\Future_Test.dsp - Package Owner=<4>
+Project: "Handle_Set_Test.dsp"=.\Handle_Set_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -255,7 +255,7 @@ Package=<4> ###############################################################################
-Project: "Handle_Set_Test"=.\Handle_Set_Test.dsp - Package Owner=<4>
+Project: "Hash_Map_Bucket_Iterator_Test.dsp"=.\Hash_Map_Bucket_Iterator_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -267,7 +267,7 @@ Package=<4> ###############################################################################
-Project: "Hash_Map_Bucket_Iterator_Test"=.\Hash_Map_Bucket_Iterator_Test.dsp - Package Owner=<4>
+Project: "Hash_Map_Manager_Test.dsp"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -279,7 +279,7 @@ Package=<4> ###############################################################################
-Project: "Hash_Map_Manager_Test"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>
+Project: "High_Res_Timer_Test.dsp"=.\High_Res_Timer_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -291,7 +291,7 @@ Package=<4> ###############################################################################
-Project: "High_Res_Timer_Test"=.\High_Res_Timer_Test.dsp - Package Owner=<4>
+Project: "IOStream_Test.dsp"=.\IOStream_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -303,7 +303,7 @@ Package=<4> ###############################################################################
-Project: "IOStream_Test"=.\IOStream_Test.dsp - Package Owner=<4>
+Project: "Lazy_Map_Manager_Test.dsp"=.\Lazy_Map_Manager_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -315,7 +315,7 @@ Package=<4> ###############################################################################
-Project: "Lazy_Map_Manager_Test"=.\Lazy_Map_Manager_Test.dsp - Package Owner=<4>
+Project: "Malloc_Test.dsp"=.\Malloc_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -327,7 +327,7 @@ Package=<4> ###############################################################################
-Project: "MM_Shared_Memory_Test"=.\MM_Shared_Memory_Test.dsp - Package Owner=<4>
+Project: "Map_Manager_Test.dsp"=.\Map_Manager_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -339,7 +339,7 @@ Package=<4> ###############################################################################
-Project: "MT_SOCK_Test"=.\MT_SOCK_Test.dsp - Package Owner=<4>
+Project: "Map_Test.dsp"=.\Map_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -351,7 +351,7 @@ Package=<4> ###############################################################################
-Project: "Malloc_Test"=.\Malloc_Test.dsp - Package Owner=<4>
+Project: "Mem_Map_Test.dsp"=.\Mem_Map_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -363,7 +363,7 @@ Package=<4> ###############################################################################
-Project: "Map_Manager_Test"=.\Map_Manager_Test.dsp - Package Owner=<4>
+Project: "Message_Block_Test.dsp"=.\Message_Block_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -375,7 +375,7 @@ Package=<4> ###############################################################################
-Project: "Map_Test"=.\Map_Test.dsp - Package Owner=<4>
+Project: "Message_Queue_Notifications_Test.dsp"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -387,7 +387,7 @@ Package=<4> ###############################################################################
-Project: "Mem_Map_Test"=.\Mem_Map_Test.dsp - Package Owner=<4>
+Project: "Message_Queue_Test.dsp"=.\Message_Queue_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -399,7 +399,7 @@ Package=<4> ###############################################################################
-Project: "Message_Block_Test"=.\Message_Block_Test.dsp - Package Owner=<4>
+Project: "MM_Shared_Memory_Test.dsp"=.\MM_Shared_Memory_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -411,7 +411,7 @@ Package=<4> ###############################################################################
-Project: "Message_Queue_Notifications_Test"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>
+Project: "MT_Reactor_Timer_Test.dsp"=.\MT_Reactor_Timer_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -423,7 +423,7 @@ Package=<4> ###############################################################################
-Project: "Message_Queue_Test"=.\Message_Queue_Test.dsp - Package Owner=<4>
+Project: "MT_SOCK_Test.dsp"=.\MT_SOCK_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -435,7 +435,7 @@ Package=<4> ###############################################################################
-Project: "Mt_Reactor_Timer_Test"=.\MT_Reactor_Timer_Test.dsp - Package Owner=<4>
+Project: "Naming_Test.dsp"=.\Naming_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -447,7 +447,7 @@ Package=<4> ###############################################################################
-Project: "Naming_Test"=.\Naming_Test.dsp - Package Owner=<4>
+Project: "New_Fail_Test.dsp"=.\New_Fail_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -459,7 +459,7 @@ Package=<4> ###############################################################################
-Project: "New_Fail_Test"=.\New_Fail_Test.dsp - Package Owner=<4>
+Project: "Notify_Performance_Test.dsp"=.\Notify_Performance_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -471,7 +471,7 @@ Package=<4> ###############################################################################
-Project: "Notify_Performance_Test"=.\Notify_Performance_Test.dsp - Package Owner=<4>
+Project: "Object_Manager_Test.dsp"=.\Object_Manager_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -483,7 +483,7 @@ Package=<4> ###############################################################################
-Project: "Object_Manager_Test"=.\Object_Manager_Test.dsp - Package Owner=<4>
+Project: "OrdMultiSet_Test.dsp"=.\OrdMultiSet_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -495,7 +495,7 @@ Package=<4> ###############################################################################
-Project: "OrdMultiSet_Test"=.\OrdMultiSet_Test.dsp - Package Owner=<4>
+Project: "Pipe_Test.dsp"=.\Pipe_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -507,7 +507,7 @@ Package=<4> ###############################################################################
-Project: "Pipe_Test"=.\Pipe_Test.dsp - Package Owner=<4>
+Project: "Priority_Buffer_Test.dsp"=.\Priority_Buffer_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -519,7 +519,7 @@ Package=<4> ###############################################################################
-Project: "Priority_Buffer_Test"=.\Priority_Buffer_Test.dsp - Package Owner=<4>
+Project: "Priority_Reactor_Test.dsp"=.\Priority_Reactor_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -531,7 +531,7 @@ Package=<4> ###############################################################################
-Project: "Priority_Reactor_Test"=.\Priority_Reactor_Test.dsp - Package Owner=<4>
+Project: "Priority_Task_Test.dsp"=.\Priority_Task_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -543,7 +543,7 @@ Package=<4> ###############################################################################
-Project: "Priority_Task_Test"=.\Priority_Task_Test.dsp - Package Owner=<4>
+Project: "Process_Manager_Test.dsp"=.\Process_Manager_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -555,7 +555,7 @@ Package=<4> ###############################################################################
-Project: "Process_Manager_Test"=.\Process_Manager_Test.dsp - Package Owner=<4>
+Project: "Process_Mutex_Test.dsp"=.\Process_Mutex_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -567,7 +567,7 @@ Package=<4> ###############################################################################
-Project: "Process_Mutex_Test"=.\Process_Mutex_Test.dsp - Package Owner=<4>
+Project: "Process_Strategy_Test.dsp"=.\Process_Strategy_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -579,7 +579,7 @@ Package=<4> ###############################################################################
-Project: "Process_Strategy_Test"=.\Process_Strategy_Test.dsp - Package Owner=<4>
+Project: "RB_Tree_Test.dsp"=.\RB_Tree_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -591,7 +591,7 @@ Package=<4> ###############################################################################
-Project: "RB_Tree_Test"=.\RB_Tree_Test.dsp - Package Owner=<4>
+Project: "Reactors_Test.dsp"=.\Reactors_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -603,7 +603,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Exception_Test"=.\Reactor_Exception_Test.dsp - Package Owner=<4>
+Project: "Reactor_Exceptions_Test.dsp"=.\Reactor_Exceptions_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -615,7 +615,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Notify_Test"=.\Reactor_Notify_Test.dsp - Package Owner=<4>
+Project: "Reactor_Notify_Test.dsp"=.\Reactor_Notify_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -627,7 +627,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Performance_Test"=.\Reactor_Performance_Test.dsp - Package Owner=<4>
+Project: "Reactor_Performance_Test.dsp"=.\Reactor_Performance_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -639,7 +639,7 @@ Package=<4> ###############################################################################
-Project: "Reactor_Timer_Test"=.\Reactor_Timer_Test.dsp - Package Owner=<4>
+Project: "Reactor_Timer_Test.dsp"=.\Reactor_Timer_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -651,7 +651,7 @@ Package=<4> ###############################################################################
-Project: "Reactors_Test"=.\Reactors_Test.dsp - Package Owner=<4>
+Project: "Reader_Writer_Test.dsp"=.\Reader_Writer_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -663,7 +663,7 @@ Package=<4> ###############################################################################
-Project: "Reader_Writer_Test"=.\Reader_Writer_Test.dsp - Package Owner=<4>
+Project: "Recursive_Mutex_Test.dsp"=.\Recursive_Mutex_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -675,7 +675,7 @@ Package=<4> ###############################################################################
-Project: "Recursive_Mutex_Test"=.\Recursive_Mutex_Test.dsp - Package Owner=<4>
+Project: "Reverse_Lock_Test.dsp"=.\Reverse_Lock_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -687,7 +687,7 @@ Package=<4> ###############################################################################
-Project: "Reverse_Lock_Test"=.\Reverse_Lock_Test.dsp - Package Owner=<4>
+Project: "Semaphore_Test.dsp"=.\Semaphore_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -699,7 +699,7 @@ Package=<4> ###############################################################################
-Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>
+Project: "Service_Config_Test.dsp"=.\Service_Config_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -711,7 +711,7 @@ Package=<4> ###############################################################################
-Project: "SOCK_Send_Recv_Test"=.\SOCK_Send_Recv_Test.dsp - Package Owner=<4>
+Project: "Sigset_Ops_Test.dsp"=.\Sigset_Ops_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -723,7 +723,7 @@ Package=<4> ###############################################################################
-Project: "SOCK_Test"=.\SOCK_Test.dsp - Package Owner=<4>
+Project: "Simple_Message_Block_Test.dsp"=.\Simple_Message_Block_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -735,7 +735,7 @@ Package=<4> ###############################################################################
-Project: "SPIPE_Test"=.\SPIPE_Test.dsp - Package Owner=<4>
+Project: "SOCK_Connector_Test.dsp"=.\SOCK_Connector_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -747,7 +747,7 @@ Package=<4> ###############################################################################
-Project: "SString_Test"=.\SString_Test.dsp - Package Owner=<4>
+Project: "SOCK_Send_Recv_Test.dsp"=.\SOCK_Send_Recv_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -759,7 +759,7 @@ Package=<4> ###############################################################################
-Project: "SV_Shared_Memory_Test"=.\SV_Shared_Memory_Test.dsp - Package Owner=<4>
+Project: "SOCK_Test.dsp"=.\SOCK_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -771,7 +771,7 @@ Package=<4> ###############################################################################
-Project: "Semaphore_Test"=.\Semaphore_Test.dsp - Package Owner=<4>
+Project: "SPIPE_Test.dsp"=.\SPIPE_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -783,7 +783,7 @@ Package=<4> ###############################################################################
-Project: "Service_Config_Test"=.\Service_Config_Test.dsp - Package Owner=<4>
+Project: "SString_Test.dsp"=.\SString_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -795,7 +795,7 @@ Package=<4> ###############################################################################
-Project: "Sigset_Op_Test"=.\Sigset_Op_Test.dsp - Package Owner=<4>
+Project: "Svc_Handler_Test.dsp"=.\Svc_Handler_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -807,7 +807,7 @@ Package=<4> ###############################################################################
-Project: "Simple_Message_Block_Test"=.\Simple_Message_Block_Test.dsp - Package Owner=<4>
+Project: "SV_Shared_Memory_Test.dsp"=.\SV_Shared_Memory_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -819,7 +819,7 @@ Package=<4> ###############################################################################
-Project: "Svc_Handler_Test"=.\Svc_Handler_Test.dsp - Package Owner=<4>
+Project: "Task_Test.dsp"=.\Task_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -831,7 +831,7 @@ Package=<4> ###############################################################################
-Project: "TSS_Test"=.\TSS_Test.dsp - Package Owner=<4>
+Project: "Thread_Manager_Test.dsp"=.\Thread_Manager_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -843,7 +843,7 @@ Package=<4> ###############################################################################
-Project: "Task_Test"=.\Task_Test.dsp - Package Owner=<4>
+Project: "Thread_Mutex_Test.dsp"=.\Thread_Mutex_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -855,7 +855,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Manager_Test"=.\Thread_Manager_Test.dsp - Package Owner=<4>
+Project: "Thread_Pool_Reactor_Test.dsp"=.\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -867,7 +867,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Mutex_Test"=.\Thread_Mutex_Test.dsp - Package Owner=<4>
+Project: "Thread_Pool_Test.dsp"=.\Thread_Pool_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -879,7 +879,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Pool_Reactor_Test"=.\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>
+Project: "Timeprobe_Test.dsp"=.\Timeprobe_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -891,7 +891,7 @@ Package=<4> ###############################################################################
-Project: "Thread_Pool_Test"=.\Thread_Pool_Test.dsp - Package Owner=<4>
+Project: "Timer_Queue_Test.dsp"=.\Timer_Queue_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -903,7 +903,7 @@ Package=<4> ###############################################################################
-Project: "Time_Service_Test"=.\Time_Service_Test.dsp - Package Owner=<4>
+Project: "Time_Service_Test.dsp"=.\Time_Service_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -915,7 +915,7 @@ Package=<4> ###############################################################################
-Project: "Time_Value_Test"=.\Time_Value_Test.dsp - Package Owner=<4>
+Project: "Time_Value_Test.dsp"=.\Time_Value_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -927,7 +927,7 @@ Package=<4> ###############################################################################
-Project: "Timeprobe_Test"=.\Timeprobe_Test.dsp - Package Owner=<4>
+Project: "Tokens_Test.dsp"=.\Tokens_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -939,7 +939,7 @@ Package=<4> ###############################################################################
-Project: "Timer_Queue_Test"=.\Timer_Queue_Test.dsp - Package Owner=<4>
+Project: "TSS_Test.dsp"=.\TSS_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -951,7 +951,7 @@ Package=<4> ###############################################################################
-Project: "Tokens_Test"=.\Tokens_Test.dsp - Package Owner=<4>
+Project: "Upgradable_RW_Test.dsp"=.\Upgradable_RW_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -963,7 +963,7 @@ Package=<4> ###############################################################################
-Project: "UPIPE_SAP_Test"=.\UPIPE_SAP_Test.dsp - Package Owner=<4>
+Project: "UPIPE_SAP_Test.dsp"=.\UPIPE_SAP_Test.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -974,28 +974,3 @@ Package=<4> }}}
###############################################################################
-
-Project: "Upgradable_RW_Test"=.\Upgradable_RW_Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
|