29 lines
1.1 KiB
Groff
29 lines
1.1 KiB
Groff
diff -ur serf.org/serf.mak serf/serf.mak
|
|
--- serf.org/serf.mak 2014-03-05 16:31:26.681695709 +0100
|
|
+++ serf/serf.mak 2014-03-05 16:32:20.969696348 +0100
|
|
@@ -93,7 +93,7 @@
|
|
WIN32_DEFS = /D WIN32 /D WIN32_LEAN_AND_MEAN /D NOUSER /D NOGDI /D NONLS /D NOCRYPT /D SERF_HAVE_SSPI
|
|
|
|
CPP=cl.exe
|
|
-CPP_PROJ = /c /nologo $(CFLAGS) $(WIN32_DEFS) $(APR_FLAGS) $(APRUTIL_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
|
|
+CPP_PROJ = /c /nologo /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC $(CFLAGS) $(WIN32_DEFS) $(APR_FLAGS) $(APRUTIL_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
|
|
LIB32=link.exe
|
|
LIB32_FLAGS=/nologo
|
|
|
|
@@ -127,16 +127,6 @@
|
|
"$(INTDIR)\socket_buckets.obj" \
|
|
"$(INTDIR)\ssl_buckets.obj" \
|
|
|
|
-!IFDEF OPENSSL_STATIC
|
|
-LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32\libeay32.lib" \
|
|
- "$(OPENSSL_SRC)\out32\ssleay32.lib"
|
|
-!ELSE
|
|
-LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32dll\libeay32.lib" \
|
|
- "$(OPENSSL_SRC)\out32dll\ssleay32.lib"
|
|
-!ENDIF
|
|
-
|
|
-LIB32_OBJS = $(LIB32_OBJS) $(APR_LIBS) $(APRUTIL_LIBS) $(ZLIB_LIBS)
|
|
-
|
|
SYS_LIBS = secur32.lib
|
|
|
|
TEST_OBJS = \
|