From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 26 Sep 2001 14:27:29 +0000 (+0000)
Subject:   Add ws2_32.lib to this Win32 project, as suggested by Martin Kraemer.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66c09513596a36e8e9c2b77339983d89a72de304;p=thirdparty%2Fapache%2Fhttpd.git

  Add ws2_32.lib to this Win32 project, as suggested by Martin Kraemer.
  Left as compiler debugging switch as /Zi (for VC 5,6,7 compatibility.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91147 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/os/win32/mod_unique_id.dsp b/src/os/win32/mod_unique_id.dsp
index a28aee243cd..ecf957da164 100644
--- a/src/os/win32/mod_unique_id.dsp
+++ b/src/os/win32/mod_unique_id.dsp
@@ -52,8 +52,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id
+# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id
 
 !ELSEIF  "$(CFG)" == "mod_unique_id - Win32 Debug"
 
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_unique_id" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_unique_id" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -78,8 +78,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id
+# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_unique_id.so" /base:@"BaseAddr.ref",mod_unique_id
 
 !ENDIF 
 
diff --git a/src/os/win32/mod_unique_id.mak b/src/os/win32/mod_unique_id.mak
index 82460da604c..6733e733222 100644
--- a/src/os/win32/mod_unique_id.mak
+++ b/src/os/win32/mod_unique_id.mak
@@ -107,10 +107,11 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_unique_id.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\mod_unique_id.pdb" /map:"$(INTDIR)\mod_unique_id.map"\
- /machine:I386 /out:"$(OUTDIR)\mod_unique_id.so"\
- /implib:"$(OUTDIR)\mod_unique_id.lib" /base:@"BaseAddr.ref",mod_unique_id 
+LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
+ /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb"\
+ /map:"$(INTDIR)\mod_unique_id.map" /machine:I386\
+ /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib"\
+ /base:@"BaseAddr.ref",mod_unique_id 
 LINK32_OBJS= \
 	"$(INTDIR)\mod_unique_id.obj" \
 	"..\..\Release\ApacheCore.lib"
@@ -199,10 +200,11 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_unique_id.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\mod_unique_id.pdb" /map:"$(INTDIR)\mod_unique_id.map" /debug\
- /machine:I386 /out:"$(OUTDIR)\mod_unique_id.so"\
- /implib:"$(OUTDIR)\mod_unique_id.lib" /base:@"BaseAddr.ref",mod_unique_id 
+LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
+ /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb"\
+ /map:"$(INTDIR)\mod_unique_id.map" /debug /machine:I386\
+ /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib"\
+ /base:@"BaseAddr.ref",mod_unique_id 
 LINK32_OBJS= \
 	"$(INTDIR)\mod_unique_id.obj" \
 	"..\..\Debug\ApacheCore.lib"