Commit 8611d985 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

VC: remove the makefile.vc6 build infra 

The winbuild/ build files is now the single MSVC makefile build choice.

Closes #1215
parent d0837f36

Makefile.am

+2 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -136,8 +136,7 @@ VC_DIST = projects/README \ 
 projects/Windows/VC14/src/curl.vcxproj.filters



WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat	\

 winbuild/MakefileBuild.vc winbuild/Makefile.vc				\

 winbuild/Makefile.msvc.names

 winbuild/MakefileBuild.vc winbuild/Makefile.vc



EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in	\

 RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework scripts/zsh.pl	\

Makefile.dist

+7 −442
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -20,8 +20,6 @@ 
#

###########################################################################



VC=vc6



all:

	./configure

	make
@@ -87,366 +85,13 @@ mingw32%: 
	$(MAKE) -C lib -f Makefile.m32 CFG=$@

	$(MAKE) -C src -f Makefile.m32 CFG=$@



vc-clean: $(VC)

	cd lib

	nmake -f Makefile.$(VC) clean

	cd ..\src

	nmake -f Makefile.$(VC) clean



vc-all: $(VC)

	cd lib

	nmake -f Makefile.$(VC) cfg=release

	nmake -f Makefile.$(VC) cfg=release-ssl

	nmake -f Makefile.$(VC) cfg=release-zlib

	nmake -f Makefile.$(VC) cfg=release-ssl-zlib

	nmake -f Makefile.$(VC) cfg=release-ssl-dll

	nmake -f Makefile.$(VC) cfg=release-zlib-dll

	nmake -f Makefile.$(VC) cfg=release-ssl-dll-zlib-dll

	nmake -f Makefile.$(VC) cfg=release-dll

	nmake -f Makefile.$(VC) cfg=release-dll-ssl-dll

	nmake -f Makefile.$(VC) cfg=release-dll-zlib-dll

	nmake -f Makefile.$(VC) cfg=release-dll-ssl-dll-zlib-dll

	nmake -f Makefile.$(VC) cfg=debug

	nmake -f Makefile.$(VC) cfg=debug-ssl

	nmake -f Makefile.$(VC) cfg=debug-zlib

	nmake -f Makefile.$(VC) cfg=debug-ssl-zlib

	nmake -f Makefile.$(VC) cfg=debug-ssl-dll

	nmake -f Makefile.$(VC) cfg=debug-zlib-dll

	nmake -f Makefile.$(VC) cfg=debug-ssl-dll-zlib-dll

	nmake -f Makefile.$(VC) cfg=debug-dll

	nmake -f Makefile.$(VC) cfg=debug-dll-ssl-dll

	nmake -f Makefile.$(VC) cfg=debug-dll-zlib-dll

	nmake -f Makefile.$(VC) cfg=debug-dll-ssl-dll-zlib-dll



vc: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release

	cd ..\src

	nmake /f Makefile.$(VC)



vc-x64: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release



vc-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release WINDOWS_SSPI=1



vc-x64-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release WINDOWS_SSPI=1



vc-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release USE_IDN=1



vc-x64-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release USE_IDN=1



vc-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release USE_IDN=1 WINDOWS_SSPI=1



vc-x64-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release USE_IDN=1 WINDOWS_SSPI=1



vc-zlib: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-zlib

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-zlib



vc-x64-zlib: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib



vc-zlib-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-zlib WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-zlib WINDOWS_SSPI=1



vc-x64-zlib-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib WINDOWS_SSPI=1



vc-zlib-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-zlib USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-zlib USE_IDN=1



vc-x64-zlib-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib USE_IDN=1



vc-zlib-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-zlib USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-zlib USE_IDN=1 WINDOWS_SSPI=1



vc-x64-zlib-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib USE_IDN=1 WINDOWS_SSPI=1



vc-ssl: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl



vc-x64-ssl: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl



vc-ssl-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl WINDOWS_SSPI=1



vc-x64-ssl-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl WINDOWS_SSPI=1



vc-ssl-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl USE_IDN=1



vc-x64-ssl-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl USE_IDN=1



vc-ssl-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl USE_IDN=1 WINDOWS_SSPI=1



