moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 15:48:49 -05:00
Code Issues Releases Wiki Activity

- Robert A. Monat improved the maketgz and VC6/8 generating to set the correct

Browse Source 
machine type too.
This commit is contained in:
Daniel Stenberg 2007-03-09 22:26:59 +00:00
parent 3789e2e6ce
commit 6dd4fe0740
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -7,6 +7,9 @@
Changelog Changelog
Daniel (9 March 2007) Daniel (9 March 2007)
- Robert A. Monat improved the maketgz and VC6/8 generating to set the correct
machine type too.
- Justin Fletcher fixed a file descriptor leak in the curl tool when trying to - Justin Fletcher fixed a file descriptor leak in the curl tool when trying to
upload a file it couldn't open. Bug #1676581 upload a file it couldn't open. Bug #1676581
(http://curl.haxx.se/bug/view.cgi?id=1676581) (http://curl.haxx.se/bug/view.cgi?id=1676581)

6
lib/Makefile.vc6
View File

@ -41,6 +41,10 @@ OPENSSL_PATH = ../../openssl-0.9.7e
ZLIB_PATH = ../../zlib-1.2.1 ZLIB_PATH = ../../zlib-1.2.1
!ENDIF !ENDIF
!IFNDEF MACHINE
MACHINE = X86
!ENDIF
# USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication # USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication
# without an openssl installation and offers the ability to authenticate # without an openssl installation and offers the ability to authenticate
# using the "current logged in user". It does however require that the # using the "current logged in user". It does however require that the
@ -74,7 +78,7 @@ CFLAGS = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBC
CFLAGSLIB = /DCURL_STATICLIB CFLAGSLIB = /DCURL_STATICLIB
LNKDLL = link.exe /DLL LNKDLL = link.exe /DLL
LNKLIB = link.exe /lib LNKLIB = link.exe /lib
LFLAGS = /nologo LFLAGS = /nologo /machine:$(MACHINE)
SSLLIBS = libeay32.lib ssleay32.lib SSLLIBS = libeay32.lib ssleay32.lib
ZLIBLIBSDLL= zdll.lib ZLIBLIBSDLL= zdll.lib
ZLIBLIBS = zlib.lib ZLIBLIBS = zlib.lib

4
maketgz
View File

@ -40,8 +40,8 @@ sed 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER
echo "generate VC8 makefiles" echo "generate VC8 makefiles"
# Generate VC8 versions from the VC6 Makefile versions # Generate VC8 versions from the VC6 Makefile versions
sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e 's#/GZ#/RTC1#' -e 's/VC6/VC8/g' lib/Makefile.vc6 > lib/Makefile.vc8.dist sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e 's#/GZ#/RTC1#' -e 's/wsock32.lib/wsock32.lib bufferoverflowu.lib/g' -e 's/VC6/VC8/g' lib/Makefile.vc6 > lib/Makefile.vc8.dist
sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e 's#/GZ#/RTC1#' -e 's/VC6/VC8/g' src/Makefile.vc6 > src/Makefile.vc8.dist sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e 's#/GZ#/RTC1#' -e 's/wsock32.lib/wsock32.lib bufferoverflowu.lib/g' -e 's/VC6/VC8/g' src/Makefile.vc6 > src/Makefile.vc8.dist
# Replace version number in plist file: # Replace version number in plist file:
PLIST=lib/libcurl.plist PLIST=lib/libcurl.plist

6
src/Makefile.vc6
View File

@ -23,6 +23,10 @@ ZLIB_PATH = ../../zlib-1.2.1
OPENSSL_PATH = ../../openssl-0.9.7e OPENSSL_PATH = ../../openssl-0.9.7e
!ENDIF !ENDIF
!IFNDEF MACHINE
MACHINE = X86
!ENDIF
# USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication # USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication
# without an openssl installation and offers the ability to authenticate # without an openssl installation and offers the ability to authenticate
# using the "current logged in user". It does however require that the # using the "current logged in user". It does however require that the
@ -64,7 +68,7 @@ LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
RCD = rc.exe /dCURLDEBUG=1 RCD = rc.exe /dCURLDEBUG=1
CFLAGS = /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c CFLAGS = /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c
LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:I386 LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:$(MACHINE)
RESFLAGS = /i../include RESFLAGS = /i../include
!IFDEF WINDOWS_SSPI !IFDEF WINDOWS_SSPI