From: Gunter Knauf <gk@gknw.de>
Date: Wed, 14 Jul 2004 12:12:08 +0000 (+0000)
Subject: some more fixes; added cw32mt.lib, winmm.lib to the link libs for curl.exe.
X-Git-Tag: curl-7_12_1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40a39e2270600739de425c7bd24968531e774274;p=thirdparty%2Fcurl.git

some more fixes; added cw32mt.lib, winmm.lib to the link libs for curl.exe.
---

diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 221336f80c..90121bd7b0 100644
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -13,7 +13,9 @@
 ############################################################
 
 # Edit the path below to point to the base of your Zlib sources.
-#ZLIB_PATH = ../../zlib-1.2.1
+!ifndef ZLIB_PATH
+ZLIB_PATH = ../../zlib-1.2.1
+!endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 !ifndef OPENSSL_PATH
@@ -41,7 +43,7 @@ LDFLAGS  = -lap
 DEFINES  = -DNDEBUG -DLIBCURL_BIGENDIAN=0 -DWIN32 -D_CONSOLE -D_MBCS
 
 INCDIRS  = -I$(CURNTDIR);$(TOPDIR)/include;$(TOPDIR)/lib
-LINKLIB  = $(BCCDIR)/lib/psdk/ws2_32.lib
+LINKLIB  = $(BCCDIR)/lib/cw32mt.lib $(BCCDIR)/lib/psdk/winmm.lib $(BCCDIR)/lib/psdk/ws2_32.lib
 
 LIBCURLLIB = $(TOPDIR)/lib/libcurl.lib
 
@@ -68,7 +70,7 @@ clean:
 
 $(PROGNAME): $(OBJECTS) $(LIBCURLLIB) $(LINKLIB)
 	@-$(RM) $@
-	$(LD) $(LDFLAGS) -e $@ $**
+	$(LD) $(LDFLAGS) -e$@ $**
 
 hugehelp.c: hugehelp.c.cvs
 	@echo Creating $@
@@ -81,7 +83,4 @@ sys/utime.h: $(BCCDIR)\include\utime.h
 
 main.c: sys/utime.h
 
-test:
-	@echo OBJECTS = $(OBJECTS)
-