diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-02-22 17:03:50 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-02-22 17:03:50 +0000 |
| commit | 5cd57d4a38d433fe0299d77ffed84772a13003df (patch) | |
| tree | 7b5ae29f23a76761dbadc6b682fae9dfd419f6d8 /perf/src | |
| parent | initial draft of UNIX binary distro howto (diff) | |
| download | ice-5cd57d4a38d433fe0299d77ffed84772a13003df.tar.bz2 ice-5cd57d4a38d433fe0299d77ffed84772a13003df.tar.xz ice-5cd57d4a38d433fe0299d77ffed84772a13003df.zip | |
Fixed Windows build of dummy client/server.
Diffstat (limited to 'perf/src')
| -rwxr-xr-x | perf/src/Ice/dummy/Client.cpp | 6 | ||||
| -rwxr-xr-x | perf/src/Ice/dummy/Server.cpp | 6 | ||||
| -rwxr-xr-x | perf/src/Ice/dummy/dummyIceC.dsp | 4 | ||||
| -rwxr-xr-x | perf/src/Ice/dummy/dummyIceS.dsp | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/perf/src/Ice/dummy/Client.cpp b/perf/src/Ice/dummy/Client.cpp index b48c40fd929..fdbd6a315ef 100755 --- a/perf/src/Ice/dummy/Client.cpp +++ b/perf/src/Ice/dummy/Client.cpp @@ -27,7 +27,11 @@ typedef int ssize_t; # include <netdb.h> #endif -#include <sys/time.h> +#ifdef _WIN32 +# include <sys/timeb.h> +#else +# include <sys/time.h> +#endif #ifndef _WIN32 # define SOCKET int diff --git a/perf/src/Ice/dummy/Server.cpp b/perf/src/Ice/dummy/Server.cpp index 73aee641aca..6f52322699f 100755 --- a/perf/src/Ice/dummy/Server.cpp +++ b/perf/src/Ice/dummy/Server.cpp @@ -27,7 +27,11 @@ typedef int ssize_t; # include <netdb.h> #endif -#include <sys/time.h> +#ifdef _WIN32 +# include <sys/timeb.h> +#else +# include <sys/time.h> +#endif #ifndef _WIN32 # define SOCKET int diff --git a/perf/src/Ice/dummy/dummyIceC.dsp b/perf/src/Ice/dummy/dummyIceC.dsp index 0552ba2d27c..0314465fb79 100755 --- a/perf/src/Ice/dummy/dummyIceC.dsp +++ b/perf/src/Ice/dummy/dummyIceC.dsp @@ -52,7 +52,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 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"$(ICE_HOME)/lib"
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"client.exe" /libpath:"$(ICE_HOME)/lib"
# SUBTRACT LINK32 /debug /nodefaultlib
!ELSEIF "$(CFG)" == "dummyIceC - Win32 Debug"
@@ -79,7 +79,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 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"$(ICE_HOME)/lib"
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"$(ICE_HOME)/lib"
# SUBTRACT LINK32 /incremental:no /nodefaultlib
!ENDIF
diff --git a/perf/src/Ice/dummy/dummyIceS.dsp b/perf/src/Ice/dummy/dummyIceS.dsp index 8a9c91d8ba1..bc947592ea5 100755 --- a/perf/src/Ice/dummy/dummyIceS.dsp +++ b/perf/src/Ice/dummy/dummyIceS.dsp @@ -52,7 +52,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 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"$(ICE_HOME)/lib"
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"$(ICE_HOME)/lib"
# SUBTRACT LINK32 /debug /nodefaultlib
!ELSEIF "$(CFG)" == "dummyIceS - Win32 Debug"
@@ -79,7 +79,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 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"$(ICE_HOME)/lib"
+# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"$(ICE_HOME)/lib"
# SUBTRACT LINK32 /incremental:no /nodefaultlib
!ENDIF
|