diff options
| author | Gisle Vanem <gvanem@broadpark.no> | 2004-11-13 15:47:17 +0000 |
|---|---|---|
| committer | Gisle Vanem <gvanem@broadpark.no> | 2004-11-13 15:47:17 +0000 |
| commit | e53f139925ca96aac59b0241d366fcc5359f5b87 (patch) | |
| tree | 130751ec78f052bb8ad9d4f936e6d833756c6153 | |
| parent | 61599ceb7b7f1f68c84dff1a8d2ff0f67427a38d (diff) | |
Add "-DCURL_STATICLIB" for static build.
Add ../lib/timeval.c for objects.
| -rw-r--r-- | src/Makefile.m32 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 517faae07..45002c20c 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -32,7 +32,7 @@ CFLAGS = -g -O2 -DMINGW32 ifdef SSL CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H endif -LDFLAGS = +LDFLAGS = COMPILE = $(CC) $(INCLUDES) $(CFLAGS) LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ @@ -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 |