diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | RELEASE-NOTES | 3 | ||||
| -rwxr-xr-x | maketgz | 2 | ||||
| -rw-r--r-- | src/Makefile.vc6 | 7 |
4 files changed, 16 insertions, 2 deletions
@@ -6,6 +6,12 @@ Changelog +Daniel S (24 October 2007) +- Vladimir Lazarenko pointed out that we should do some 'mt' magic when + building with VC8 to get the "manifest" embedded to make fine stand-alone + binaries. The maketgz and the src/Makefile.vc6 files were adjusted + accordingly. + Daniel S (23 October 2007) - Bug report #1812190 (http://curl.haxx.se/bug/view.cgi?id=1812190) points out that libcurl tried to re-use connections a bit too much when using non-SSL diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 65d23608a..c35f94710 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -43,6 +43,7 @@ This release includes the following bugfixes: o redirect from HTTP to FTP memory problem o re-used connections a bit too much when using non-SSL protocols tunneled over a HTTP proxy + o embed the manifest in VC8 builds This release includes the following known bugs: @@ -62,6 +63,6 @@ advice from friends like these: Dan Fandrich, Michal Marek, Günter Knauf, Rob Crittenden, Immanuel Gregoire, Mark Davies, Max Katsev, Philip Langdale, Alex Fishman, Johnny Luong, Alexey Pesternikov, Yang Tse, Kim Rinnewitz, Michael Wallner, - Patrick Monnerat, + Patrick Monnerat, Vladimir Lazarenko Thanks! (and sorry if I forgot to mention someone) @@ -41,7 +41,7 @@ sed 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER echo "generate VC8 makefiles" # Generate VC8 versions from the VC6 Makefile versions perl -pe 's%/GX /DWIN32 /YX%/EHsc /DWIN32%;' -e 's%/GZ%/RTC1%;' -e 's%wsock32.lib%wsock32.lib bufferoverflowu.lib%g;' -e 's%(VC)6%${1}8%gi;' lib/Makefile.vc6 > lib/Makefile.vc8.dist -perl -pe "s%/GX /DWIN32 /YX%/EHsc /DWIN32%;" -e 's%/GZ%/RTC1%;' -e 's%wsock32.lib%wsock32.lib bufferoverflowu.lib%g;' -e 's%(VC)6%${1}8%gi;' src/Makefile.vc6 > src/Makefile.vc8.dist +perl -pe "s%/GX /DWIN32 /YX%/EHsc /DWIN32%;" -e 's%/GZ%/RTC1%;' -e 's%wsock32.lib%wsock32.lib bufferoverflowu.lib%g;' -e 's%(VC)6%${1}8%gi;' -e 's/^#MANIFESTTOOL/MANIFESTTOOL/' src/Makefile.vc6 > src/Makefile.vc8.dist # Replace version number in plist file: PLIST=lib/libcurl.plist diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 23fb15e32..df0cefdf5 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -75,6 +75,11 @@ CFLAGS = /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:$(MACHINE)
RESFLAGS = /i../include
+# This manifest thing is for VC8, enabled by the maketgz script that
+# builds the VC8 version of this makefile. Left commented out in the VC6
+# version!
+#MANIFESTTOOL = mt -manifest $(PROGRAM_NAME).manifest -outputresource:$(PROGRAM_NAME);1
+
!IFDEF WINDOWS_SSPI
CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include
!ENDIF
@@ -214,9 +219,11 @@ all : release release: $(RELEASE_OBJS)
$(LINKR) $(LFLAGS) $(LINKLIBS) $(RELEASE_OBJS)
+ $(MANIFESTTOOL)
debug: $(DEBUG_OBJS)
$(LINKD) $(LFLAGS) $(LINKLIBS_DEBUG) $(DEBUG_OBJS)
+ $(MANIFESTTOOL)
## Release
hugehelpr.obj: hugehelp.c
|