diff options
author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-10 03:15:53 +0000 |
---|---|---|
committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-10 03:15:53 +0000 |
commit | 46e7c7589946f83a63f647fd8228c9429fd649b5 (patch) | |
tree | aa2a18a66e43104582ef7b27f7b1b0ce249e7ac5 | |
parent | 4564e5b9318e3127ac8e4f0411406f66f372f404 (diff) | |
download | ATCD-46e7c7589946f83a63f647fd8228c9429fd649b5.tar.gz |
ChangeLogTag:Tue May 9 20:02:41 2000 Darrell Brunsch <brunsch@uci.edu>
89 files changed, 1044 insertions, 833 deletions
diff --git a/ChangeLog b/ChangeLog index a9a130e62a6..8fdfc1f569f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,131 @@ +Tue May 9 20:02:41 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Asynch_Acceptor.cpp: + + Was still including "Asynch_Acceptor.i" which has been removed. + + * apps/JAWS2/JAWS/Cache_Manager_T.cpp: + + Removed iostream.h include here. This is not good since ACE + already includes it, and ACE might already include <iostream>, + which is incompatible with <iostream.h>. + + * examples/Reactor/WFMO_Reactor/test_talker.cpp: + + Looks like the constructor to Proactor was changed, but this + test didn't get changed also. Removed one of the arguments + being passed to it. + + * websvcs/lib/websvcs_export.h: + + Regenerated it. It seems like I changed the websvcs library + based on what I thought was in this file. This didn't work, + since I was assuming that ACE_WEBSVCS_HAS_DLL was automatically + defined (and older versions of these export files did not do + that). + + * bin/msvc_auto_compile.pl: + + Added a -u option that tells the script to pass the /USEENV + flag to msdev when it runs. + + Added a -ACE option that tells the script just to compile the + ACE directories. + + Changed -core to -CORE to be consistent with -ACE (and the + upcoming -TAO). + + * apps/Gateway/Gateway/Gateway.dsp: + * apps/Gateway/Gateway/gatewayd.dsp: + * apps/Gateway/Peer/Peer.dsp: + * apps/Gateway/Peer/peerd.dsp: + * apps/JAWS/clients/Caching/Caching.dsp: + * apps/JAWS/server/HTTP_Helpers.cpp: + * apps/JAWS/server/jaws.dsp: + * apps/JAWS2/server.dsp: + * apps/JAWS2/HTTPU/HTTPU.DSP: + * apps/JAWS2/HTTPU/HTTPU.DSW: + * apps/JAWS2/JAWS/jaws.dsp: + * examples/ASX/Event_Server/Event_Server/Event_Server.dsp: + * examples/ASX/Event_Server/Transceiver/transceiver.dsp: + * examples/ASX/Message_Queue/Bounded_Buffer.dsp: + * examples/ASX/Message_Queue/Buffer_Stream.dsp: + * examples/ASX/Message_Queue/Priority_Buffer.dsp: + * examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp: + * examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp: + * examples/Configuration/Test.dsp: + * examples/Connection/blocking/SPIPE.dsp: + * examples/Connection/blocking/acceptor.dsp: + * examples/Connection/non_blocking/non_blocking.dsp: + * examples/Connection/non_blocking/server.dsp: + * examples/IPC_SAP/ATM_SAP/CPP_client.dsp: + * examples/IPC_SAP/ATM_SAP/CPP_server.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp: + * examples/IPC_SAP/SOCK_SAP/C_inserver.dsp: + * examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp: + * examples/Log_Msg/Callback.dsp: + * examples/Log_Msg/Log_Msg.dsp: + * examples/Log_Msg/Ostream.dsp: + * examples/Logger/Acceptor-server/server_loggerd.dsp: + * examples/Mem_Map/file-reverse/file_reverse.dsp: + * examples/Naming/Naming.dsp: + * examples/Naming/multiple_contexts.dsp: + * examples/Naming/non_existent.dsp: + * examples/OS/Process/Process.dsp: + * examples/OS/Process/imore.dsp: + * examples/QOS/client.dsp: + * examples/QOS/server.dsp: + * examples/Reactor/Dgram/CODgram.dsp: + * examples/Reactor/Dgram/Dgram.dsp: + * examples/Reactor/Misc/Misc.dsp: + * examples/Reactor/Misc/demuxing.dsp: + * examples/Reactor/Misc/early_timeouts.dsp: + * examples/Reactor/Misc/notification.dsp: + * examples/Reactor/Misc/reactors.dsp: + * examples/Reactor/Misc/signals_1.dsp: + * examples/Reactor/Misc/signals_2.dsp: + * examples/Reactor/Ntalker/ntalker.dsp: + * examples/Reactor/Proactor/post_completions.dsp: + * examples/Reactor/Proactor/test_cancel.dsp: + * examples/Reactor/Proactor/test_end_event_loop.dsp: + * examples/Reactor/Proactor/test_multiple_loops.dsp: + * examples/Reactor/Proactor/test_proactor.dsp: + * examples/Reactor/Proactor/test_timeout.dsp: + * examples/Reactor/WFMO_Reactor/Handle_Close.dsp: + * examples/Registry/Registry.dsp: + * examples/Registry/update.dsp: + * examples/Service_Configurator/Misc/Timer.dsp: + * examples/Service_Configurator/Misc/main.dsp: + * examples/Shared_Malloc/malloc.dsp: + * examples/Shared_Malloc/multiple_mallocs.dsp: + * examples/Shared_Malloc/persistence.dsp: + * examples/Shared_Malloc/position_independent_malloc.dsp: + * examples/Shared_Malloc/test_malloc.cpp: + * examples/Web_Crawler/Web_Crawler.dsp: + * performance-tests/Misc/basic_perf.dsp: + * performance-tests/Misc/childbirth_time.dsp: + * performance-tests/Misc/context_switch_time.dsp: + * performance-tests/Misc/test_mutex.dsp: + * performance-tests/Misc/test_naming.dsp: + * performance-tests/Misc/test_singleton.dsp: + * performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp: + * performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp: + * performance-tests/TCP/TCP.dsp: + + While testing the -ACE flag in msvc_auto_compile, I found that + there were many dsps that were either creating precompiled + headers, didn't have the correct include paths, or even weren't + in the CRLF format. Fixed them up. + + * apps/JAWS/clients/Caching/testing.dsp: + * performance-tests/Synch-Benchmarks/Synch_Tests.dsp: + + These project files didn't look like they are used anymore, + so I removed them. + Tue May 9 17:38:47 2000 Carlos O'Ryan <coryan@uci.edu> * bin/auto_compile_win32.pl: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index a9a130e62a6..8fdfc1f569f 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,131 @@ +Tue May 9 20:02:41 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Asynch_Acceptor.cpp: + + Was still including "Asynch_Acceptor.i" which has been removed. + + * apps/JAWS2/JAWS/Cache_Manager_T.cpp: + + Removed iostream.h include here. This is not good since ACE + already includes it, and ACE might already include <iostream>, + which is incompatible with <iostream.h>. + + * examples/Reactor/WFMO_Reactor/test_talker.cpp: + + Looks like the constructor to Proactor was changed, but this + test didn't get changed also. Removed one of the arguments + being passed to it. + + * websvcs/lib/websvcs_export.h: + + Regenerated it. It seems like I changed the websvcs library + based on what I thought was in this file. This didn't work, + since I was assuming that ACE_WEBSVCS_HAS_DLL was automatically + defined (and older versions of these export files did not do + that). + + * bin/msvc_auto_compile.pl: + + Added a -u option that tells the script to pass the /USEENV + flag to msdev when it runs. + + Added a -ACE option that tells the script just to compile the + ACE directories. + + Changed -core to -CORE to be consistent with -ACE (and the + upcoming -TAO). + + * apps/Gateway/Gateway/Gateway.dsp: + * apps/Gateway/Gateway/gatewayd.dsp: + * apps/Gateway/Peer/Peer.dsp: + * apps/Gateway/Peer/peerd.dsp: + * apps/JAWS/clients/Caching/Caching.dsp: + * apps/JAWS/server/HTTP_Helpers.cpp: + * apps/JAWS/server/jaws.dsp: + * apps/JAWS2/server.dsp: + * apps/JAWS2/HTTPU/HTTPU.DSP: + * apps/JAWS2/HTTPU/HTTPU.DSW: + * apps/JAWS2/JAWS/jaws.dsp: + * examples/ASX/Event_Server/Event_Server/Event_Server.dsp: + * examples/ASX/Event_Server/Transceiver/transceiver.dsp: + * examples/ASX/Message_Queue/Bounded_Buffer.dsp: + * examples/ASX/Message_Queue/Buffer_Stream.dsp: + * examples/ASX/Message_Queue/Priority_Buffer.dsp: + * examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp: + * examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp: + * examples/Configuration/Test.dsp: + * examples/Connection/blocking/SPIPE.dsp: + * examples/Connection/blocking/acceptor.dsp: + * examples/Connection/non_blocking/non_blocking.dsp: + * examples/Connection/non_blocking/server.dsp: + * examples/IPC_SAP/ATM_SAP/CPP_client.dsp: + * examples/IPC_SAP/ATM_SAP/CPP_server.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp: + * examples/IPC_SAP/SOCK_SAP/C_inserver.dsp: + * examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp: + * examples/Log_Msg/Callback.dsp: + * examples/Log_Msg/Log_Msg.dsp: + * examples/Log_Msg/Ostream.dsp: + * examples/Logger/Acceptor-server/server_loggerd.dsp: + * examples/Mem_Map/file-reverse/file_reverse.dsp: + * examples/Naming/Naming.dsp: + * examples/Naming/multiple_contexts.dsp: + * examples/Naming/non_existent.dsp: + * examples/OS/Process/Process.dsp: + * examples/OS/Process/imore.dsp: + * examples/QOS/client.dsp: + * examples/QOS/server.dsp: + * examples/Reactor/Dgram/CODgram.dsp: + * examples/Reactor/Dgram/Dgram.dsp: + * examples/Reactor/Misc/Misc.dsp: + * examples/Reactor/Misc/demuxing.dsp: + * examples/Reactor/Misc/early_timeouts.dsp: + * examples/Reactor/Misc/notification.dsp: + * examples/Reactor/Misc/reactors.dsp: + * examples/Reactor/Misc/signals_1.dsp: + * examples/Reactor/Misc/signals_2.dsp: + * examples/Reactor/Ntalker/ntalker.dsp: + * examples/Reactor/Proactor/post_completions.dsp: + * examples/Reactor/Proactor/test_cancel.dsp: + * examples/Reactor/Proactor/test_end_event_loop.dsp: + * examples/Reactor/Proactor/test_multiple_loops.dsp: + * examples/Reactor/Proactor/test_proactor.dsp: + * examples/Reactor/Proactor/test_timeout.dsp: + * examples/Reactor/WFMO_Reactor/Handle_Close.dsp: + * examples/Registry/Registry.dsp: + * examples/Registry/update.dsp: + * examples/Service_Configurator/Misc/Timer.dsp: + * examples/Service_Configurator/Misc/main.dsp: + * examples/Shared_Malloc/malloc.dsp: + * examples/Shared_Malloc/multiple_mallocs.dsp: + * examples/Shared_Malloc/persistence.dsp: + * examples/Shared_Malloc/position_independent_malloc.dsp: + * examples/Shared_Malloc/test_malloc.cpp: + * examples/Web_Crawler/Web_Crawler.dsp: + * performance-tests/Misc/basic_perf.dsp: + * performance-tests/Misc/childbirth_time.dsp: + * performance-tests/Misc/context_switch_time.dsp: + * performance-tests/Misc/test_mutex.dsp: + * performance-tests/Misc/test_naming.dsp: + * performance-tests/Misc/test_singleton.dsp: + * performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp: + * performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp: + * performance-tests/TCP/TCP.dsp: + + While testing the -ACE flag in msvc_auto_compile, I found that + there were many dsps that were either creating precompiled + headers, didn't have the correct include paths, or even weren't + in the CRLF format. Fixed them up. + + * apps/JAWS/clients/Caching/testing.dsp: + * performance-tests/Synch-Benchmarks/Synch_Tests.dsp: + + These project files didn't look like they are used anymore, + so I removed them. + Tue May 9 17:38:47 2000 Carlos O'Ryan <coryan@uci.edu> * bin/auto_compile_win32.pl: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index a9a130e62a6..8fdfc1f569f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,131 @@ +Tue May 9 20:02:41 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/Asynch_Acceptor.cpp: + + Was still including "Asynch_Acceptor.i" which has been removed. + + * apps/JAWS2/JAWS/Cache_Manager_T.cpp: + + Removed iostream.h include here. This is not good since ACE + already includes it, and ACE might already include <iostream>, + which is incompatible with <iostream.h>. + + * examples/Reactor/WFMO_Reactor/test_talker.cpp: + + Looks like the constructor to Proactor was changed, but this + test didn't get changed also. Removed one of the arguments + being passed to it. + + * websvcs/lib/websvcs_export.h: + + Regenerated it. It seems like I changed the websvcs library + based on what I thought was in this file. This didn't work, + since I was assuming that ACE_WEBSVCS_HAS_DLL was automatically + defined (and older versions of these export files did not do + that). + + * bin/msvc_auto_compile.pl: + + Added a -u option that tells the script to pass the /USEENV + flag to msdev when it runs. + + Added a -ACE option that tells the script just to compile the + ACE directories. + + Changed -core to -CORE to be consistent with -ACE (and the + upcoming -TAO). + + * apps/Gateway/Gateway/Gateway.dsp: + * apps/Gateway/Gateway/gatewayd.dsp: + * apps/Gateway/Peer/Peer.dsp: + * apps/Gateway/Peer/peerd.dsp: + * apps/JAWS/clients/Caching/Caching.dsp: + * apps/JAWS/server/HTTP_Helpers.cpp: + * apps/JAWS/server/jaws.dsp: + * apps/JAWS2/server.dsp: + * apps/JAWS2/HTTPU/HTTPU.DSP: + * apps/JAWS2/HTTPU/HTTPU.DSW: + * apps/JAWS2/JAWS/jaws.dsp: + * examples/ASX/Event_Server/Event_Server/Event_Server.dsp: + * examples/ASX/Event_Server/Transceiver/transceiver.dsp: + * examples/ASX/Message_Queue/Bounded_Buffer.dsp: + * examples/ASX/Message_Queue/Buffer_Stream.dsp: + * examples/ASX/Message_Queue/Priority_Buffer.dsp: + * examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp: + * examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp: + * examples/Configuration/Test.dsp: + * examples/Connection/blocking/SPIPE.dsp: + * examples/Connection/blocking/acceptor.dsp: + * examples/Connection/non_blocking/non_blocking.dsp: + * examples/Connection/non_blocking/server.dsp: + * examples/IPC_SAP/ATM_SAP/CPP_client.dsp: + * examples/IPC_SAP/ATM_SAP/CPP_server.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp: + * examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp: + * examples/IPC_SAP/SOCK_SAP/C_inserver.dsp: + * examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp: + * examples/Log_Msg/Callback.dsp: + * examples/Log_Msg/Log_Msg.dsp: + * examples/Log_Msg/Ostream.dsp: + * examples/Logger/Acceptor-server/server_loggerd.dsp: + * examples/Mem_Map/file-reverse/file_reverse.dsp: + * examples/Naming/Naming.dsp: + * examples/Naming/multiple_contexts.dsp: + * examples/Naming/non_existent.dsp: + * examples/OS/Process/Process.dsp: + * examples/OS/Process/imore.dsp: + * examples/QOS/client.dsp: + * examples/QOS/server.dsp: + * examples/Reactor/Dgram/CODgram.dsp: + * examples/Reactor/Dgram/Dgram.dsp: + * examples/Reactor/Misc/Misc.dsp: + * examples/Reactor/Misc/demuxing.dsp: + * examples/Reactor/Misc/early_timeouts.dsp: + * examples/Reactor/Misc/notification.dsp: + * examples/Reactor/Misc/reactors.dsp: + * examples/Reactor/Misc/signals_1.dsp: + * examples/Reactor/Misc/signals_2.dsp: + * examples/Reactor/Ntalker/ntalker.dsp: + * examples/Reactor/Proactor/post_completions.dsp: + * examples/Reactor/Proactor/test_cancel.dsp: + * examples/Reactor/Proactor/test_end_event_loop.dsp: + * examples/Reactor/Proactor/test_multiple_loops.dsp: + * examples/Reactor/Proactor/test_proactor.dsp: + * examples/Reactor/Proactor/test_timeout.dsp: + * examples/Reactor/WFMO_Reactor/Handle_Close.dsp: + * examples/Registry/Registry.dsp: + * examples/Registry/update.dsp: + * examples/Service_Configurator/Misc/Timer.dsp: + * examples/Service_Configurator/Misc/main.dsp: + * examples/Shared_Malloc/malloc.dsp: + * examples/Shared_Malloc/multiple_mallocs.dsp: + * examples/Shared_Malloc/persistence.dsp: + * examples/Shared_Malloc/position_independent_malloc.dsp: + * examples/Shared_Malloc/test_malloc.cpp: + * examples/Web_Crawler/Web_Crawler.dsp: + * performance-tests/Misc/basic_perf.dsp: + * performance-tests/Misc/childbirth_time.dsp: + * performance-tests/Misc/context_switch_time.dsp: + * performance-tests/Misc/test_mutex.dsp: + * performance-tests/Misc/test_naming.dsp: + * performance-tests/Misc/test_singleton.dsp: + * performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp: + * performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp: + * performance-tests/TCP/TCP.dsp: + + While testing the -ACE flag in msvc_auto_compile, I found that + there were many dsps that were either creating precompiled + headers, didn't have the correct include paths, or even weren't + in the CRLF format. Fixed them up. + + * apps/JAWS/clients/Caching/testing.dsp: + * performance-tests/Synch-Benchmarks/Synch_Tests.dsp: + + These project files didn't look like they are used anymore, + so I removed them. + Tue May 9 17:38:47 2000 Carlos O'Ryan <coryan@uci.edu> * bin/auto_compile_win32.pl: diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp index 28ef8f6188f..686ccff660d 100644 --- a/ace/Asynch_Acceptor.cpp +++ b/ace/Asynch_Acceptor.cpp @@ -17,10 +17,6 @@ ACE_RCSID(ace, Asynch_Acceptor, "$Id$") #include "ace/Message_Block.h" #include "ace/INET_Addr.h" -#if !defined (__ACE_INLINE__) -#include "ace/Asynch_Acceptor.i" -#endif /* __ACE_INLINE__ */ - template <class HANDLER> ACE_Asynch_Acceptor<HANDLER>::ACE_Asynch_Acceptor (void) : listen_handle_ (ACE_INVALID_HANDLE), diff --git a/apps/Gateway/Gateway/Gateway.dsp b/apps/Gateway/Gateway/Gateway.dsp index 4a6ecc2686a..28f982104b7 100644 --- a/apps/Gateway/Gateway/Gateway.dsp +++ b/apps/Gateway/Gateway/Gateway.dsp @@ -21,6 +21,7 @@ CFG=Gateway - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,9 +39,10 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/apps/Gateway/Gateway/gatewayd.dsp b/apps/Gateway/Gateway/gatewayd.dsp index 96dc43e3e54..308a4410e65 100644 --- a/apps/Gateway/Gateway/gatewayd.dsp +++ b/apps/Gateway/Gateway/gatewayd.dsp @@ -21,6 +21,7 @@ CFG=gatewayd - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/apps/Gateway/Peer/Peer.dsp b/apps/Gateway/Peer/Peer.dsp index f9af12c02f4..057a8414568 100644 --- a/apps/Gateway/Peer/Peer.dsp +++ b/apps/Gateway/Peer/Peer.dsp @@ -21,6 +21,7 @@ CFG=Peer - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,9 +39,10 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\Gateway" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\Gateway" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/apps/Gateway/Peer/peerd.dsp b/apps/Gateway/Peer/peerd.dsp index 17ff6afccb0..ceb9529fbf8 100644 --- a/apps/Gateway/Peer/peerd.dsp +++ b/apps/Gateway/Peer/peerd.dsp @@ -21,6 +21,7 @@ CFG=peerd - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/apps/JAWS/clients/Caching/Caching.dsp b/apps/JAWS/clients/Caching/Caching.dsp index 3bbc59cca79..260f6f46202 100644 --- a/apps/JAWS/clients/Caching/Caching.dsp +++ b/apps/JAWS/clients/Caching/Caching.dsp @@ -17,13 +17,12 @@ CFG=http_client - Win32 Release !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "http_client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "http_client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "http_client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "http_client - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\http_client"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -51,7 +51,7 @@ 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"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../ace"
!ELSEIF "$(CFG)" == "http_client - Win32 Debug"
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\http_client"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -75,7 +76,7 @@ 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"
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"../../../../ace"
!ENDIF
diff --git a/apps/JAWS/clients/Caching/testing.dsp b/apps/JAWS/clients/Caching/testing.dsp deleted file mode 100644 index f50189194cd..00000000000 --- a/apps/JAWS/clients/Caching/testing.dsp +++ /dev/null @@ -1,121 +0,0 @@ -# Microsoft Developer Studio Project File - Name="testing" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=testing - Win32 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 "testing.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 "testing.mak" CFG="testing - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "testing - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\testing\Debug"
-# PROP BASE Intermediate_Dir ".\testing\Debug"
-# PROP BASE Target_Dir ".\testing"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
-# PROP Target_Dir ".\testing"
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 aced.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:windows /dll /debug /machine:I386
-# Begin Target
-
-# Name "testing - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\ID_Generator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Local_Locator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\URL_Locator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\URL_Properties.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=.\ID_Generator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Local_Locator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\URL_Array_Helper.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\URL_Locator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\URL_Properties.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
-# Begin Source File
-
-SOURCE=.\Local_Locator.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\URL_Array_Helper.cpp
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\URL_Locator.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\URL_Properties.i
-# End Source File
-# End Target
-# End Project
diff --git a/apps/JAWS/server/HTTP_Helpers.cpp b/apps/JAWS/server/HTTP_Helpers.cpp index 5849893f06b..d505b3b7d71 100644 --- a/apps/JAWS/server/HTTP_Helpers.cpp +++ b/apps/JAWS/server/HTTP_Helpers.cpp @@ -83,7 +83,8 @@ HTTP_Helper::HTTP_mktime (const char *httpdate) month, &tms.tm_mday, &tms.tm_hour, &tms.tm_min, &tms.tm_sec, &tms.tm_year) == 7) - ; + { + } delete buf; diff --git a/apps/JAWS/server/jaws.dsp b/apps/JAWS/server/jaws.dsp index 1c2d3317665..e35ddeb148e 100644 --- a/apps/JAWS/server/jaws.dsp +++ b/apps/JAWS/server/jaws.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "ACE_NLOGGING" /D ACE_HAS_SVC_DLL=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "ACE_NLOGGING" /D ACE_HAS_SVC_DLL=1 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_SVC_DLL=1 /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_SVC_DLL=1 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/apps/JAWS2/HTTPU/HTTPU.DSP b/apps/JAWS2/HTTPU/HTTPU.DSP index 77a2501a997..8c7c9c20f79 100644 --- a/apps/JAWS2/HTTPU/HTTPU.DSP +++ b/apps/JAWS2/HTTPU/HTTPU.DSP @@ -1,169 +1,171 @@ -# Microsoft Developer Studio Project File - Name="HTTPU" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=HTTPU - Win32 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 "HTTPU.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 "HTTPU.MAK" CFG="HTTPU - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "HTTPU - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "HTTPU - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "HTTPU - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D HTTPU_HAS_DLL=1 /D "HTTPU_BUILD_DLL" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# 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:windows /dll /machine:I386 -# ADD LINK32 ace.lib jaws.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\bin\HTTPU.dll" /libpath:"..\..\..\..\ace" /libpath:"..\JAWS" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "HTTPU - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D HTTPU_HAS_DLL=1 /D "HTTPU_BUILD_DLL" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 aced.lib jawsd.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\bin\HTTPUd.dll" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\JAWS" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "HTTPU - Win32 Release" -# Name "HTTPU - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\http_base.cpp -# End Source File -# Begin Source File - -SOURCE=.\http_headers.cpp -# End Source File -# Begin Source File - -SOURCE=.\http_request.cpp -# End Source File -# Begin Source File - -SOURCE=.\http_response.cpp -# End Source File -# Begin Source File - -SOURCE=.\http_status.cpp -# End Source File -# Begin Source File - -SOURCE=.\parse_http_request.cpp -# End Source File -# Begin Source File - -SOURCE=.\parse_http_response.cpp -# End Source File -# Begin Source File - -SOURCE=.\parse_url.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\http_base.h -# End Source File -# Begin Source File - -SOURCE=.\http_export.h -# End Source File -# Begin Source File - -SOURCE=.\http_headers.h -# End Source File -# Begin Source File - -SOURCE=.\http_request.h -# End Source File -# Begin Source File - -SOURCE=.\http_response.h -# End Source File -# Begin Source File - -SOURCE=.\http_status.h -# End Source File -# Begin Source File - -SOURCE=.\parse_http_request.h -# End Source File -# Begin Source File - -SOURCE=.\parse_http_response.h -# End Source File -# Begin Source File - -SOURCE=.\parse_url.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="HTTPU Library" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=HTTPU Library - Win32 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 "HTTPU.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 "HTTPU.MAK" CFG="HTTPU Library - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "HTTPU Library - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "HTTPU Library - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "HTTPU Library - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D HTTPU_HAS_DLL=1 /D "HTTPU_BUILD_DLL" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# 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:windows /dll /machine:I386
+# ADD LINK32 ace.lib jaws.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\bin\HTTPU.dll" /libpath:"../../../ace" /libpath:"../JAWS"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF "$(CFG)" == "HTTPU Library - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D HTTPU_HAS_DLL=1 /D "HTTPU_BUILD_DLL" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib jawsd.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\bin\HTTPUd.dll" /pdbtype:sept /libpath:"../../../ace" /libpath:"../JAWS"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "HTTPU Library - Win32 Release"
+# Name "HTTPU Library - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\http_base.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_headers.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_request.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_response.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_status.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\parse_http_request.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\parse_http_response.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\parse_url.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\http_base.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_export.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_headers.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_request.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_response.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_status.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\parse_http_request.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\parse_http_response.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\parse_url.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/apps/JAWS2/HTTPU/HTTPU.DSW b/apps/JAWS2/HTTPU/HTTPU.DSW index 87695cdb010..ab7d8c3781a 100644 --- a/apps/JAWS2/HTTPU/HTTPU.DSW +++ b/apps/JAWS2/HTTPU/HTTPU.DSW @@ -1,29 +1,29 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "HTTPU"=.\HTTPU.DSP - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "HTTPU"=.\HTTPU.DSP - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/apps/JAWS2/JAWS/Cache_Manager_T.cpp index d2264c7cefd..be5acab51f9 100644 --- a/apps/JAWS2/JAWS/Cache_Manager_T.cpp +++ b/apps/JAWS2/JAWS/Cache_Manager_T.cpp @@ -8,8 +8,6 @@ class Cache_Manager; -#include <iostream.h> - template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> ::JAWS_Cache_Manager (ACE_Allocator *alloc, diff --git a/apps/JAWS2/JAWS/jaws.dsp b/apps/JAWS2/JAWS/jaws.dsp index dfaa8ce7dba..5f878faa04f 100644 --- a/apps/JAWS2/JAWS/jaws.dsp +++ b/apps/JAWS2/JAWS/jaws.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="JAWS" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="JAWS Library" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=JAWS - Win32 Debug
+CFG=JAWS Library - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,22 +13,23 @@ CFG=JAWS - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "JAWS.MAK" CFG="JAWS - Win32 Debug"
+!MESSAGE NMAKE /f "JAWS.MAK" CFG="JAWS Library - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "JAWS - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "JAWS - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "JAWS Library - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "JAWS Library - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "JAWS - Win32 Release"
+!IF "$(CFG)" == "JAWS Library - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -42,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D JAWS_HAS_DLL=1 /D "JAWS_BUILD_DLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D JAWS_HAS_DLL=1 /D "JAWS_BUILD_DLL" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,10 +54,10 @@ 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:windows /dll /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\bin\JAWS.dll" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\bin\JAWS.dll" /libpath:"../../../ace"
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "JAWS - Win32 Debug"
+!ELSEIF "$(CFG)" == "JAWS Library - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -69,7 +71,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D JAWS_HAS_DLL=1 /D "JAWS_BUILD_DLL" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D JAWS_HAS_DLL=1 /D "JAWS_BUILD_DLL" /FD /c
+# SUBTRACT CPP /X /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,15 +82,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:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\bin\JAWSd.dll" /pdbtype:sept /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\bin\JAWSd.dll" /pdbtype:sept /libpath:"../../../ace"
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
-# Name "JAWS - Win32 Release"
-# Name "JAWS - Win32 Debug"
+# Name "JAWS Library - Win32 Release"
+# Name "JAWS Library - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter ""
@@ -214,10 +217,7 @@ SOURCE=.\Waiter.h # Begin Source File
SOURCE=.\Assoc_Array.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Pipeline_Handler.cpp
+# PROP Exclude_From_Build 1
# End Source File
# End Group
# End Target
diff --git a/apps/JAWS2/server.dsp b/apps/JAWS2/server.dsp index bd12a0205a0..9c3495e3d55 100644 --- a/apps/JAWS2/server.dsp +++ b/apps/JAWS2/server.dsp @@ -22,6 +22,7 @@ CFG=server - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -41,7 +42,7 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D HTTPU_HAS_DLL=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D HTTPU_HAS_DLL=1 /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +50,7 @@ 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 JAWS.lib HTTPU.lib /nologo /subsystem:console /machine:I386 /libpath:"JAWS" /libpath:"HTTPU" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib JAWS.lib HTTPU.lib /nologo /subsystem:console /machine:I386 /libpath:"JAWS" /libpath:"HTTPU" /libpath:"../../ace"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "server - Win32 Debug"
@@ -66,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D HTTPU_HAS_DLL=1 /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D HTTPU_HAS_DLL=1 /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +75,7 @@ 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 /pdbtype:sept
-# ADD LINK32 aced.lib JAWSd.lib HTTPUd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"JAWS" /libpath:"HTTPU" /libpath:"..\..\..\ace"
+# ADD LINK32 aced.lib JAWSd.lib HTTPUd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"JAWS" /libpath:"HTTPU" /libpath:"../../ace"
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -106,13 +107,6 @@ SOURCE=.\HTTP_10_Write.cpp # Begin Source File
SOURCE=.\main.cpp
-
-!IF "$(CFG)" == "server - Win32 Release"
-
-!ELSEIF "$(CFG)" == "server - Win32 Debug"
-
-!ENDIF
-
# End Source File
# End Target
# End Project
diff --git a/bin/msvc_auto_compile.pl b/bin/msvc_auto_compile.pl index 04488f09cfa..486ea7c7a4b 100755 --- a/bin/msvc_auto_compile.pl +++ b/bin/msvc_auto_compile.pl @@ -12,7 +12,18 @@ else { $ACE_ROOT = $ENV{ACE_ROOT}; } -@directories = ($ACE_ROOT); +@directories = (); + +# Make sure to list these in opposite order (first to be compiled +# should be last). +@ace_dirs = ("$ACE_ROOT/ace", + "$ACE_ROOT/apps", + "$ACE_ROOT/ASNMP", + "$ACE_ROOT/examples", + "$ACE_ROOT/netsvcs", + "$ACE_ROOT/performance-tests", + "$ACE_ROOT/tests", + "$ACE_ROOT/websvcs"); $verbose = 0; $print_status = 0; @@ -25,6 +36,7 @@ $Build_All = 1; $build_core_only = 0; $Build_Cmd = "/BUILD"; $use_custom_dir = 0; +$useenv = ''; # Find_dsp will search a directory for *.dsp files and return a list # of strings that include the project name and the configuration @@ -97,7 +109,7 @@ sub Build ($$) print "Building $project $config\n" if $verbose; - return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd"); + return system ("msdev.com $project /MAKE \"$config\" $Build_Cmd $useenv"); } # Only builds the core libraries. @@ -216,17 +228,23 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) elsif ($ARGV[0] =~ '-s') { # status messages $print_status = 1; } - elsif ($ARGV[0] =~ '-core') { # Build only the core of ace/tao - print "Building Core only\n" if ( $verbose ); + elsif ($ARGV[0] =~ '-u') { # USEENV + print "Using Environment\n" if ($verbose); + $useenv = '/USEENV'; + } + elsif ($ARGV[0] =~ '-CORE') { # Build the core of ace/tao + print "Building only Core\n" if ( $verbose ); $build_core_only = 1; } + elsif ($ARGV[0] =~ '-ACE') { # Build ACE and its programs + print "Building ACE\n" if ( $verbose ); + $use_custom_dir = 1; + push @directories, @ace_dirs; + } elsif ($ARGV[0] =~ '-dir') { # Compile only a specific directory shift; print "Adding directory $ARGV[0]\n" if ( $verbose ); - if (!$use_custom_dir) { - $use_custom_dir = 1; - @directories = (); - } + $use_custom_dir = 1; push @directories, $ARGV[0]; } elsif ($ARGV[0] =~ '-rebuild') { # Rebuild all @@ -262,8 +280,12 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) print "-k = Ignore Errors\n"; print "-v = Script verbose Mode\n"; print "-s = Print status messages to STDERR\n"; - print "-core = Build the Core\n"; + print "-u = Tell MSVC to use the environment\n"; + print "\n"; + print "-CORE = Build the Core libraries\n"; + print "-ACE = Build ACE and its programs\n"; print "-dir <dir> = Compile custom directories\n"; + print "\n"; print "-rebuild = Rebuild All\n"; print "-clean = Clean\n"; print "-Debug = Compile Debug versions\n"; @@ -289,11 +311,15 @@ if (!$Build_Debug && !$Build_Release) { $Build_Release = 1; } +if ($#directories < 0) { + @directories = ($ACE_ROOT); +} + print "msvc_auto_compile: Begin\n"; print STDERR "Beginning Core Build\n" if ($print_status == 1); Build_Core if (!$use_custom_dir || $build_core_only); print STDERR "Beginning Full Build\n" if ($print_status == 1); -Build_All if (!$build_core_only); +Build_All if !$build_core_only; print "msvc_auto_compile: End\n"; print STDERR "End\n" if ($print_status == 1); diff --git a/examples/ASX/Event_Server/Event_Server/Event_Server.dsp b/examples/ASX/Event_Server/Event_Server/Event_Server.dsp index 8ed877bea57..fd212577779 100644 --- a/examples/ASX/Event_Server/Event_Server/Event_Server.dsp +++ b/examples/ASX/Event_Server/Event_Server/Event_Server.dsp @@ -17,11 +17,11 @@ CFG=Event_Server - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Event_Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Event_Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.dsp b/examples/ASX/Event_Server/Transceiver/transceiver.dsp index e2a6c62b285..19244c44bed 100644 --- a/examples/ASX/Event_Server/Transceiver/transceiver.dsp +++ b/examples/ASX/Event_Server/Transceiver/transceiver.dsp @@ -17,11 +17,11 @@ CFG=Transceiver - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Transceiver - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Transceiver - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/ASX/Message_Queue/Bounded_Buffer.dsp b/examples/ASX/Message_Queue/Bounded_Buffer.dsp index f85eee1c1f9..f9300ed69a1 100644 --- a/examples/ASX/Message_Queue/Bounded_Buffer.dsp +++ b/examples/ASX/Message_Queue/Bounded_Buffer.dsp @@ -17,13 +17,12 @@ CFG=Bounded_Buffer - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Bounded_Buffer - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Bounded_Buffer - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Bounded_Buffer - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Bounded_Buffer - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/ASX/Message_Queue/Buffer_Stream.dsp b/examples/ASX/Message_Queue/Buffer_Stream.dsp index 17edbaa5985..ed9e0c5dc2a 100644 --- a/examples/ASX/Message_Queue/Buffer_Stream.dsp +++ b/examples/ASX/Message_Queue/Buffer_Stream.dsp @@ -17,13 +17,12 @@ CFG=Buffer_Stream - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Buffer_Stream - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Buffer_Stream - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Buffer_Stream - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/ASX/Message_Queue/Priority_Buffer.dsp b/examples/ASX/Message_Queue/Priority_Buffer.dsp index 8061527e3dc..1605fbd17b9 100644 --- a/examples/ASX/Message_Queue/Priority_Buffer.dsp +++ b/examples/ASX/Message_Queue/Priority_Buffer.dsp @@ -17,13 +17,12 @@ CFG=Priority_Buffer - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Priority_Buffer - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Priority_Buffer - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Priority_Buffer - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp b/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp index 71699168c5c..fdb66fab3a0 100644 --- a/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp +++ b/examples/ASX/UPIPE_Event_Server/UPIPE_Event_Server.dsp @@ -13,16 +13,15 @@ CFG=UPIPE_Event_Server - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "UPIPE_Event_Server.mak"\
- CFG="UPIPE_Event_Server - Win32 Debug"
+!MESSAGE NMAKE /f "UPIPE_Event_Server.mak" CFG="UPIPE_Event_Server - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "UPIPE_Event_Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "UPIPE_Event_Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -39,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp b/examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp index 176e9ce9ac3..8b686e307eb 100644 --- a/examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp +++ b/examples/Bounded_Packet_Relay/Bounded_Packet_Relay.dsp @@ -39,9 +39,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +51,7 @@ 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"
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../ace"
!ELSEIF "$(CFG)" == "Bounded_Packet_Relay - Win32 Debug"
@@ -65,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -74,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo /o"./bpr_thread.bsc"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib 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 /out:"./bpr_thread.exe" /pdbtype:sept /libpath:"../../../ace"
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./bpr_thread.exe" /pdbtype:sept /libpath:"../../ace"
!ENDIF
diff --git a/examples/Configuration/Test.dsp b/examples/Configuration/Test.dsp index fb68639517f..ce6f2b42537 100644 --- a/examples/Configuration/Test.dsp +++ b/examples/Configuration/Test.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Connection/blocking/SPIPE.dsp b/examples/Connection/blocking/SPIPE.dsp index 8f1c17d817f..3f1322df23f 100644 --- a/examples/Connection/blocking/SPIPE.dsp +++ b/examples/Connection/blocking/SPIPE.dsp @@ -21,6 +21,7 @@ CFG=connector - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\connector"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Connection/blocking/acceptor.dsp b/examples/Connection/blocking/acceptor.dsp index 27e354e1c67..21a3e219bbe 100644 --- a/examples/Connection/blocking/acceptor.dsp +++ b/examples/Connection/blocking/acceptor.dsp @@ -21,6 +21,7 @@ CFG=acceptor - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\acceptor"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Connection/non_blocking/non_blocking.dsp b/examples/Connection/non_blocking/non_blocking.dsp index ce02a4c81dc..ae2a2f33661 100644 --- a/examples/Connection/non_blocking/non_blocking.dsp +++ b/examples/Connection/non_blocking/non_blocking.dsp @@ -21,6 +21,7 @@ CFG=client - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\client"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Connection/non_blocking/server.dsp b/examples/Connection/non_blocking/server.dsp index 35d52e1d1c7..508e93f310f 100644 --- a/examples/Connection/non_blocking/server.dsp +++ b/examples/Connection/non_blocking/server.dsp @@ -21,6 +21,7 @@ CFG=server - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\server"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/IPC_SAP/ATM_SAP/CPP_client.dsp b/examples/IPC_SAP/ATM_SAP/CPP_client.dsp index a4a29728cfc..f3fc5ab8315 100644 --- a/examples/IPC_SAP/ATM_SAP/CPP_client.dsp +++ b/examples/IPC_SAP/ATM_SAP/CPP_client.dsp @@ -41,8 +41,9 @@ RSC=rc.exe # PROP Intermediate_Dir ".\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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=1 /YX /FD /c
+# 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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=1 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -68,7 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D _CONSOLE.ACE_HAS_DLL=0 /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D _CONSOLE.ACE_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/IPC_SAP/ATM_SAP/CPP_server.dsp b/examples/IPC_SAP/ATM_SAP/CPP_server.dsp index 044d4198ec3..ab6ad4ff057 100644 --- a/examples/IPC_SAP/ATM_SAP/CPP_server.dsp +++ b/examples/IPC_SAP/ATM_SAP/CPP_server.dsp @@ -41,8 +41,9 @@ RSC=rc.exe # PROP Intermediate_Dir ".\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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=1 /YX /FD /c
+# 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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=1 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -68,7 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp b/examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp index 92c16111c03..ba434e39150 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp +++ b/examples/IPC_SAP/SOCK_SAP/CPP_inclient.dsp @@ -17,11 +17,11 @@ CFG=CPP_inclient - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "CPP_inclient - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "CPP_inclient - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\CPP_inclient"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp b/examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp index 5bbc80f87e8..e9dfa9d2944 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp +++ b/examples/IPC_SAP/SOCK_SAP/CPP_inserver.dsp @@ -17,11 +17,11 @@ CFG=CPP_inserver - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "CPP_inserver - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "CPP_inserver - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\CPP_inserver"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp b/examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp index b03bac9c90e..7b91db890c6 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp +++ b/examples/IPC_SAP/SOCK_SAP/CPP_memclient.dsp @@ -35,9 +35,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
# PROP Intermediate_Dir "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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp b/examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp index 9fa6802ae4d..e047983bc8a 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp +++ b/examples/IPC_SAP/SOCK_SAP/CPP_memserver.dsp @@ -35,16 +35,18 @@ RSC=rc.exe # PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
# PROP Intermediate_Dir "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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# 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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace"
# Begin Target
diff --git a/examples/IPC_SAP/SOCK_SAP/C_inserver.dsp b/examples/IPC_SAP/SOCK_SAP/C_inserver.dsp index fe423ff2a6a..b862672530e 100644 --- a/examples/IPC_SAP/SOCK_SAP/C_inserver.dsp +++ b/examples/IPC_SAP/SOCK_SAP/C_inserver.dsp @@ -17,11 +17,11 @@ CFG=C_inserver - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "C_inserver - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "C_inserver - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\C_inserver"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp b/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp index 788a6835b00..367d4f6811c 100644 --- a/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp +++ b/examples/IPC_SAP/SOCK_SAP/SOCK_SAP.dsp @@ -17,11 +17,11 @@ CFG=C_inclient - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "C_inclient - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "C_inclient - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\C_inclient"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Log_Msg/Callback.dsp b/examples/Log_Msg/Callback.dsp index 6e509057f85..cb0dff3b8cf 100644 --- a/examples/Log_Msg/Callback.dsp +++ b/examples/Log_Msg/Callback.dsp @@ -21,6 +21,7 @@ CFG=Callback - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Log_Msg/Log_Msg.dsp b/examples/Log_Msg/Log_Msg.dsp index 7a20a91e488..62665a36aef 100644 --- a/examples/Log_Msg/Log_Msg.dsp +++ b/examples/Log_Msg/Log_Msg.dsp @@ -21,6 +21,7 @@ CFG=Log_Msg - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Log_Msg/Ostream.dsp b/examples/Log_Msg/Ostream.dsp index c3a1cc938f0..93d0101b0e8 100644 --- a/examples/Log_Msg/Ostream.dsp +++ b/examples/Log_Msg/Ostream.dsp @@ -21,6 +21,7 @@ CFG=Ostream - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Logger/Acceptor-server/server_loggerd.dsp b/examples/Logger/Acceptor-server/server_loggerd.dsp index 2b4719cc4bc..db514bf001d 100644 --- a/examples/Logger/Acceptor-server/server_loggerd.dsp +++ b/examples/Logger/Acceptor-server/server_loggerd.dsp @@ -17,11 +17,11 @@ CFG=server_loggerd - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "server_loggerd - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "server_loggerd - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Mem_Map/file-reverse/file_reverse.dsp b/examples/Mem_Map/file-reverse/file_reverse.dsp index d0c5a055331..13c7779095d 100644 --- a/examples/Mem_Map/file-reverse/file_reverse.dsp +++ b/examples/Mem_Map/file-reverse/file_reverse.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Naming/Naming.dsp b/examples/Naming/Naming.dsp index 0187b502502..5fab6978e20 100644 --- a/examples/Naming/Naming.dsp +++ b/examples/Naming/Naming.dsp @@ -21,6 +21,7 @@ CFG=writers - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\writers"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Naming/multiple_contexts.dsp b/examples/Naming/multiple_contexts.dsp index 065ad285d5f..955452620ca 100644 --- a/examples/Naming/multiple_contexts.dsp +++ b/examples/Naming/multiple_contexts.dsp @@ -17,11 +17,11 @@ CFG=multiple_contexts - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "multiple_contexts - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "multiple_contexts - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\multiple_contexts"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Naming/non_existent.dsp b/examples/Naming/non_existent.dsp index 307b8af2227..772a50d4b36 100644 --- a/examples/Naming/non_existent.dsp +++ b/examples/Naming/non_existent.dsp @@ -17,11 +17,11 @@ CFG=non_existent - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "non_existent - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "non_existent - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\non_existent"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/OS/Process/Process.dsp b/examples/OS/Process/Process.dsp index 1167ae5ac00..0e43cb97f47 100644 --- a/examples/OS/Process/Process.dsp +++ b/examples/OS/Process/Process.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/OS/Process/imore.dsp b/examples/OS/Process/imore.dsp index bfd96207cf0..89ec2165dcc 100644 --- a/examples/OS/Process/imore.dsp +++ b/examples/OS/Process/imore.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/QOS/client.dsp b/examples/QOS/client.dsp index 917624d7c7e..9b53d073de0 100644 --- a/examples/QOS/client.dsp +++ b/examples/QOS/client.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +51,7 @@ 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 kernel32.lib user32.lib gdi32.lib winspool.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 LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../ace"
!ELSEIF "$(CFG)" == "003 - Win32 Debug"
@@ -66,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Od /I "../../../" /D "WIN32" /D "_DEBUG" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Od /I "../../" /D "WIN32" /D "_DEBUG" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +76,7 @@ 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 kernel32.lib user32.lib gdi32.lib 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"
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"
!ENDIF
diff --git a/examples/QOS/server.dsp b/examples/QOS/server.dsp index cf5e85b78a7..f6c47b582b9 100644 --- a/examples/QOS/server.dsp +++ b/examples/QOS/server.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +51,7 @@ 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 kernel32.lib user32.lib gdi32.lib winspool.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 LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../ace"
!ELSEIF "$(CFG)" == "002 - Win32 Debug"
@@ -66,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Od /I "../../../" /D "WIN32" /D "_DEBUG" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Od /I "../../" /D "WIN32" /D "_DEBUG" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +76,7 @@ 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 kernel32.lib user32.lib gdi32.lib 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"
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"
!ENDIF
diff --git a/examples/Reactor/Dgram/CODgram.dsp b/examples/Reactor/Dgram/CODgram.dsp index 48c03263393..63cf9dd7d5d 100644 --- a/examples/Reactor/Dgram/CODgram.dsp +++ b/examples/Reactor/Dgram/CODgram.dsp @@ -22,6 +22,7 @@ CFG=CODgram - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -41,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -65,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Dgram/Dgram.dsp b/examples/Reactor/Dgram/Dgram.dsp index b7a923e540f..6da66503477 100644 --- a/examples/Reactor/Dgram/Dgram.dsp +++ b/examples/Reactor/Dgram/Dgram.dsp @@ -22,6 +22,7 @@ CFG=Dgram - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -41,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -65,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Misc/Misc.dsp b/examples/Reactor/Misc/Misc.dsp index 63265406c26..4337b55c113 100644 --- a/examples/Reactor/Misc/Misc.dsp +++ b/examples/Reactor/Misc/Misc.dsp @@ -7,21 +7,21 @@ CFG=timer_queue - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "Misc.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "Misc.mak" CFG="timer_queue - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "timer_queue - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "timer_queue - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\timer_queue"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Misc/demuxing.dsp b/examples/Reactor/Misc/demuxing.dsp index 430fe933635..2c61f9e9638 100644 --- a/examples/Reactor/Misc/demuxing.dsp +++ b/examples/Reactor/Misc/demuxing.dsp @@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Misc/early_timeouts.dsp b/examples/Reactor/Misc/early_timeouts.dsp index a92c0da6372..f7ae24fce47 100644 --- a/examples/Reactor/Misc/early_timeouts.dsp +++ b/examples/Reactor/Misc/early_timeouts.dsp @@ -7,21 +7,21 @@ CFG=early_timeouts - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "early_timeouts.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "early_timeouts.mak" CFG="early_timeouts - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "early_timeouts - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "early_timeouts - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -35,9 +35,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
# PROP Intermediate_Dir "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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Misc/notification.dsp b/examples/Reactor/Misc/notification.dsp index 5670abfe2d0..1747f375b82 100644 --- a/examples/Reactor/Misc/notification.dsp +++ b/examples/Reactor/Misc/notification.dsp @@ -7,21 +7,21 @@ CFG=notification - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "notification.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "notification.mak" CFG="notification - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "notification - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
+!MESSAGE "notification - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\notification"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Misc/reactors.dsp b/examples/Reactor/Misc/reactors.dsp index 65421c32ce7..478573e3e1c 100644 --- a/examples/Reactor/Misc/reactors.dsp +++ b/examples/Reactor/Misc/reactors.dsp @@ -7,20 +7,21 @@ CFG=reactors - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "reactors.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "reactors.mak" CFG="reactors - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "reactors - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Misc/signals_1.dsp b/examples/Reactor/Misc/signals_1.dsp index 10dbee350aa..a7780d480ef 100644 --- a/examples/Reactor/Misc/signals_1.dsp +++ b/examples/Reactor/Misc/signals_1.dsp @@ -7,20 +7,21 @@ CFG=signals_1 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "signals_1.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "signals_1.mak" CFG="signals_1 - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "signals_1 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Misc/signals_2.dsp b/examples/Reactor/Misc/signals_2.dsp index 8f14dcdb9c4..625aaa0a23c 100644 --- a/examples/Reactor/Misc/signals_2.dsp +++ b/examples/Reactor/Misc/signals_2.dsp @@ -7,20 +7,21 @@ CFG=signals_2 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "signals_2.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "signals_2.mak" CFG="signals_2 - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "signals_2 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Ntalker/ntalker.dsp b/examples/Reactor/Ntalker/ntalker.dsp index 556783c5d0c..93ff1b1b1c7 100644 --- a/examples/Reactor/Ntalker/ntalker.dsp +++ b/examples/Reactor/Ntalker/ntalker.dsp @@ -21,6 +21,7 @@ CFG=ntalker - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -33,7 +34,8 @@ RSC=rc.exe # PROP Intermediate_Dir ".\debug"
# PROP Ignore_Export_Lib 0
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "MULTI_THREADED" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "MULTI_THREADED" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Proactor/post_completions.dsp b/examples/Reactor/Proactor/post_completions.dsp index 3391d2b1c5a..693fba86070 100644 --- a/examples/Reactor/Proactor/post_completions.dsp +++ b/examples/Reactor/Proactor/post_completions.dsp @@ -13,16 +13,15 @@ CFG=test_post_completion - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "post_completions.mak"\
- CFG="test_post_completion - Win32 Debug"
+!MESSAGE NMAKE /f "post_completions.mak" CFG="test_post_completion - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "test_post_completion - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "test_post_completion - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -39,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Proactor/test_cancel.dsp b/examples/Reactor/Proactor/test_cancel.dsp index 49ddc9a40b8..afde4d57d46 100644 --- a/examples/Reactor/Proactor/test_cancel.dsp +++ b/examples/Reactor/Proactor/test_cancel.dsp @@ -17,11 +17,11 @@ CFG=test_cancel - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "test_cancel - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "test_cancel - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -35,9 +35,11 @@ RSC=rc.exe # PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
# PROP Intermediate_Dir "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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Proactor/test_end_event_loop.dsp b/examples/Reactor/Proactor/test_end_event_loop.dsp index d06cf6e318b..d8e811df507 100644 --- a/examples/Reactor/Proactor/test_end_event_loop.dsp +++ b/examples/Reactor/Proactor/test_end_event_loop.dsp @@ -13,16 +13,15 @@ CFG=test_end_event_loop - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "test_end_event_loop.mak"\
- CFG="test_end_event_loop - Win32 Debug"
+!MESSAGE NMAKE /f "test_end_event_loop.mak" CFG="test_end_event_loop - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "test_end_event_loop - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "test_end_event_loop - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -39,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Proactor/test_multiple_loops.dsp b/examples/Reactor/Proactor/test_multiple_loops.dsp index ad1b472f639..c57d2339e59 100644 --- a/examples/Reactor/Proactor/test_multiple_loops.dsp +++ b/examples/Reactor/Proactor/test_multiple_loops.dsp @@ -13,16 +13,15 @@ CFG=test_multiple_loops - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "test_multiple_loops.mak"\
- CFG="test_multiple_loops - Win32 Debug"
+!MESSAGE NMAKE /f "test_multiple_loops.mak" CFG="test_multiple_loops - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "test_multiple_loops - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "test_multiple_loops - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -39,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\test_multiple_loops"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Proactor/test_proactor.dsp b/examples/Reactor/Proactor/test_proactor.dsp index 44d956c012c..3bd534622bb 100644 --- a/examples/Reactor/Proactor/test_proactor.dsp +++ b/examples/Reactor/Proactor/test_proactor.dsp @@ -17,11 +17,11 @@ CFG=test_proactor - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "test_proactor - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "test_proactor - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -34,7 +34,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/Proactor/test_timeout.dsp b/examples/Reactor/Proactor/test_timeout.dsp index 9d2341b000b..e57e7e507a3 100644 --- a/examples/Reactor/Proactor/test_timeout.dsp +++ b/examples/Reactor/Proactor/test_timeout.dsp @@ -17,11 +17,11 @@ CFG=test_timeout - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "test_timeout - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "test_timeout - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\test_timeout"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/WFMO_Reactor/Handle_Close.dsp b/examples/Reactor/WFMO_Reactor/Handle_Close.dsp index 4045f734c40..e2b5a28050d 100644 --- a/examples/Reactor/WFMO_Reactor/Handle_Close.dsp +++ b/examples/Reactor/WFMO_Reactor/Handle_Close.dsp @@ -17,11 +17,11 @@ CFG=Handle_Close - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Handle_Close - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Handle_Close - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -38,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Reactor/WFMO_Reactor/test_talker.cpp b/examples/Reactor/WFMO_Reactor/test_talker.cpp index 56d9ef3fc37..83eedf58c97 100644 --- a/examples/Reactor/WFMO_Reactor/test_talker.cpp +++ b/examples/Reactor/WFMO_Reactor/test_talker.cpp @@ -514,7 +514,7 @@ main (int argc, char *argv[]) { // Let the proactor know that it will be used with Reactor // Create specific proactor - ACE_WIN32_Proactor win32_proactor (0, 0, 1); + ACE_WIN32_Proactor win32_proactor (0, 1); // Get the interface proactor ACE_Proactor proactor (&win32_proactor); // Put it as the instance. diff --git a/examples/Registry/Registry.dsp b/examples/Registry/Registry.dsp index 7b23483eee7..8bfeb1fab0d 100644 --- a/examples/Registry/Registry.dsp +++ b/examples/Registry/Registry.dsp @@ -21,6 +21,7 @@ CFG=iterator - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\iterator"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\STL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\STL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Registry/update.dsp b/examples/Registry/update.dsp index 38d66da2072..b94cef461a7 100644 --- a/examples/Registry/update.dsp +++ b/examples/Registry/update.dsp @@ -21,6 +21,7 @@ CFG=update - Win32 Debug !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -37,7 +38,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\update"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\STL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\STL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Service_Configurator/Misc/Timer.dsp b/examples/Service_Configurator/Misc/Timer.dsp index ff253f8453a..36b9f6bd5e8 100644 --- a/examples/Service_Configurator/Misc/Timer.dsp +++ b/examples/Service_Configurator/Misc/Timer.dsp @@ -43,7 +43,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIMER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIMER_EXPORTS" /D "ACE_BUILD_SVC_DLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIMER_EXPORTS" /D "ACE_BUILD_SVC_DLL" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +70,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIMER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIMER_EXPORTS" /D "ACE_BUILD_SVC_DLL" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIMER_EXPORTS" /D "ACE_BUILD_SVC_DLL" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/examples/Service_Configurator/Misc/main.dsp b/examples/Service_Configurator/Misc/main.dsp index 030074422f5..16b8a4f5d42 100644 --- a/examples/Service_Configurator/Misc/main.dsp +++ b/examples/Service_Configurator/Misc/main.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ACE_SVC_HAS_DLL=0 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ACE_SVC_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ACE_SVC_HAS_DLL=0 /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ACE_SVC_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Shared_Malloc/malloc.dsp b/examples/Shared_Malloc/malloc.dsp index f4430851d83..bd5e63f3e83 100644 --- a/examples/Shared_Malloc/malloc.dsp +++ b/examples/Shared_Malloc/malloc.dsp @@ -8,12 +8,12 @@ CFG=malloc - 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 "Shared_Malloc.mak".
+!MESSAGE NMAKE /f "malloc.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 "Shared_Malloc.mak" CFG="malloc - Win32 Release"
+!MESSAGE NMAKE /f "malloc.mak" CFG="malloc - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,7 @@ CFG=malloc - Win32 Release !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -41,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\malloc"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -65,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\malloc"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Shared_Malloc/multiple_mallocs.dsp b/examples/Shared_Malloc/multiple_mallocs.dsp index 94ae297d821..0696dd6e144 100644 --- a/examples/Shared_Malloc/multiple_mallocs.dsp +++ b/examples/Shared_Malloc/multiple_mallocs.dsp @@ -17,13 +17,12 @@ CFG=multiple_mallocs - Win32 Release !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "multiple_mallocs - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "multiple_mallocs - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "multiple_mallocs - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "multiple_mallocs - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\multiple_mallocs"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\multiple_mallocs"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Shared_Malloc/persistence.dsp b/examples/Shared_Malloc/persistence.dsp index c26ca7d4857..e028d3c5b93 100644 --- a/examples/Shared_Malloc/persistence.dsp +++ b/examples/Shared_Malloc/persistence.dsp @@ -17,13 +17,12 @@ CFG=persistence - Win32 Release !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "persistence - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "persistence - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "persistence - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "persistence - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\persistence"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\persistence"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Shared_Malloc/position_independent_malloc.dsp b/examples/Shared_Malloc/position_independent_malloc.dsp index 79c443aecbe..468e1720f25 100644 --- a/examples/Shared_Malloc/position_independent_malloc.dsp +++ b/examples/Shared_Malloc/position_independent_malloc.dsp @@ -8,12 +8,12 @@ CFG=position_independent_malloc - 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 "Shared_Malloc.mak".
+!MESSAGE NMAKE /f "position_independent_malloc.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 "Shared_Malloc.mak" CFG="position_independent_malloc - Win32 Release"
+!MESSAGE NMAKE /f "position_independent_malloc.mak" CFG="position_independent_malloc - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -22,6 +22,7 @@ CFG=position_independent_malloc - Win32 Release !MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -41,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\position_independent_malloc"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -65,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\position_independent_malloc"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/examples/Shared_Malloc/test_malloc.cpp b/examples/Shared_Malloc/test_malloc.cpp index b3dcb83eafd..cf1dfaa71d7 100644 --- a/examples/Shared_Malloc/test_malloc.cpp +++ b/examples/Shared_Malloc/test_malloc.cpp @@ -32,9 +32,11 @@ malloc_recurse (int count) if (count <= 0) { if (Options::instance ()->debug ()) - // Note that you'll need to #define ACE_HAS_MALLOC_STATS in - // the main ACE config.h file and remake ACE to enable this. - ACE_MALLOC_STATS (Malloc::instance ()->print_stats ()); + { + // Note that you'll need to #define ACE_HAS_MALLOC_STATS in + // the main ACE config.h file and remake ACE to enable this. + ACE_MALLOC_STATS (Malloc::instance ()->print_stats ()); + } } else { diff --git a/examples/Web_Crawler/Web_Crawler.dsp b/examples/Web_Crawler/Web_Crawler.dsp index 5c1e02d1e8f..3669f769dd2 100644 --- a/examples/Web_Crawler/Web_Crawler.dsp +++ b/examples/Web_Crawler/Web_Crawler.dsp @@ -39,6 +39,7 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
diff --git a/performance-tests/Misc/basic_perf.dsp b/performance-tests/Misc/basic_perf.dsp index 2d5c55f56c5..b91e9deeaea 100644 --- a/performance-tests/Misc/basic_perf.dsp +++ b/performance-tests/Misc/basic_perf.dsp @@ -44,7 +44,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\basic_perf"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -68,7 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\basic_perf"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,7 +95,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "basic_perf"
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -118,7 +121,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "basic_perf"
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/performance-tests/Misc/childbirth_time.dsp b/performance-tests/Misc/childbirth_time.dsp index 0fd8ba78615..cf092f1c096 100644 --- a/performance-tests/Misc/childbirth_time.dsp +++ b/performance-tests/Misc/childbirth_time.dsp @@ -17,13 +17,12 @@ CFG=childbirth_time - Win32 Release !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "childbirth_time - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "childbirth_time - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "childbirth_time - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "childbirth_time - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\childbirth_time"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\childbirth_time"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/performance-tests/Misc/context_switch_time.dsp b/performance-tests/Misc/context_switch_time.dsp index 4f98a04c458..d4728b73564 100644 --- a/performance-tests/Misc/context_switch_time.dsp +++ b/performance-tests/Misc/context_switch_time.dsp @@ -44,7 +44,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\context_switch_time"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -68,7 +69,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\context_switch_time"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,7 +95,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "context_switch_time"
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -118,7 +121,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "context_switch_time"
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
diff --git a/performance-tests/Misc/test_mutex.dsp b/performance-tests/Misc/test_mutex.dsp index 9ffbe458e94..aeb75587c98 100644 --- a/performance-tests/Misc/test_mutex.dsp +++ b/performance-tests/Misc/test_mutex.dsp @@ -17,13 +17,12 @@ CFG=test_mutex - Win32 Release !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "test_mutex - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "test_mutex - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "test_mutex - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_mutex - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\test_mutex"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\test_mutex"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/performance-tests/Misc/test_naming.dsp b/performance-tests/Misc/test_naming.dsp index 1d91a19f214..b703d741328 100644 --- a/performance-tests/Misc/test_naming.dsp +++ b/performance-tests/Misc/test_naming.dsp @@ -17,13 +17,12 @@ CFG=test_naming - Win32 Release !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "test_naming - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "test_naming - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "test_naming - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_naming - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\test_naming"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\test_naming"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/performance-tests/Misc/test_singleton.dsp b/performance-tests/Misc/test_singleton.dsp index a1a4c0f24d1..2cee7b0f0a5 100644 --- a/performance-tests/Misc/test_singleton.dsp +++ b/performance-tests/Misc/test_singleton.dsp @@ -17,13 +17,12 @@ CFG=test_singleton - Win32 Release !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "test_singleton - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "test_singleton - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "test_singleton - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_singleton - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -43,7 +42,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\test_singleton"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ".\test_singleton"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp b/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp index b1bf8fdafae..85836c43f6b 100644 --- a/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp +++ b/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp @@ -7,19 +7,19 @@ CFG=Leader_Follower - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "Leader_Follower.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "Leader_Follower.mak" CFG="Leader_Follower - Win32 Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "Leader_Follower - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "Leader_Follower - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -42,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -65,8 +66,9 @@ LINK32=link.exe # PROP Intermediate_Dir "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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# 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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -76,7 +78,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace"
-!ENDIF
+!ENDIF
# Begin Target
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp b/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp index f2104b1bbea..93cd5209a5e 100644 --- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp +++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -65,8 +66,9 @@ LINK32=link.exe # PROP Intermediate_Dir "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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# 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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/performance-tests/Synch-Benchmarks/Synch_Tests.dsp b/performance-tests/Synch-Benchmarks/Synch_Tests.dsp deleted file mode 100644 index abebe482659..00000000000 --- a/performance-tests/Synch-Benchmarks/Synch_Tests.dsp +++ /dev/null @@ -1,196 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Synch_Tests" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=Synch_Tests - 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 "Synch_Tests.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 "Synch_Tests.mak" CFG="Synch_Tests - Win32 Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Synch_Tests - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Synch_Tests - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Synch_Tests - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# 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:windows /dll /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"
-
-!ELSEIF "$(CFG)" == "Synch_Tests - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir ".\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"./Synch_Testsd.dll" /libpath:"..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Synch_Tests - Win32 Release"
-# Name "Synch_Tests - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\Perf_Test\Adaptive_Lock_Performance_Test_Base.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\adaptive_mutex_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\adaptive_recursive_lock_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\adaptive_sema_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Benchmark_Base.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\Benchmark_Performance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\condb_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\conds_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\context_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\memory_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\mutex_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\Performance_Test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\Performance_Test_Options.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\pipe_proc_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\pipe_thr_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\recursive_lock_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\rwrd_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\rwwr_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\sema_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Perf_Test\sysvsema_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=.\Benchmark.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Options.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
-# Begin Source File
-
-SOURCE=.\Options.i
-# End Source File
-# End Target
-# End Project
diff --git a/performance-tests/TCP/TCP.dsp b/performance-tests/TCP/TCP.dsp index 1efafeb919f..c872bc0f9db 100644 --- a/performance-tests/TCP/TCP.dsp +++ b/performance-tests/TCP/TCP.dsp @@ -42,7 +42,8 @@ RSC=rc.exe # 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 "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -65,8 +66,9 @@ LINK32=link.exe # PROP Intermediate_Dir "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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# 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 "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/websvcs/lib/websvcs_export.h b/websvcs/lib/websvcs_export.h index 92ce0ccbc4f..0f8a8b3f76f 100644 --- a/websvcs/lib/websvcs_export.h +++ b/websvcs/lib/websvcs_export.h @@ -1,35 +1,40 @@ +// -*- C++ -*- // $Id$ - // Definition for Win32 Export directives. // This file is generated automatically by -// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT +// generate_export_file.pl // ------------------------------ -#ifndef ACE_WEBSVCS_EXPORT_H +#if !defined (ACE_WEBSVCS_EXPORT_H) #define ACE_WEBSVCS_EXPORT_H -#include "ace/OS.h" +#include "ace/config-all.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ +#if !defined (ACE_WEBSVCS_HAS_DLL) +#define ACE_WEBSVCS_HAS_DLL 1 +#endif /* ! ACE_WEBSVCS_HAS_DLL */ #if defined (ACE_WEBSVCS_HAS_DLL) # if (ACE_WEBSVCS_HAS_DLL == 1) # if defined (ACE_WEBSVCS_BUILD_DLL) # define ACE_WEBSVCS_Export ACE_Proper_Export_Flag # define ACE_WEBSVCS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ACE_WEBSVCS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) # else # define ACE_WEBSVCS_Export ACE_Proper_Import_Flag # define ACE_WEBSVCS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ACE_WEBSVCS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) # endif /* ACE_WEBSVCS_BUILD_DLL */ # else # define ACE_WEBSVCS_Export # define ACE_WEBSVCS_SINGLETON_DECLARATION(T) +# define ACE_WEBSVCS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) # endif /* ! ACE_WEBSVCS_HAS_DLL == 1 */ #else # define ACE_WEBSVCS_Export # define ACE_WEBSVCS_SINGLETON_DECLARATION(T) +# define ACE_WEBSVCS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* ACE_WEBSVCS_HAS_DLL */ #endif /* ACE_WEBSVCS_EXPORT_H */ - // End of auto generated file. + +// End of auto generated file. |