diff options
| author | Gunter Knauf <gk@gknw.de> | 2004-07-06 01:18:35 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2004-07-06 01:18:35 +0000 |
| commit | ebb09cd9c432a924323b0bb1f1b0d503bbe0db8d (patch) | |
| tree | 0614683f5c8d678322a8683c2564790ae49ed8a0 /src/Makefile.vc6 | |
| parent | 9a6df07d3ded3575382cbcf8459efbe2ef197701 (diff) | |
minor cleanup.
Diffstat (limited to 'src/Makefile.vc6')
| -rw-r--r-- | src/Makefile.vc6 | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index aa6a7765f..67570d7a7 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -13,6 +13,14 @@ PROGRAM_NAME = curl.exe
+!IFNDEF ZLIB_PATH
+ZLIB_PATH = ../../zlib-1.1.4
+!ENDIF
+
+!IFNDEF OPENSSL_PATH
+OPENSSL_PATH = ../../openssl-0.9.9d
+!ENDIF
+
########################################################
## Nothing more to do below this line!
@@ -26,10 +34,6 @@ CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
RCD = rc.exe /dCURLDEBUG=1
-!IFNDEF ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.1.4
-!ENDIF
-
CFLAGS = /I "../lib" /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386
RESFLAGS = /i "../include"
@@ -62,9 +66,6 @@ DEBUG_OBJS= \ # release-ssl
!IF "$(CFG)" == "release-ssl"
-!IFNDEF OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.7a
-!ENDIF
LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib
CFLAGS = $(CFLAGS) -DUSE_SSLEAY
@@ -77,9 +78,6 @@ LFLAGS = $(LFLAGS) $(LFLAGSSSL) # release-libcurl-ssl-dll
!IF "$(CFG)" == "release-libcurl-ssl-dll"
-!IFNDEF OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.7a
-!ENDIF
LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib
CFLAGS = $(CFLAGS) -DUSE_SSLEAY
|