aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@broadpark.no>2004-11-14 13:51:33 +0000
committerGisle Vanem <gvanem@broadpark.no>2004-11-14 13:51:33 +0000
commit737dddaec065cc83adb464f9118c7b54a1f97c77 (patch)
tree32b5d34bb798b33a40afd34925189f9c434d3d11
parentb5c90c9b0587f68acb2f2857be8103163718da0f (diff)
Changes for static/dynamic linking of libcurl.
No need to generate a dummy sys/utime.h. Cleanup.
-rw-r--r--src/Makefile.b3228
1 files changed, 13 insertions, 15 deletions
diff --git a/src/Makefile.b32 b/src/Makefile.b32
index a020e7ea9..b4677c60c 100644
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -31,26 +31,31 @@ LD = bcc32
CP = copy
RM = del
LIB = tlib
-TOPDIR = ..
-CURNTDIR = .
CXXFLAGS = -q -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu -w-pro -tWM
LDFLAGS = -q -lq -lap
-INCDIRS = -I$(CURNTDIR);$(TOPDIR)/include;$(TOPDIR)/lib
+INCDIRS = -I.;../include;../lib
LINKLIB = $(BCCDIR)/lib/cw32mt.lib
-LIBCURLLIB = $(TOPDIR)/lib/libcurl.lib
-
# If you build with SSL support, set WITH_SSL=1
-DEFINES = -DNDEBUG -DLIBCURL_BIGENDIAN=0 -DWIN32 -D_CONSOLE -D_MBCS
+DEFINES = -DNDEBUG -DWIN32
+
+!ifdef DYNAMIC
+LIBCURL_LIB = ../lib/libcurl_imp.lib
+!else
+LIBCURL_LIB = ../lib/libcurl.lib
+DEFINES = $(DEFINES) -DCURL_STATICLIB
+!endif
+
!ifdef WITH_ZLIB
DEFINES = $(DEFINES) -DHAVE_LIBZ -DHAVE_ZLIB_H
INCDIRS = $(INCDIRS);$(ZLIB_PATH)
LINKLIB = $(LINKLIB) $(ZLIB_PATH)/zlib.lib
!endif
+
!ifdef WITH_SSL
-DEFINES = $(DEFINES) -DUSE_SSLEAY
+DEFINES = $(DEFINES) -DUSE_SSLEAY
INCDIRS = $(INCDIRS);$(OPENSSL_PATH)/inc32;$(OPENSSL_PATH)/inc32/openssl
LINKLIB = $(LINKLIB) $(OPENSSL_PATH)/out32/ssleay32.lib $(OPENSSL_PATH)/out32/libeay32.lib
!endif
@@ -74,7 +79,7 @@ clean:
-$(RM) *.obj
-$(RM) hugehelp.c
-$(PROGNAME): $(OBJECTS) $(LIBCURLLIB) $(LINKLIB)
+$(PROGNAME): $(OBJECTS) $(LIBCURL_LIB) $(LINKLIB)
@-$(RM) $@
$(LD) $(LDFLAGS) -e$@ $**
@@ -82,11 +87,4 @@ hugehelp.c: hugehelp.c.cvs
@echo Creating $@
@$(CP) $** $@
-sys/utime.h: $(BCCDIR)\include\utime.h
- @echo Fix missing header $@
- @-mkdir sys
- @$(CP) $** sys
-
-main.c: sys/utime.h
-