http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=397

15 files changed, 342 insertions, 21 deletions

diff --git a/cppe/src/IceE/Acceptor.h b/cppe/src/IceE/Acceptor.h
new file mode 100644
index 00000000000..16954372f66
--- /dev/null
+++ b/cppe/src/IceE/Acceptor.h
@@ -0,0 +1,65 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEE_TRANSPORT_ACCEPTOR_H
+#define ICEE_TRANSPORT_ACCEPTOR_H
+
+#include <IceE/TransceiverF.h>
+#include <IceE/InstanceF.h>
+#include <IceE/TraceLevelsF.h>
+#include <IceE/LoggerF.h>
+#include <IceE/AcceptorF.h>
+
+#include <IceE/Shared.h>
+
+#ifdef _WIN32
+#   include <winsock2.h>
+typedef int ssize_t;
+#else
+#   define SOCKET int
+#   include <netinet/in.h> // For struct sockaddr_in
+#endif
+
+namespace IceInternal
+{
+
+// XXX: EndpointF?
+class Endpoint;
+
+class ICEE_API Acceptor : public ::Ice::Shared
+{
+public:
+
+    SOCKET fd();
+    void close();
+    void listen();
+    TransceiverPtr accept(int);
+    void connectToSelf();
+    std::string toString() const;
+
+    bool equivalent(const std::string&, int) const;
+    int effectivePort();
+
+private:
+
+    Acceptor(const InstancePtr&, const std::string&, int);
+    virtual ~Acceptor();
+    friend class Endpoint;
+
+    InstancePtr _instance;
+    TraceLevelsPtr _traceLevels;
+    ::Ice::LoggerPtr _logger;
+    SOCKET _fd;
+    int _backlog;
+    struct sockaddr_in _addr;
+};
+
+}
+
+#endif
diff --git a/cppe/src/IceE/AcceptorF.h b/cppe/src/IceE/AcceptorF.h
new file mode 100644
index 00000000000..d032002219a
--- /dev/null
+++ b/cppe/src/IceE/AcceptorF.h
@@ -0,0 +1,25 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEE_ACCEPTOR_F_H
+#define ICEE_ACCEPTOR_F_H
+
+#include <IceE/Handle.h>
+
+namespace IceInternal
+{
+
+class Acceptor;
+ICEE_API void incRef(Acceptor*);
+ICEE_API void decRef(Acceptor*);
+typedef Handle<Acceptor> AcceptorPtr;
+
+}
+
+#endif
diff --git a/cppe/src/IceE/Cond.cpp b/cppe/src/IceE/Cond.cpp
index ce5cb0aa86c..0809bac980a 100644
--- a/cppe/src/IceE/Cond.cpp
+++ b/cppe/src/IceE/Cond.cpp
@@ -42,8 +42,7 @@ Ice::Semaphore::wait() const
 bool
 Ice::Semaphore::timedWait(const Time& timeout) const
 {
-    timeval tv = timeout;
-    long msec = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
+    long msec = (long)timeout.toMilliSeconds();
 
     int rc = WaitForSingleObject(_sem, msec);
     if(rc != WAIT_TIMEOUT && rc != WAIT_OBJECT_0)
diff --git a/cppe/src/IceE/Connector.h b/cppe/src/IceE/Connector.h
new file mode 100755
index 00000000000..6765bc1126b
--- /dev/null
+++ b/cppe/src/IceE/Connector.h
@@ -0,0 +1,52 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEE_TRANSPORT_CONNECTOR_H
+#define ICEE_TRANSPORT_CONNECTOR_H
+
+#include <IceE/ConnectorF.h>
+#include <IceE/TransceiverF.h>
+#include <IceE/InstanceF.h>
+#include <IceE/TraceLevelsF.h>
+#include <IceE/LoggerF.h>

+#include <IceE/Shared.h>
+

+#ifdef _WIN32

+#  include <winsock2.h>

+#else
+#  include <netinet/in.h> // For struct sockaddr_in
+#endif
+
+namespace IceInternal
+{
+
+class Endpoint;
+
+class ICEE_API Connector : public ::Ice::Shared
+{
+public:
+    
+    TransceiverPtr connect(int);
+    std::string toString() const;
+    
+private:
+    
+    Connector(const InstancePtr&, const std::string&, int);
+    virtual ~Connector();
+    friend class Endpoint;
+
+    InstancePtr _instance;
+    TraceLevelsPtr _traceLevels;
+    ::Ice::LoggerPtr _logger;
+    struct sockaddr_in _addr;
+};
+
+}
+
+#endif
diff --git a/cppe/src/IceE/ConnectorF.h b/cppe/src/IceE/ConnectorF.h
new file mode 100644
index 00000000000..8fbadab4152
--- /dev/null
+++ b/cppe/src/IceE/ConnectorF.h
@@ -0,0 +1,25 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEE_CONNECTOR_F_H
+#define ICEE_CONNECTOR_F_H
+
+#include <IceE/Handle.h>
+
+namespace IceInternal
+{
+
+class Connector;
+ICEE_API void incRef(Connector*);
+ICEE_API void decRef(Connector*);
+typedef Handle<Connector> ConnectorPtr;
+
+}
+
+#endif
diff --git a/cppe/src/IceE/Endpoint.h b/cppe/src/IceE/Endpoint.h
new file mode 100644
index 00000000000..c7ce59e7234
--- /dev/null
+++ b/cppe/src/IceE/Endpoint.h
@@ -0,0 +1,72 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEE_TRANSPORT_ENDPOINT_H
+#define ICEE_TRANSPORT_ENDPOINT_H
+
+#include <IceE/EndpointF.h>
+#include <IceE/ConnectorF.h>
+#include <IceE/TransceiverF.h>
+#include <IceE/InstanceF.h>
+#include <IceE/LoggerF.h>
+#ifndef ICEE_PURE_CLIENT
+#    include <IceE/AcceptorF.h>
+#endif
+
+#include <IceE/Shared.h>
+
+namespace IceInternal
+{
+
+class BasicStream;
+
+const Ice::Short TcpEndpointType = 1;
+
+class ICEE_API Endpoint : public Ice::Shared
+{
+public:
+
+    Endpoint(const InstancePtr&, const std::string&, Ice::Int, Ice::Int);
+    Endpoint(const InstancePtr&, const std::string&);
+    Endpoint(BasicStream*);
+
+    void streamWrite(BasicStream*) const;
+    std::string toString() const;
+    Ice::Short type() const;
+    Ice::Int timeout() const;
+    EndpointPtr timeout(Ice::Int) const;
+    bool unknown() const;
+    ConnectorPtr connector() const;
+#ifndef ICEE_PURE_CLIENT
+    AcceptorPtr acceptor(EndpointPtr&) const;
+#endif
+
+    bool equivalent(const TransceiverPtr&) const;
+#ifndef ICEE_PURE_CLIENT
+    bool equivalent(const AcceptorPtr&) const;
+#endif
+
+    bool operator==(const Endpoint&) const;
+    bool operator!=(const Endpoint&) const;
+    bool operator<(const Endpoint&) const;
+
+private:
+
+    //
+    // All members are const, because endpoints are immutable.
+    //
+    const InstancePtr _instance;
+    const std::string _host;
+    const Ice::Int _port;
+    const Ice::Int _timeout;
+};
+
+}
+
+#endif
diff --git a/cppe/src/IceE/EndpointFactory.h b/cppe/src/IceE/EndpointFactory.h
new file mode 100644
index 00000000000..ccdf3f72341
--- /dev/null
+++ b/cppe/src/IceE/EndpointFactory.h
@@ -0,0 +1,43 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEE_ENDPOINT_FACTORY_H
+#define ICEE_ENDPOINT_FACTORY_H
+
+#include <IceE/EndpointFactoryF.h>
+#include <IceE/EndpointF.h>
+#include <IceE/InstanceF.h>
+#include <IceE/Shared.h>
+
+namespace IceInternal
+{
+
+class BasicStream;
+
+class ICEE_API EndpointFactory : public ::Ice::Shared
+{
+public:
+
+    ~EndpointFactory();
+
+    EndpointPtr create(const std::string&) const;
+    EndpointPtr read(BasicStream*) const;
+    void destroy();
+
+protected:
+
+    EndpointFactory(const InstancePtr&);
+    friend class Instance;
+
+    InstancePtr _instance;
+};
+
+}
+
+#endif
diff --git a/cppe/src/IceE/EndpointFactoryF.h b/cppe/src/IceE/EndpointFactoryF.h
new file mode 100644
index 00000000000..aa0bcec2f74
--- /dev/null
+++ b/cppe/src/IceE/EndpointFactoryF.h
@@ -0,0 +1,25 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEE_ENDPOINT_FACTORY_F_H
+#define ICEE_ENDPOINT_FACTORY_F_H
+
+#include <IceE/Handle.h>
+
+namespace IceInternal
+{
+
+class EndpointFactory;
+ICEE_API void incRef(EndpointFactory*);
+ICEE_API void decRef(EndpointFactory*);
+typedef Handle<EndpointFactory> EndpointFactoryPtr;
+
+}
+
+#endif
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp
index e3617208ab3..2cdc0bf984d 100644
--- a/cppe/src/IceE/Instance.cpp
+++ b/cppe/src/IceE/Instance.cpp
@@ -33,7 +33,9 @@
 
 #include <stdio.h>
 
-#ifndef _WIN32
+#ifdef _WIN32

+#   include <winsock2.h>

+#else
 #   include <signal.h>
 #   include <pwd.h>
 #   include <sys/types.h>
@@ -359,7 +361,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 	    if(WSAStartup(version, &data) != 0)
 	    {
 		SocketException ex(__FILE__, __LINE__);
-		ex.error = getSocketErrno();
+		ex.error = WSAGetLastError();
 		throw ex;
 	    }
 #endif
diff --git a/cppe/src/IceE/Network.cpp b/cppe/src/IceE/Network.cpp
index 15e16079164..92984d1038f 100644
--- a/cppe/src/IceE/Network.cpp
+++ b/cppe/src/IceE/Network.cpp
@@ -19,6 +19,16 @@ using namespace IceInternal;
 #    define INADDR_NONE (unsigned long)-1
 #endif
 
+int
+IceInternal::getSocketErrno()
+{
+#ifdef _WIN32
+    return WSAGetLastError();
+#else
+    return errno;
+#endif
+}
+
 bool
 IceInternal::interrupted()
 {
diff --git a/cppe/src/IceE/Network.h b/cppe/src/IceE/Network.h
index 56274e88f64..20ea18db0a3 100644
--- a/cppe/src/IceE/Network.h
+++ b/cppe/src/IceE/Network.h
@@ -17,7 +17,7 @@
 #include <IceE/Config.h>
 
 #ifdef _WIN32
-#   include <winsock.h>
+#   include <winsock2.h>
 typedef int ssize_t;
 #else
 #   include <unistd.h>
@@ -111,6 +111,8 @@ ICEE_API bool isLocalAddress(const struct sockaddr_in&);
 ICEE_API bool isPeerLocal(SOCKET);
 #endif
 
+ICEE_API int getSocketErrno();
+
 }
 
 #endif
diff --git a/cppe/src/IceE/Thread.cpp b/cppe/src/IceE/Thread.cpp
index 164a3558c83..f1033a1755d 100644
--- a/cppe/src/IceE/Thread.cpp
+++ b/cppe/src/IceE/Thread.cpp
@@ -133,8 +133,7 @@ Ice::ThreadControl::isAlive() const
 void
 Ice::ThreadControl::sleep(const Time& timeout)
 {
-    timeval tv = timeout;
-    long msec = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
+    long msec = (long)timeout.toMilliSeconds();
     Sleep(msec);
 }
 
diff --git a/cppe/src/IceE/Time.cpp b/cppe/src/IceE/Time.cpp
index b6056aa3a32..501326eec4f 100644
--- a/cppe/src/IceE/Time.cpp
+++ b/cppe/src/IceE/Time.cpp
@@ -65,6 +65,7 @@ Ice::Time::microSeconds(Int64 t)
     return Time(t);
 }
 
