diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2008-02-22 22:53:01 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2008-02-22 22:53:01 +0000 |
| commit | 9dd3e4d48140a0852a3f86bd91a691645be319d8 (patch) | |
| tree | 1a0ef9038fb92bc6fd4f7b8ff140564c53fbb362 /src/Makefile.vc6 | |
| parent | 1d95109ffa685a30c806b4192874b2f387400aca (diff) | |
| download | curl-9dd3e4d48140a0852a3f86bd91a691645be319d8.tar.gz | |
- Georg Lippitsch made the src/Makefile.vc6 makefile use the same memory model
options as the lib/Makefile.vc6 already did.
Diffstat (limited to 'src/Makefile.vc6')
| -rw-r--r-- | src/Makefile.vc6 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index f82e01229..fbcfbf9e8 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -61,13 +61,22 @@ SSL_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32" SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"
SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib
+# Runtime library configuration
+RTLIB = /MD
+RTLIBD = /MDd
+
+!IF "$(RTLIBCFG)" == "static"
+RTLIB = /MT
+RTLIBD = /MTd
+!ENDIF
+
## Release
-CCR = cl.exe /MD /O2 /DNDEBUG
+CCR = cl.exe $(RTLIB) /O2 /DNDEBUG
LINKR = link.exe /incremental:no /libpath:"../lib"
RCR = rc.exe /dCURLDEBUG=0
## Debug
-CCD = cl.exe /MDd /Gm /ZI /Od /D_DEBUG /GZ
+CCD = cl.exe $(RTLIBD) /Gm /ZI /Od /D_DEBUG /GZ
LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
RCD = rc.exe /dCURLDEBUG=1
|