vc-x64-ssl-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl USE_IDN=1 WINDOWS_SSPI=1



vc-ssl-zlib: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-zlib

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-zlib



vc-x64-ssl-zlib: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib



vc-ssl-zlib-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-zlib WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-zlib WINDOWS_SSPI=1



vc-x64-ssl-zlib-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib WINDOWS_SSPI=1



vc-ssl-zlib-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-zlib USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-zlib USE_IDN=1



vc-x64-ssl-zlib-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib USE_IDN=1



vc-ssl-zlib-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-zlib USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-zlib USE_IDN=1 WINDOWS_SSPI=1



vc-x64-ssl-zlib-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib USE_IDN=1 WINDOWS_SSPI=1



vc-ssl-ssh2-zlib: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-ssh2-zlib

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-ssh2-zlib



vc-x64-ssl-ssh2-zlib: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-ssh2-zlib

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-ssh2-zlib



vc-ssl-ssh2-zlib-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-ssh2-zlib WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-ssh2-zlib WINDOWS_SSPI=1



vc-x64-ssl-ssh2-zlib-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-ssh2-zlib WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-ssh2-zlib WINDOWS_SSPI=1



vc-ssl-ssh2-zlib-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-ssh2-zlib USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-ssh2-zlib USE_IDN=1



vc-x64-ssl-ssh2-zlib-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-ssh2-zlib USE_IDN=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-ssh2-zlib USE_IDN=1



vc-ssl-ssh2-zlib-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-ssh2-zlib USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-ssh2-zlib USE_IDN=1 WINDOWS_SSPI=1



vc-x64-ssl-ssh2-zlib-idn-sspi: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-ssh2-zlib USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-ssh2-zlib USE_IDN=1 WINDOWS_SSPI=1



vc-winssl: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-winssl WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-winssl WINDOWS_SSPI=1



vc-x64-winssl: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl WINDOWS_SSPI=1



vc-winssl-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-winssl USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-winssl USE_IDN=1 WINDOWS_SSPI=1



vc-x64-winssl-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl USE_IDN=1 WINDOWS_SSPI=1



vc-winssl-zlib: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-winssl-zlib WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-winssl-zlib WINDOWS_SSPI=1

vc:

	cd winbuild

	nmake /f Makefile.vc MACHINE=x86



vc-x64-winssl-zlib: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl-zlib WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl-zlib WINDOWS_SSPI=1



vc-winssl-zlib-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-winssl-zlib USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-winssl-zlib USE_IDN=1 WINDOWS_SSPI=1



vc-x64-winssl-zlib-idn: $(VC)

	cd lib

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl-zlib USE_IDN=1 WINDOWS_SSPI=1

	cd ..\src

	nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl-zlib USE_IDN=1 WINDOWS_SSPI=1



vc-ssl-dll: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-dll

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-dll



vc-dll-ssl-dll: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll



vc-dll: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-dll

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-dll



vc-dll-zlib-dll: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-dll-zlib-dll

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-dll-zlib-dll



vc-dll-ssl-dll-zlib-dll: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll-zlib-dll

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll-zlib-dll



vc-ssl-dll-zlib-dll: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-ssl-dll-zlib-dll

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-ssl-dll-zlib-dll



vc-zlib-dll: $(VC)

	cd lib

	nmake /f Makefile.$(VC) cfg=release-zlib-dll

	cd ..\src

	nmake /f Makefile.$(VC) cfg=release-zlib-dll

vc-x64:

	cd winbuild

	nmake /f Makefile.vc MACHINE=x64



djgpp:

	$(MAKE) -C lib -f Makefile.dj
@@ -497,86 +142,6 @@ linux: all 


linux-ssl: ssl



# We don't need to do anything for vc6.

vc6:



# VC7 makefiles are for use with VS.NET and VS.NET 2003

vc7: lib/Makefile.vc7 src/Makefile.vc7



lib/Makefile.vc7: lib/Makefile.vc6

	@echo "generate $@"

	@sed -e "s/VC6/VC7/g" lib/Makefile.vc6 > lib/Makefile.vc7



