Commit e53f1399 authored by Gisle Vanem's avatar Gisle Vanem
Browse files

Add "-DCURL_STATICLIB" for static build. 

Add ../lib/timeval.c for objects.
parent 61599ceb

src/Makefile.m32

+6 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ ifdef DYN 
else

  curl_DEPENDENCIES = ../lib/libcurl.a

  curl_LDADD = -L../lib -lcurl

  COMPILE += -DCURL_STATICLIB

endif

curl_LDADD += -lwsock32 -lws2_32 -lwinmm -L$(ZLIB_PATH) -lz

ifdef SSL
@@ -52,7 +53,7 @@ endif 
# Makefile.inc provides the CSOURCES and HHEADERS defines

include Makefile.inc



curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_SOURCES)))

curl_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURL_SOURCES) ../lib/timeval.c)))

# curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_ONES))))

# vpath %.c ../lib
@@ -64,6 +65,9 @@ curl.exe: $(curl_OBJECTS) $(curl_DEPENDENCIES) 
	$(LINK) $(curl_OBJECTS) $(curl_LDADD)

	$(STRIP) $@



timeval.o: ../lib/timeval.c

	$(COMPILE) -c $<



# We don't have nroff normally under win32

# hugehelp.c: ../README.curl ../curl.1 mkhelp.pl

# 	$(RM) hugehelp.c