+#ifndef _WIN32
 Ice::Time::operator timeval() const
 {
     timeval tv;
@@ -72,6 +73,7 @@ Ice::Time::operator timeval() const
     tv.tv_usec = static_cast<long>(_usec % 1000000);
     return tv;
 }
+#endif
 
 Int64
 Ice::Time::toSeconds() const
diff --git a/cppe/src/IceE/ice.dsp b/cppe/src/IceE/ice.dsp
index 32dc18079c1..5b3db5e91a6 100755
--- a/cppe/src/IceE/ice.dsp
+++ b/cppe/src/IceE/ice.dsp
@@ -45,7 +45,7 @@ CFG=ice - Win32 Debug
 SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D FD_SETSIZE=1024 /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /Fr /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -82,7 +82,7 @@ PostBuild_Cmds=copy $(OutDir)\icee.lib ..\..\lib\	copy $(OutDir)\icee10.dll ..\.
 SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c

 # SUBTRACT CPP /Fr /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -116,11 +116,11 @@ PostBuild_Cmds=copy $(OutDir)\iceed.lib ..\..\lib\	copy $(OutDir)\icee10d.pdb ..
 # PROP Intermediate_Dir "ReleaseStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-MTL=midl.exe

 SLICE2CPPEFLAGS=-DICEE