src/Makefile.vc7: src/Makefile.vc6

	@echo "generate $@"

	@sed -e "s/VC6/VC7/g" src/Makefile.vc6 > src/Makefile.vc7



# VC8 makefiles are for use with VS2005

vc8: lib/Makefile.vc8 src/Makefile.vc8



lib/Makefile.vc8: lib/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib bufferoverflowu.lib/g" -e "s/VC6/VC8/g" lib/Makefile.vc6 > lib/Makefile.vc8



src/Makefile.vc8: src/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib bufferoverflowu.lib/g" -e "s/VC6/VC8/g" src/Makefile.vc6 > src/Makefile.vc8



# VC9 makefiles are for use with VS2008

vc9: lib/Makefile.vc9 src/Makefile.vc9



lib/Makefile.vc9: lib/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc9/g" -e "s/VC6/VC9/g" lib/Makefile.vc6 > lib/Makefile.vc9



src/Makefile.vc9: src/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc9/g" -e "s/VC6/VC9/g" src/Makefile.vc6 > src/Makefile.vc9



# VC10 makefiles are for use with VS2010

vc10: lib/Makefile.vc10 src/Makefile.vc10



lib/Makefile.vc10: lib/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc10/g" -e "s/VC6/VC10/g" lib/Makefile.vc6 > lib/Makefile.vc10



src/Makefile.vc10: src/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc10/g" -e "s/VC6/VC10/g" src/Makefile.vc6 > src/Makefile.vc10



# VC11 makefiles are for use with VS2012

vc11: lib/Makefile.vc11 src/Makefile.vc11



lib/Makefile.vc11: lib/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc11/g" -e "s/VC6/VC11/g" lib/Makefile.vc6 > lib/Makefile.vc11



src/Makefile.vc11: src/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc11/g" -e "s/VC6/VC11/g" src/Makefile.vc6 > src/Makefile.vc11



# VC12 makefiles are for use with VS2013

vc12: lib/Makefile.vc12 src/Makefile.vc12



lib/Makefile.vc12: lib/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc12/g" -e "s/VC6/VC12/g" lib/Makefile.vc6 > lib/Makefile.vc12



src/Makefile.vc12: src/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc12/g" -e "s/VC6/VC12/g" src/Makefile.vc6 > src/Makefile.vc12



# VC14 makefiles are for use with VS2015

vc14: lib/Makefile.vc14 src/Makefile.vc14



lib/Makefile.vc14: lib/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc14/g" -e "s/VC6/VC14/g" lib/Makefile.vc6 > lib/Makefile.vc14



src/Makefile.vc14: src/Makefile.vc6

	@echo "generate $@"

	@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc14/g" -e "s/VC6/VC14/g" src/Makefile.vc6 > src/Makefile.vc14



ca-bundle: lib/mk-ca-bundle.pl

	@echo "generate a fresh ca-bundle.crt"

	@perl $< -b -l -u lib/ca-bundle.crt

docs/INSTALL.md

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ If you want to set any of these defines you have the following options: 


 - Modify lib/config-win32.h

 - Modify lib/curl_setup.h

 - Modify lib/Makefile.vc6

 - Modify winbuild/Makefile.vc

 - Modify the "Preprocessor Definitions" in the libcurl project



Note: The pre-processor settings can be found using the Visual Studio IDE
@@ -263,7 +263,7 @@ libcurl and curl compilation processes. To set this definition you have the 
following alternatives:



 - Modify lib/config-win32.h and src/config-win32.h

 - Modify lib/Makefile.vc6

 - Modify winbuild/Makefile.vc

 - Modify the "Preprocessor Definitions" in the libcurl project



Note: The pre-processor settings can be found using the Visual Studio IDE

lib/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
*.orig

*.rej

*.res

Makefile.vc*.dist

TAGS

curl_config.h

curl_config.h.in

lib/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -23,7 +23,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc 


CMAKE_DIST = CMakeLists.txt curl_config.h.cmake



EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 config-win32.h	\

EXTRA_DIST = Makefile.b32 Makefile.m32 config-win32.h	\

 config-win32ce.h config-riscos.h config-mac.h curl_config.h.in		\

 makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h	\

 makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h	\