Commit graph

1 commit

Author SHA1 Message Date
Mark Andrews
7c0b7f6847 3681. [port] Update the Windows build system to support feature
selection and WIN64 builds.  This is a work in
                        progress. [RT #34160]

(cherry picked from commit c3c8823fed)

Conflicts:
	CHANGES
	bin/check/win32/checktool.dsp.in
	bin/dnssec/win32/dnssectool.dsp.in
	bin/dnssec/win32/importkey.dsp.in
	bin/dnssec/win32/importkey.mak.in
	bin/named/geoip.c
	bin/named/include/named/geoip.h
	bin/tools/win32/rrchecker.dsp.in
	bin/tools/win32/rrchecker.mak.in
	config.h.win32
	lib/dns/geoip.c
	lib/dns/master.c
	lib/dns/win32/libdns.dsp.in
	lib/dns/win32/libdns.mak.in
	lib/isc/mem.c
	lib/isc/stats.c
	lib/isc/win32/file.c
	lib/isc/win32/libisc.def.in
	lib/isc/win32/libisc.mak.in
	lib/isc/win32/stdio.c
	lib/isccc/cc.c
	win32utils/BuildAll.bat
	win32utils/BuildSetup.bat
	win32utils/legacy/BINDBuild.dsw.in
	win32utils/makeversion.pl
	win32utils/setpk11provider.pl
	win32utils/updatelibxml2.pl
	win32utils/win32-build.txt

Conflicts:
	bin/dnssec/win32/verify.dsp.in
	bin/dnssec/win32/verify.mak.in
	bin/named/server.c
	bin/python/dnssec-checkds.py.in
	bin/python/dnssec-coverage.py.in
	lib/dns/nsec.c
	lib/dns/nsec3.c
	lib/dns/win32/libdns.mak.in
	lib/dns/zone.c
	lib/isc/win32/libisc.mak.in
	win32utils/BuildAll.bat
	win32utils/BuildSetup.bat
	win32utils/legacy/BINDBuild.dsw.in
	win32utils/updatelibxml2.pl
	win32utils/win32-build.txt
2013-12-04 14:08:17 +11:00