+MTL=midl.exe

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /Fr /YX

 RSC=rc.exe

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

@@ -133,7 +133,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\ReleaseStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                              $(OutDir)\icee.lib                              ..\..\lib\ 

+PostBuild_Cmds=copy                               $(OutDir)\icee.lib                               ..\..\lib\ 

 # End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "ice - Win32 Debug Static"

@@ -149,11 +149,11 @@ PostBuild_Cmds=copy                              $(OutDir)\icee.lib
 # PROP Intermediate_Dir "DebugStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-MTL=midl.exe

 SLICE2CPPEFLAGS=-DICEE

+MTL=midl.exe

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c

 # SUBTRACT CPP /Fr /YX

 RSC=rc.exe

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

@@ -166,7 +166,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\DebugStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                             $(OutDir)\iceed.lib                             ..\..\lib\ 

+PostBuild_Cmds=copy                              $(OutDir)\iceed.lib                              ..\..\lib\ 

 # End Special Build Tool

 

 !ENDIF 

diff --git a/cppe/src/IceEC/icec.dsp b/cppe/src/IceEC/icec.dsp
index b5826e3bcbc..60d0f3a12b6 100755
--- a/cppe/src/IceEC/icec.dsp
+++ b/cppe/src/IceEC/icec.dsp
@@ -45,7 +45,7 @@ CFG=icec - Win32 Debug
 SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c

+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c

 # SUBTRACT CPP /Fr /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -82,7 +82,7 @@ PostBuild_Cmds=copy $(OutDir)\iceec.lib ..\..\lib\	copy $(OutDir)\iceec10.dll ..
 SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c

 # SUBTRACT CPP /Fr /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -120,7 +120,7 @@ SLICE2CPPEFLAGS=-DICEE
 MTL=midl.exe

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c

+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c

 # SUBTRACT CPP /Fr /YX

 RSC=rc.exe

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

@@ -133,7 +133,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\ReleaseStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                                $(OutDir)\iceec.lib                                ..\..\lib\ 

+PostBuild_Cmds=copy                                 $(OutDir)\iceec.lib                                 ..\..\lib\ 

 # End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "icec - Win32 Debug Static"

@@ -153,7 +153,7 @@ SLICE2CPPEFLAGS=-DICEE
 MTL=midl.exe

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c

 # SUBTRACT CPP /Fr /YX

 RSC=rc.exe

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

@@ -166,7 +166,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\DebugStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                               $(OutDir)\iceecd.lib                               ..\..\lib\ 

+PostBuild_Cmds=copy                                $(OutDir)\iceecd.lib                                ..\..\lib\ 

 # End Special Build Tool

 

 !ENDIF