diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-16 15:58:42 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-16 15:58:42 +0300 |
| commit | 970f1dc0c98f7c0f9fd9a6c2a0ce6228e80272d7 (patch) | |
| tree | 86113616f4e4c1965a29788968a219ebece3bcde /neon | |
| parent | b5d29a7e7b6fd3a97c3b8988e5aad34e6bce42b5 (diff) | |
Always link with WS2_32LIB, not WSOCK32LIB
Diffstat (limited to 'neon')
| -rw-r--r-- | neon/neon.patch | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/neon/neon.patch b/neon/neon.patch index 473b88695ccc..0f5669152a28 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -492,7 +492,7 @@ +#endif --- misc/neon-0.29.5/src/makefile.mk 2011-02-03 10:32:38.000000000 +0100 +++ misc/build/neon-0.29.5/src/makefile.mk 2011-02-03 10:26:19.000000000 +0100 -@@ -1 +1,102 @@ +@@ -1,1 +1,99 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -572,10 +572,7 @@ + $(ZLIB3RDLIB) + +.IF "$(GUI)"=="WNT" -+ SHL1STDLIBS+= $(WSOCK32LIB) -+ .IF "$(WINDOWS_VISTA_PSDK)" != "" -+ SHL1STDLIBS+= $(WS2_32LIB) -+ .ENDIF ++ SHL1STDLIBS+= $(WS2_32LIB) + SHL1STDLIBS+= $(OPENSSLLIB) +.ELSE # WNT + .IF "$(OS)"=="SOLARIS" |