Commit 2d7e1657 authored by Steve Holme's avatar Steve Holme
Browse files

build: Added VC14 project files to Makefile.am

parent 8356022d

Makefile.am

+33 −4
Original line number Diff line number Diff line
@@ -85,6 +85,13 @@ VC12_SRCTMPL = projects/Windows/VC12/src/curl.tmpl 
VC12_SRCVCXPROJ = projects/Windows/VC12/src/curl.vcxproj.dist

VC12_SRCVCXPROJ_DEPS = $(VC12_SRCTMPL) Makefile.am src/Makefile.inc



VC14_LIBTMPL = projects/Windows/VC14/lib/libcurl.tmpl

VC14_LIBVCXPROJ = projects/Windows/VC14/lib/libcurl.vcxproj.dist

VC14_LIBVCXPROJ_DEPS = $(VC14_LIBTMPL) Makefile.am lib/Makefile.inc

VC14_SRCTMPL = projects/Windows/VC14/src/curl.tmpl

VC14_SRCVCXPROJ = projects/Windows/VC14/src/curl.vcxproj.dist

VC14_SRCVCXPROJ_DEPS = $(VC14_SRCTMPL) Makefile.am src/Makefile.inc



VC_DIST = projects/README	\

 projects/build-openssl.bat	\

 projects/checksrc.bat	\
@@ -111,7 +118,10 @@ VC_DIST = projects/README \ 
 projects/Windows/VC11/src/curl.sln 	\

 projects/Windows/VC12/curl-all.sln	\

 projects/Windows/VC12/lib/libcurl.sln 	\

 projects/Windows/VC12/src/curl.sln

 projects/Windows/VC12/src/curl.sln	\

 projects/Windows/VC14/curl-all.sln	\

 projects/Windows/VC14/lib/libcurl.sln 	\

 projects/Windows/VC14/src/curl.sln



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

 winbuild/MakefileBuild.vc winbuild/Makefile.vc				\
@@ -124,7 +134,8 @@ EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ 
CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ)	\

 $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ)	\

 $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ)	\

 $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ)

 $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ)	\

 $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ)



bin_SCRIPTS = curl-config
@@ -269,7 +280,7 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ 
 $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS)	\

 $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS)	\

 $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS)	\

 $(VC12_SRCVCXPROJ_DEPS)

 $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS)

	@(win32_lib_srcs='$(LIB_CFILES)'; \

	win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \

	win32_lib_rc='$(LIB_RCFILES)'; \
@@ -530,4 +541,22 @@ function gen_element(type, dir, file)\ 
		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; };)
 
		"$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; }; \

	\

	echo "generating '$(VC14_LIBVCXPROJ)'"; \

	awk -v proj_type=vcxproj \

		-v lib_srcs="$$sorted_lib_srcs" \

		-v lib_hdrs="$$sorted_lib_hdrs" \

		-v lib_rc="$$win32_lib_rc" \

		-v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \

		-v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \

		"$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \

	\

	echo "generating '$(VC14_SRCVCXPROJ)'"; \

	awk -v proj_type=vcxproj \

		-v src_srcs="$$sorted_src_srcs" \

		-v src_hdrs="$$sorted_src_hdrs" \

		-v src_rc="$$win32_src_rc" \

		-v src_x_srcs="$$sorted_src_x_srcs" \

		-v src_x_hdrs="$$sorted_src_x_hdrs" \

		"$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; };)