]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
3681. [port] Update the Windows build system to support feature
authorMark Andrews <marka@isc.org>
Wed, 4 Dec 2013 03:08:17 +0000 (14:08 +1100)
committerMark Andrews <marka@isc.org>
Wed, 4 Dec 2013 03:08:17 +0000 (14:08 +1100)
                        selection and WIN64 builds.  This is a work in
                        progress. [RT #34160]

(cherry picked from commit c3c8823fed039b3a2b8e5ca8bc2f3301d1dd840e)

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

437 files changed:
CHANGES
bin/check/win32/checkconf.dsp.in [moved from bin/check/win32/namedcheckconf.dsp with 61% similarity]
bin/check/win32/checkconf.dsw [moved from bin/check/win32/namedcheckconf.dsw with 86% similarity]
bin/check/win32/checkconf.mak.in [moved from bin/check/win32/namedcheckconf.mak with 63% similarity]
bin/check/win32/checkconf.vcxproj.filters.in [new file with mode: 0644]
bin/check/win32/checkconf.vcxproj.in [new file with mode: 0644]
bin/check/win32/checkconf.vcxproj.user [new file with mode: 0644]
bin/check/win32/checktool.dsp.in [moved from bin/check/win32/checktool.dsp with 62% similarity]
bin/check/win32/checktool.vcxproj.filters.in [new file with mode: 0644]
bin/check/win32/checktool.vcxproj.in [new file with mode: 0644]
bin/check/win32/checktool.vcxproj.user [new file with mode: 0644]
bin/check/win32/checkzone.dsp.in [moved from bin/check/win32/namedcheckzone.dsp with 61% similarity]
bin/check/win32/checkzone.dsw [new file with mode: 0644]
bin/check/win32/checkzone.mak.in [moved from bin/check/win32/namedcheckzone.mak with 66% similarity]
bin/check/win32/checkzone.vcxproj.filters.in [new file with mode: 0644]
bin/check/win32/checkzone.vcxproj.in [new file with mode: 0644]
bin/check/win32/checkzone.vcxproj.user [new file with mode: 0644]
bin/confgen/win32/confgentool.dsp.in [moved from bin/confgen/win32/confgentool.dsp with 66% similarity]
bin/confgen/win32/confgentool.vcxproj.filters.in [new file with mode: 0644]
bin/confgen/win32/confgentool.vcxproj.in [new file with mode: 0644]
bin/confgen/win32/confgentool.vcxproj.user [new file with mode: 0644]
bin/confgen/win32/ddnsconfgen.dsp.in [moved from bin/confgen/win32/ddnsconfgen.dsp with 63% similarity]
bin/confgen/win32/ddnsconfgen.mak.in [moved from bin/confgen/win32/ddnsconfgen.mak with 76% similarity]
bin/confgen/win32/ddnsconfgen.vcxproj.filters.in [new file with mode: 0644]
bin/confgen/win32/ddnsconfgen.vcxproj.in [new file with mode: 0644]
bin/confgen/win32/ddnsconfgen.vcxproj.user [new file with mode: 0644]
bin/confgen/win32/rndcconfgen.dsp.in [moved from bin/confgen/win32/rndcconfgen.dsp with 63% similarity]
bin/confgen/win32/rndcconfgen.mak.in [moved from bin/confgen/win32/rndcconfgen.mak with 76% similarity]
bin/confgen/win32/rndcconfgen.vcxproj.filters.in [new file with mode: 0644]
bin/confgen/win32/rndcconfgen.vcxproj.in [new file with mode: 0644]
bin/confgen/win32/rndcconfgen.vcxproj.user [new file with mode: 0644]
bin/dig/dighost.c
bin/dig/win32/dig.dsp.in [moved from bin/dig/win32/dig.dsp with 62% similarity]
bin/dig/win32/dig.mak.in [moved from bin/dig/win32/dig.mak with 61% similarity]
bin/dig/win32/dig.vcxproj.filters.in [new file with mode: 0644]
bin/dig/win32/dig.vcxproj.in [new file with mode: 0644]
bin/dig/win32/dig.vcxproj.user [new file with mode: 0644]
bin/dig/win32/dighost.dsp.in [moved from bin/dig/win32/dighost.dsp with 59% similarity]
bin/dig/win32/dighost.vcxproj.filters.in [new file with mode: 0644]
bin/dig/win32/dighost.vcxproj.in [new file with mode: 0644]
bin/dig/win32/dighost.vcxproj.user [new file with mode: 0644]
bin/dig/win32/host.dsp.in [moved from bin/dig/win32/host.dsp with 62% similarity]
bin/dig/win32/host.mak.in [moved from bin/dig/win32/host.mak with 61% similarity]
bin/dig/win32/host.vcxproj.filters.in [new file with mode: 0644]
bin/dig/win32/host.vcxproj.in [new file with mode: 0644]
bin/dig/win32/host.vcxproj.user [new file with mode: 0644]
bin/dig/win32/nslookup.dsp.in [moved from bin/dig/win32/nslookup.dsp with 51% similarity]
bin/dig/win32/nslookup.mak.in [moved from bin/dig/win32/nslookup.mak with 60% similarity]
bin/dig/win32/nslookup.vcxproj.filters.in [new file with mode: 0644]
bin/dig/win32/nslookup.vcxproj.in [new file with mode: 0644]
bin/dig/win32/nslookup.vcxproj.user [new file with mode: 0644]
bin/dnssec/dnssec-signzone.c
bin/dnssec/win32/dnssectool.dsp.in [moved from bin/dnssec/win32/dnssectool.dsp with 63% similarity]
bin/dnssec/win32/dnssectool.vcxproj.filters.in [new file with mode: 0644]
bin/dnssec/win32/dnssectool.vcxproj.in [new file with mode: 0644]
bin/dnssec/win32/dnssectool.vcxproj.user [new file with mode: 0644]
bin/dnssec/win32/dsfromkey.dsp.in [moved from bin/dnssec/win32/dsfromkey.dsp with 63% similarity]
bin/dnssec/win32/dsfromkey.mak.in [moved from bin/dnssec/win32/dsfromkey.mak with 79% similarity]
bin/dnssec/win32/dsfromkey.vcxproj.filters.in [new file with mode: 0644]
bin/dnssec/win32/dsfromkey.vcxproj.in [new file with mode: 0644]
bin/dnssec/win32/dsfromkey.vcxproj.user [new file with mode: 0644]
bin/dnssec/win32/importkey.dsp.in [new file with mode: 0644]
bin/dnssec/win32/importkey.mak.in [new file with mode: 0644]
bin/dnssec/win32/importkey.vcxproj.filters.in [new file with mode: 0644]
bin/dnssec/win32/importkey.vcxproj.in [new file with mode: 0644]
bin/dnssec/win32/importkey.vcxproj.user [new file with mode: 0644]
bin/dnssec/win32/keyfromlabel.dsp.in [moved from bin/dnssec/win32/keyfromlabel.dsp with 63% similarity]
bin/dnssec/win32/keyfromlabel.mak.in [moved from bin/dnssec/win32/keyfromlabel.mak with 79% similarity]
bin/dnssec/win32/keyfromlabel.vcxproj.filters.in [new file with mode: 0644]
bin/dnssec/win32/keyfromlabel.vcxproj.in [new file with mode: 0644]
bin/dnssec/win32/keyfromlabel.vcxproj.user [new file with mode: 0644]
bin/dnssec/win32/keygen.dsp.in [moved from bin/dnssec/win32/keygen.dsp with 64% similarity]
bin/dnssec/win32/keygen.mak.in [moved from bin/dnssec/win32/keygen.mak with 79% similarity]
bin/dnssec/win32/keygen.vcxproj.filters.in [new file with mode: 0644]
bin/dnssec/win32/keygen.vcxproj.in [new file with mode: 0644]
bin/dnssec/win32/keygen.vcxproj.user [new file with mode: 0644]
bin/dnssec/win32/nsupdate.dsp [deleted file]
bin/dnssec/win32/revoke.dsp.in [moved from bin/dnssec/win32/revoke.dsp with 64% similarity]
bin/dnssec/win32/revoke.mak.in [moved from bin/dnssec/win32/revoke.mak with 79% similarity]
bin/dnssec/win32/revoke.vcxproj.filters.in [new file with mode: 0644]
bin/dnssec/win32/revoke.vcxproj.in [new file with mode: 0644]
bin/dnssec/win32/revoke.vcxproj.user [new file with mode: 0644]
bin/dnssec/win32/settime.dsp.in [moved from bin/dnssec/win32/settime.dsp with 64% similarity]
bin/dnssec/win32/settime.mak.in [moved from bin/dnssec/win32/settime.mak with 79% similarity]
bin/dnssec/win32/settime.vcxproj.filters.in [new file with mode: 0644]
bin/dnssec/win32/settime.vcxproj.in [new file with mode: 0644]
bin/dnssec/win32/settime.vcxproj.user [new file with mode: 0644]
bin/dnssec/win32/signzone.dsp.in [moved from bin/dnssec/win32/signzone.dsp with 63% similarity]
bin/dnssec/win32/signzone.mak.in [moved from bin/dnssec/win32/signzone.mak with 79% similarity]
bin/dnssec/win32/signzone.vcxproj.filters.in [new file with mode: 0644]
bin/dnssec/win32/signzone.vcxproj.in [new file with mode: 0644]
bin/dnssec/win32/signzone.vcxproj.user [new file with mode: 0644]
bin/named/Makefile.in
bin/named/builtin.c
bin/named/client.c
bin/named/include/named/globals.h
bin/named/include/named/main.h
bin/named/main.c
bin/named/server.c
bin/named/win32/named.dsp.in [moved from bin/named/win32/named.dsp with 67% similarity]
bin/named/win32/named.mak.in [moved from bin/named/win32/named.mak with 66% similarity]
bin/named/win32/named.vcxproj.filters.in [new file with mode: 0644]
bin/named/win32/named.vcxproj.in [new file with mode: 0644]
bin/named/win32/named.vcxproj.user [new file with mode: 0644]
bin/named/win32/ntservice.c
bin/named/win32/os.c
bin/nsupdate/nsupdate.c
bin/nsupdate/win32/nsupdate.dsp [deleted file]
bin/nsupdate/win32/nsupdate.dsp.in [new file with mode: 0644]
bin/nsupdate/win32/nsupdate.mak.in [moved from bin/nsupdate/win32/nsupdate.mak with 61% similarity]
bin/nsupdate/win32/nsupdate.vcxproj.filters.in [new file with mode: 0644]
bin/nsupdate/win32/nsupdate.vcxproj.in [new file with mode: 0644]
bin/nsupdate/win32/nsupdate.vcxproj.user [new file with mode: 0644]
bin/pkcs11/win32/pk11destroy.dsp.in [moved from bin/pkcs11/win32/pk11destroy.dsp with 65% similarity]
bin/pkcs11/win32/pk11destroy.mak.in [moved from bin/pkcs11/win32/pk11destroy.mak with 76% similarity]
bin/pkcs11/win32/pk11destroy.vcxproj.filters.in [new file with mode: 0644]
bin/pkcs11/win32/pk11destroy.vcxproj.in [new file with mode: 0644]
bin/pkcs11/win32/pk11destroy.vcxproj.user [new file with mode: 0644]
bin/pkcs11/win32/pk11keygen.dsp.in [moved from bin/pkcs11/win32/pk11keygen.dsp with 65% similarity]
bin/pkcs11/win32/pk11keygen.mak.in [moved from bin/pkcs11/win32/pk11keygen.mak with 76% similarity]
bin/pkcs11/win32/pk11keygen.vcxproj.filters.in [new file with mode: 0644]
bin/pkcs11/win32/pk11keygen.vcxproj.in [new file with mode: 0644]
bin/pkcs11/win32/pk11keygen.vcxproj.user [new file with mode: 0644]
bin/pkcs11/win32/pk11list.dsp.in [moved from bin/pkcs11/win32/pk11list.dsp with 65% similarity]
bin/pkcs11/win32/pk11list.mak.in [moved from bin/pkcs11/win32/pk11list.mak with 75% similarity]
bin/pkcs11/win32/pk11list.vcxproj.filters.in [new file with mode: 0644]
bin/pkcs11/win32/pk11list.vcxproj.in [new file with mode: 0644]
bin/pkcs11/win32/pk11list.vcxproj.user [new file with mode: 0644]
bin/python/dnssec-checkds.py.in [new file with mode: 0644]
bin/python/dnssec-coverage.py.in [new file with mode: 0755]
bin/python/win32.py [moved from win32utils/todos.pl with 52% similarity]
bin/rndc/win32/rndc.dsp.in [moved from bin/rndc/win32/rndc.dsp with 65% similarity]
bin/rndc/win32/rndc.mak.in [moved from bin/rndc/win32/rndc.mak with 61% similarity]
bin/rndc/win32/rndc.vcxproj.filters.in [new file with mode: 0644]
bin/rndc/win32/rndc.vcxproj.in [new file with mode: 0644]
bin/rndc/win32/rndc.vcxproj.user [new file with mode: 0644]
bin/rndc/win32/rndcutil.dsp.in [moved from bin/rndc/win32/rndcutil.dsp with 65% similarity]
bin/rndc/win32/rndcutil.vcxproj.filters.in [new file with mode: 0644]
bin/rndc/win32/rndcutil.vcxproj.in [new file with mode: 0644]
bin/rndc/win32/rndcutil.vcxproj.user [new file with mode: 0644]
bin/tests/atomic/t_atomic.c
bin/tests/atomic/win32/t_atomic.dsp.in [new file with mode: 0644]
bin/tests/atomic/win32/t_atomic.dsw [moved from bin/dnssec/win32/nsupdate.dsw with 88% similarity]
bin/tests/atomic/win32/t_atomic.mak.in [new file with mode: 0644]
bin/tests/atomic/win32/t_atomic.vcxproj.filters.in [new file with mode: 0644]
bin/tests/atomic/win32/t_atomic.vcxproj.in [new file with mode: 0644]
bin/tests/atomic/win32/t_atomic.vcxproj.user [new file with mode: 0644]
bin/tests/backtrace_test.c
bin/tests/db/t_db.c
bin/tests/db/win32/t_db.dsp.in [new file with mode: 0644]
bin/tests/db/win32/t_db.dsw [new file with mode: 0644]
bin/tests/db/win32/t_db.mak.in [new file with mode: 0644]
bin/tests/db/win32/t_db.vcxproj.filters.in [new file with mode: 0644]
bin/tests/db/win32/t_db.vcxproj.in [new file with mode: 0644]
bin/tests/db/win32/t_db.vcxproj.user [new file with mode: 0644]
bin/tests/dst/gsstest.c [changed mode: 0755->0644]
bin/tests/dst/t_dst.c
bin/tests/dst/win32/REQUIRE_EXTENDED_DIR [new file with mode: 0644]
bin/tests/dst/win32/t_dst.dsp.in [new file with mode: 0644]
bin/tests/dst/win32/t_dst.dsw [new file with mode: 0644]
bin/tests/dst/win32/t_dst.mak.in [new file with mode: 0644]
bin/tests/dst/win32/t_dst.vcxproj.filters.in [new file with mode: 0644]
bin/tests/dst/win32/t_dst.vcxproj.in [new file with mode: 0644]
bin/tests/dst/win32/t_dst.vcxproj.user [new file with mode: 0644]
bin/tests/hashes/t_hashes.c
bin/tests/hashes/win32/t_hashes.dsp.in [new file with mode: 0644]
bin/tests/hashes/win32/t_hashes.dsw [new file with mode: 0644]
bin/tests/hashes/win32/t_hashes.mak.in [new file with mode: 0644]
bin/tests/hashes/win32/t_hashes.vcxproj.filters.in [new file with mode: 0644]
bin/tests/hashes/win32/t_hashes.vcxproj.in [new file with mode: 0644]
bin/tests/hashes/win32/t_hashes.vcxproj.user [new file with mode: 0644]
bin/tests/master/t_master.c
bin/tests/master/win32/t_master.dsp.in [new file with mode: 0644]
bin/tests/master/win32/t_master.dsw [new file with mode: 0644]
bin/tests/master/win32/t_master.mak.in [new file with mode: 0644]
bin/tests/master/win32/t_master.vcxproj.filters.in [new file with mode: 0644]
bin/tests/master/win32/t_master.vcxproj.in [new file with mode: 0644]
bin/tests/master/win32/t_master.vcxproj.user [new file with mode: 0644]
bin/tests/mem/t_mem.c
bin/tests/mem/win32/t_mem.dsp.in [new file with mode: 0644]
bin/tests/mem/win32/t_mem.dsw [new file with mode: 0644]
bin/tests/mem/win32/t_mem.mak.in [new file with mode: 0644]
bin/tests/mem/win32/t_mem.vcxproj.filters.in [new file with mode: 0644]
bin/tests/mem/win32/t_mem.vcxproj.in [new file with mode: 0644]
bin/tests/mem/win32/t_mem.vcxproj.user [new file with mode: 0644]
bin/tests/names/t_names.c
bin/tests/names/win32/t_names.dsp.in [new file with mode: 0644]
bin/tests/names/win32/t_names.dsw [new file with mode: 0644]
bin/tests/names/win32/t_names.mak.in [new file with mode: 0644]
bin/tests/names/win32/t_names.vcxproj.filters.in [new file with mode: 0644]
bin/tests/names/win32/t_names.vcxproj.in [new file with mode: 0644]
bin/tests/names/win32/t_names.vcxproj.user [new file with mode: 0644]
bin/tests/rbt/t_rbt.c
bin/tests/rbt/win32/t_rbt.dsp.in [new file with mode: 0644]
bin/tests/rbt/win32/t_rbt.dsw [new file with mode: 0644]
bin/tests/rbt/win32/t_rbt.mak.in [new file with mode: 0644]
bin/tests/rbt/win32/t_rbt.vcxproj.filters.in [new file with mode: 0644]
bin/tests/rbt/win32/t_rbt.vcxproj.in [new file with mode: 0644]
bin/tests/rbt/win32/t_rbt.vcxproj.user [new file with mode: 0644]
bin/tests/resolver/t_resolver.c
bin/tests/resolver/win32/t_resolver.dsp.in [new file with mode: 0644]
bin/tests/resolver/win32/t_resolver.dsw [new file with mode: 0644]
bin/tests/resolver/win32/t_resolver.mak.in [new file with mode: 0644]
bin/tests/resolver/win32/t_resolver.vcxproj.filters.in [new file with mode: 0644]
bin/tests/resolver/win32/t_resolver.vcxproj.in [new file with mode: 0644]
bin/tests/resolver/win32/t_resolver.vcxproj.user [new file with mode: 0644]
bin/tests/rwlock_test.c
bin/tests/sock_test.c
bin/tests/sockaddr/t_sockaddr.c
bin/tests/sockaddr/win32/t_sockaddr.dsp.in [new file with mode: 0644]
bin/tests/sockaddr/win32/t_sockaddr.dsw [new file with mode: 0644]
bin/tests/sockaddr/win32/t_sockaddr.mak.in [new file with mode: 0644]
bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in [new file with mode: 0644]
bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in [new file with mode: 0644]
bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user [new file with mode: 0644]
bin/tests/task_test.c
bin/tests/tasks/t_tasks.c
bin/tests/tasks/win32/t_tasks.dsp.in [new file with mode: 0644]
bin/tests/tasks/win32/t_tasks.dsw [new file with mode: 0644]
bin/tests/tasks/win32/t_tasks.mak.in [new file with mode: 0644]
bin/tests/tasks/win32/t_tasks.vcxproj.filters.in [new file with mode: 0644]
bin/tests/tasks/win32/t_tasks.vcxproj.in [new file with mode: 0644]
bin/tests/tasks/win32/t_tasks.vcxproj.user [new file with mode: 0644]
bin/tests/timer_test.c
bin/tests/timers/t_timers.c
bin/tests/timers/win32/t_timers.dsp.in [new file with mode: 0644]
bin/tests/timers/win32/t_timers.dsw [new file with mode: 0644]
bin/tests/timers/win32/t_timers.mak.in [new file with mode: 0644]
bin/tests/timers/win32/t_timers.vcxproj.filters.in [new file with mode: 0644]
bin/tests/timers/win32/t_timers.vcxproj.in [new file with mode: 0644]
bin/tests/timers/win32/t_timers.vcxproj.user [new file with mode: 0644]
bin/tests/win32/backtrace_test.dsp.in [new file with mode: 0644]
bin/tests/win32/backtrace_test.dsw [moved from bin/check/win32/namedcheckzone.dsw with 87% similarity]
bin/tests/win32/backtrace_test.mak.in [new file with mode: 0644]
bin/tests/win32/backtrace_test.vcxproj.filters.in [new file with mode: 0644]
bin/tests/win32/backtrace_test.vcxproj.in [new file with mode: 0644]
bin/tests/win32/backtrace_test.vcxproj.user [new file with mode: 0644]
bin/tests/win32/inter_test.dsp.in [new file with mode: 0644]
bin/tests/win32/inter_test.dsw [new file with mode: 0644]
bin/tests/win32/inter_test.mak.in [new file with mode: 0644]
bin/tests/win32/inter_test.vcxproj.filters.in [new file with mode: 0644]
bin/tests/win32/inter_test.vcxproj.in [new file with mode: 0644]
bin/tests/win32/inter_test.vcxproj.user [new file with mode: 0644]
bin/tests/win32/rwlock_test.dsp.in [new file with mode: 0644]
bin/tests/win32/rwlock_test.dsw [new file with mode: 0644]
bin/tests/win32/rwlock_test.mak.in [new file with mode: 0644]
bin/tests/win32/rwlock_test.vcxproj.filters.in [new file with mode: 0644]
bin/tests/win32/rwlock_test.vcxproj.in [new file with mode: 0644]
bin/tests/win32/rwlock_test.vcxproj.user [new file with mode: 0644]
bin/tests/win32/shutdown_test.dsp.in [new file with mode: 0644]
bin/tests/win32/shutdown_test.dsw [new file with mode: 0644]
bin/tests/win32/shutdown_test.mak.in [new file with mode: 0644]
bin/tests/win32/shutdown_test.vcxproj.filters.in [new file with mode: 0644]
bin/tests/win32/shutdown_test.vcxproj.in [new file with mode: 0644]
bin/tests/win32/shutdown_test.vcxproj.user [new file with mode: 0644]
bin/tests/win32/sock_test.dsp.in [new file with mode: 0644]
bin/tests/win32/sock_test.dsw [new file with mode: 0644]
bin/tests/win32/sock_test.mak.in [new file with mode: 0644]
bin/tests/win32/sock_test.vcxproj.filters.in [new file with mode: 0644]
bin/tests/win32/sock_test.vcxproj.in [new file with mode: 0644]
bin/tests/win32/sock_test.vcxproj.user [new file with mode: 0644]
bin/tests/win32/task_test.dsp.in [new file with mode: 0644]
bin/tests/win32/task_test.dsw [new file with mode: 0644]
bin/tests/win32/task_test.mak.in [new file with mode: 0644]
bin/tests/win32/task_test.vcxproj.filters.in [new file with mode: 0644]
bin/tests/win32/task_test.vcxproj.in [new file with mode: 0644]
bin/tests/win32/task_test.vcxproj.user [new file with mode: 0644]
bin/tests/win32/timer_test.dsp.in [new file with mode: 0644]
bin/tests/win32/timer_test.dsw [new file with mode: 0644]
bin/tests/win32/timer_test.mak.in [new file with mode: 0644]
bin/tests/win32/timer_test.vcxproj.filters.in [new file with mode: 0644]
bin/tests/win32/timer_test.vcxproj.in [new file with mode: 0644]
bin/tests/win32/timer_test.vcxproj.user [new file with mode: 0644]
bin/tools/win32/arpaname.dsp.in [moved from bin/tools/win32/arpaname.dsp with 63% similarity]
bin/tools/win32/arpaname.mak.in [moved from bin/tools/win32/arpaname.mak with 78% similarity]
bin/tools/win32/arpaname.vcxproj.filters.in [new file with mode: 0644]
bin/tools/win32/arpaname.vcxproj.in [new file with mode: 0644]
bin/tools/win32/arpaname.vcxproj.user [new file with mode: 0644]
bin/tools/win32/genrandom.dsp.in [moved from bin/tools/win32/genrandom.dsp with 63% similarity]
bin/tools/win32/genrandom.mak.in [moved from bin/tools/win32/genrandom.mak with 78% similarity]
bin/tools/win32/genrandom.vcxproj.filters.in [new file with mode: 0644]
bin/tools/win32/genrandom.vcxproj.in [new file with mode: 0644]
bin/tools/win32/genrandom.vcxproj.user [new file with mode: 0644]
bin/tools/win32/ischmacfixup.dsp.in [moved from bin/tools/win32/ischmacfixup.dsp with 63% similarity]
bin/tools/win32/ischmacfixup.mak.in [moved from bin/tools/win32/ischmacfixup.mak with 79% similarity]
bin/tools/win32/ischmacfixup.vcxproj.filters.in [new file with mode: 0644]
bin/tools/win32/ischmacfixup.vcxproj.in [new file with mode: 0644]
bin/tools/win32/ischmacfixup.vcxproj.user [new file with mode: 0644]
bin/tools/win32/journalprint.dsp.in [moved from bin/tools/win32/journalprint.dsp with 64% similarity]
bin/tools/win32/journalprint.mak.in [moved from bin/tools/win32/journalprint.mak with 79% similarity]
bin/tools/win32/journalprint.vcxproj.filters.in [new file with mode: 0644]
bin/tools/win32/journalprint.vcxproj.in [new file with mode: 0644]
bin/tools/win32/journalprint.vcxproj.user [new file with mode: 0644]
bin/tools/win32/nsec3hash.dsp.in [moved from bin/tools/win32/nsec3hash.dsp with 64% similarity]
bin/tools/win32/nsec3hash.mak.in [moved from bin/tools/win32/nsec3hash.mak with 79% similarity]
bin/tools/win32/nsec3hash.vcxproj.filters.in [new file with mode: 0644]
bin/tools/win32/nsec3hash.vcxproj.in [new file with mode: 0644]
bin/tools/win32/nsec3hash.vcxproj.user [new file with mode: 0644]
bin/tools/win32/rrchecker.vcxproj.user [new file with mode: 0644]
bin/win32/BINDInstall/AccountInfo.cpp
bin/win32/BINDInstall/BINDInstall.dsp.in [moved from bin/win32/BINDInstall/BINDInstall.dsp with 67% similarity]
bin/win32/BINDInstall/BINDInstall.mak.in [moved from bin/win32/BINDInstall/BINDInstall.mak with 70% similarity]
bin/win32/BINDInstall/BINDInstall.vcxproj.filters.in [new file with mode: 0644]
bin/win32/BINDInstall/BINDInstall.vcxproj.in [new file with mode: 0644]
bin/win32/BINDInstall/BINDInstall.vcxproj.user [new file with mode: 0644]
bin/win32/BINDInstall/BINDInstallDlg.cpp
bin/win32/BINDInstall/StdAfx.h
config.h.win32
lib/bind9/win32/libbind9.dsp.in [moved from lib/bind9/win32/libbind9.dsp with 59% similarity]
lib/bind9/win32/libbind9.mak.in [moved from lib/bind9/win32/libbind9.mak with 63% similarity]
lib/bind9/win32/libbind9.vcxproj.filters.in [new file with mode: 0644]
lib/bind9/win32/libbind9.vcxproj.in [new file with mode: 0644]
lib/bind9/win32/libbind9.vcxproj.user [new file with mode: 0644]
lib/dns/gen.c
lib/dns/gssapi_link.c
lib/dns/gssapictx.c
lib/dns/include/dst/gssapi.h
lib/dns/journal.c
lib/dns/master.c
lib/dns/message.c
lib/dns/nsec.c
lib/dns/nsec3.c
lib/dns/openssldh_link.c
lib/dns/rcode.c
lib/dns/rdata.c
lib/dns/rdata/generic/hip_55.c
lib/dns/rdataslab.c
lib/dns/resolver.c
lib/dns/rootns.c
lib/dns/spnego.c
lib/dns/spnego_asn1.c
lib/dns/ssu_external.c
lib/dns/ttl.c
lib/dns/win32/gen.dsp.in [moved from lib/dns/win32/gen.dsp with 66% similarity]
lib/dns/win32/gen.mak.in [moved from lib/dns/win32/gen.mak with 76% similarity]
lib/dns/win32/gen.vcxproj.filters.in [new file with mode: 0644]
lib/dns/win32/gen.vcxproj.in [new file with mode: 0644]
lib/dns/win32/gen.vcxproj.user [new file with mode: 0644]
lib/dns/win32/libdns.def.in [moved from lib/dns/win32/libdns.def with 99% similarity]
lib/dns/win32/libdns.dsp.in [moved from lib/dns/win32/libdns.dsp with 84% similarity]
lib/dns/win32/libdns.mak.in [moved from lib/dns/win32/libdns.mak with 74% similarity]
lib/dns/win32/libdns.vcxproj.filters.in [new file with mode: 0644]
lib/dns/win32/libdns.vcxproj.in [new file with mode: 0644]
lib/dns/win32/libdns.vcxproj.user [new file with mode: 0644]
lib/dns/zone.c
lib/isc/backtrace.c
lib/isc/base32.c
lib/isc/base64.c
lib/isc/hash.c
lib/isc/heap.c
lib/isc/hex.c
lib/isc/include/isc/file.h
lib/isc/include/isc/hash.h
lib/isc/include/isc/platform.h.in
lib/isc/inet_aton.c
lib/isc/inet_pton.c
lib/isc/lex.c
lib/isc/log.c
lib/isc/mem.c
lib/isc/random.c
lib/isc/unix/file.c
lib/isc/win32/entropy.c
lib/isc/win32/file.c
lib/isc/win32/include/isc/atomic.h [new file with mode: 0644]
lib/isc/win32/include/isc/platform.h.in [moved from lib/isc/win32/include/isc/platform.h with 75% similarity]
lib/isc/win32/interfaceiter.c
lib/isc/win32/libisc.def.in [moved from lib/isc/win32/libisc.def with 98% similarity]
lib/isc/win32/libisc.dsp.in [moved from lib/isc/win32/libisc.dsp with 88% similarity]
lib/isc/win32/libisc.mak.in [moved from lib/isc/win32/libisc.mak with 79% similarity]
lib/isc/win32/libisc.vcxproj.filters.in [new file with mode: 0644]
lib/isc/win32/libisc.vcxproj.in [new file with mode: 0644]
lib/isc/win32/libisc.vcxproj.user [new file with mode: 0644]
lib/isc/win32/net.c
lib/isc/win32/socket.c
lib/isc/win32/stdio.c
lib/isc/win32/stdtime.c
lib/isccc/base64.c
lib/isccc/cc.c
lib/isccc/win32/libisccc.dsp.in [moved from lib/isccc/win32/libisccc.dsp with 66% similarity]
lib/isccc/win32/libisccc.mak.in [moved from lib/isccc/win32/libisccc.mak with 71% similarity]
lib/isccc/win32/libisccc.vcxproj.filters.in [new file with mode: 0644]
lib/isccc/win32/libisccc.vcxproj.in [new file with mode: 0644]
lib/isccc/win32/libisccc.vcxproj.user [new file with mode: 0644]
lib/isccfg/win32/libisccfg.dsp.in [moved from lib/isccfg/win32/libisccfg.dsp with 64% similarity]
lib/isccfg/win32/libisccfg.mak.in [moved from lib/isccfg/win32/libisccfg.mak with 68% similarity]
lib/isccfg/win32/libisccfg.vcxproj.filters.in [new file with mode: 0644]
lib/isccfg/win32/libisccfg.vcxproj.in [new file with mode: 0644]
lib/isccfg/win32/libisccfg.vcxproj.user [new file with mode: 0644]
lib/lwres/context.c
lib/lwres/gethost.c
lib/lwres/lwinetaton.c
lib/lwres/lwinetpton.c
lib/lwres/lwres_gabn.c
lib/lwres/lwres_gnba.c
lib/lwres/lwres_grbn.c
lib/lwres/lwres_noop.c
lib/lwres/win32/include/lwres/netdb.h
lib/lwres/win32/liblwres.dsp.in [moved from lib/lwres/win32/liblwres.dsp with 70% similarity]
lib/lwres/win32/liblwres.mak.in [moved from lib/lwres/win32/liblwres.mak with 77% similarity]
lib/lwres/win32/liblwres.vcxproj.filters.in [new file with mode: 0644]
lib/lwres/win32/liblwres.vcxproj.in [new file with mode: 0644]
lib/lwres/win32/liblwres.vcxproj.user [new file with mode: 0644]
lib/tests/include/tests/t_api.h
lib/tests/t_api.c
lib/tests/win32/DLLMain.c [new file with mode: 0644]
lib/tests/win32/libtests.def [new file with mode: 0644]
lib/tests/win32/libtests.dsp.in [new file with mode: 0644]
lib/tests/win32/libtests.dsw [new file with mode: 0644]
lib/tests/win32/libtests.mak.in [new file with mode: 0644]
lib/tests/win32/libtests.vcxproj.filters.in [new file with mode: 0644]
lib/tests/win32/libtests.vcxproj.in [new file with mode: 0644]
lib/tests/win32/libtests.vcxproj.user [new file with mode: 0644]
lib/win32/bindevt/bindevt.dsp.in [moved from lib/win32/bindevt/bindevt.dsp with 63% similarity]
lib/win32/bindevt/bindevt.mak.in [moved from lib/win32/bindevt/bindevt.mak with 80% similarity]
lib/win32/bindevt/bindevt.vcxproj.filters.in [new file with mode: 0644]
lib/win32/bindevt/bindevt.vcxproj.in [new file with mode: 0644]
lib/win32/bindevt/bindevt.vcxproj.user [new file with mode: 0644]
win32utils/BuildAll.bat [deleted file]
win32utils/BuildSetup.bat [deleted file]
win32utils/Configure [new file with mode: 0644]
win32utils/GeoIP.diff [new file with mode: 0644]
win32utils/SetupLibs.bat [deleted file]
win32utils/bind9.sln.in [new file with mode: 0644]
win32utils/build.txt [new file with mode: 0644]
win32utils/dnsheadergen.bat [deleted file]
win32utils/legacy/BINDBuild.dsw.in [moved from win32utils/BINDBuild.dsw with 52% similarity]
win32utils/legacy/BuildAll.bat.in [new file with mode: 0644]
win32utils/legacy/BuildPost.bat.in [moved from win32utils/BuildPost.bat with 57% similarity]
win32utils/legacy/BuildSetup.bat.in [new file with mode: 0644]
win32utils/legacy/makedefs.pl [moved from win32utils/makedefs.pl with 100% similarity]
win32utils/legacy/win32-build.txt [new file with mode: 0644]
win32utils/makesrcid.pl [deleted file]
win32utils/makeversion.pl [deleted file]
win32utils/setpk11provider.pl [deleted file]
win32utils/updatelibxml2.pl [deleted file]
win32utils/updateopenssl.pl [deleted file]
win32utils/win32-build.txt [deleted file]

diff --git a/CHANGES b/CHANGES
index 064853e04f65461649b2831c39d239cd4af4c805..04773fba52722761a55110c1cbb55665c400a09e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3681.  [port]          Update the Windows build system to support feature
+                       selection and WIN64 builds.  This is a work in
+                       progress. [RT #34160]
+
 3679.  [bug]           dig could fail to clean up TCP sockets still
                        waiting on connect(). [RT #35074]
 
similarity index 61%
rename from bin/check/win32/namedcheckconf.dsp
rename to bin/check/win32/checkconf.dsp.in
index 2c4e1b76b0bbe32d9b3d404e7ab77a698e910706..ab0a676a7d62a9f5fa54c7fb92ed76f210bf433b 100644 (file)
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="namedcheckconf" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="checkconf" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=namedcheckconf - Win32 Debug
+CFG=checkconf - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "namedcheckconf.mak".
+!MESSAGE NMAKE /f "checkconf.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "namedcheckconf.mak" CFG="namedcheckconf - Win32 Debug"
+!MESSAGE NMAKE /f "checkconf.mak" CFG="checkconf - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "namedcheckconf - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "namedcheckconf - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "checkconf - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "checkconf - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=namedcheckconf - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+!IF  "$(CFG)" == "checkconf - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/checktool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named-checkconf.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/checktool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/named-checkconf.exe"
 
-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkconf - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/checktool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/checktool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "namedcheckconf - Win32 Release"
-# Name "namedcheckconf - Win32 Debug"
+# Name "checkconf - @PLATFORM@ Release"
+# Name "checkconf - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 86%
rename from bin/check/win32/namedcheckconf.dsw
rename to bin/check/win32/checkconf.dsw
index 7433eeb2a7c7d845b0474b9b3566e91524cb1cff..6e09cd056d2aad3f1967065d5c14f14139c4cf2b 100644 (file)
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "namedcheckconf"=".\namedcheckconf.dsp" - Package Owner=<4>
+Project: "checkconf"=".\checkconf.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
similarity index 63%
rename from bin/check/win32/namedcheckconf.mak
rename to bin/check/win32/checkconf.mak.in
index 0cd504ac410f033fd13d30f63fd0f287d881d63c..e09cdf53367dbae5499193b55e0aec3390b78dcd 100644 (file)
@@ -1,20 +1,20 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on namedcheckconf.dsp
+# Microsoft Developer Studio Generated NMAKE File, Based on checkconf.dsp
 !IF "$(CFG)" == ""
-CFG=namedcheckconf - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to namedcheckconf - Win32 Debug.
+CFG=checkconf - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to checkconf - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "namedcheckconf - Win32 Release" && "$(CFG)" != "namedcheckconf - Win32 Debug"
+!IF "$(CFG)" != "checkconf - @PLATFORM@ Release" && "$(CFG)" != "checkconf - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "namedcheckconf.mak" CFG="namedcheckconf - Win32 Debug"
+!MESSAGE NMAKE /f "checkconf.mak" CFG="checkconf - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "namedcheckconf - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "namedcheckconf - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "checkconf - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "checkconf - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,7 +28,7 @@ NULL=nul
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+!IF  "$(CFG)" == "checkconf - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -103,7 +103,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+!IF  "$(CFG)" == "checkconf - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -113,16 +113,16 @@ OutDir=.\Release
 
 !IF "$(RECURSE)" == "0" 
 
-ALL : "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"
+ALL : "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\checkconf.bsc"
 
 !ELSE 
 
-ALL : "libdns - Win32 Release" "libisccfg - Win32 Release" "libisc - Win32 Release" "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"
+ALL : "libdns - @PLATFORM@ Release" "libisccfg - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\Build\Release\named-checkconf.exe" "$(OUTDIR)\checkconf.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" "libdns - Win32 ReleaseCLEAN" 
+CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libisccfg - @PLATFORM@ ReleaseCLEAN" "libdns - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -131,27 +131,27 @@ CLEAN :
        -@erase "$(INTDIR)\named-checkconf.obj"
        -@erase "$(INTDIR)\named-checkconf.sbr"
        -@erase "$(INTDIR)\vc60.idb"
-       -@erase "$(OUTDIR)\namedcheckconf.bsc"
+       -@erase "$(OUTDIR)\checkconf.bsc"
        -@erase "..\..\..\Build\Release\named-checkconf.exe"
        -@$(_VC_MANIFEST_CLEAN)
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\namedcheckconf.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\checkconf.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckconf.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\checkconf.bsc" 
 BSC32_SBRS= \
        "$(INTDIR)\check-tool.sbr" \
        "$(INTDIR)\named-checkconf.sbr"
 
-"$(OUTDIR)\namedcheckconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+"$(OUTDIR)\checkconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
     $(BSC32) @<<
   $(BSC32_FLAGS) $(BSC32_SBRS)
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib  ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkconf.pdb" /machine:I386 /out:"../../../Build/Release/named-checkconf.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib  ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkconf.pdb" @MACHINE@ /out:"../../../Build/Release/named-checkconf.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\check-tool.obj" \
        "$(INTDIR)\named-checkconf.obj" \
@@ -165,7 +165,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkconf - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -175,16 +175,16 @@ OutDir=.\Debug
 
 !IF "$(RECURSE)" == "0" 
 
-ALL : "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"
+ALL : "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\checkconf.bsc"
 
 !ELSE 
 
-ALL : "libdns - Win32 Debug" "libisccfg - Win32 Debug" "libisc - Win32 Debug" "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\namedcheckconf.bsc"
+ALL : "libdns - @PLATFORM@ Debug" "libisccfg - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\Build\Debug\named-checkconf.exe" "$(OUTDIR)\checkconf.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" "libdns - Win32 DebugCLEAN" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libisccfg - @PLATFORM@ DebugCLEAN" "libdns - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -195,7 +195,7 @@ CLEAN :
        -@erase "$(INTDIR)\vc60.idb"
        -@erase "$(INTDIR)\vc60.pdb"
        -@erase "$(OUTDIR)\named-checkconf.pdb"
-       -@erase "$(OUTDIR)\namedcheckconf.bsc"
+       -@erase "$(OUTDIR)\checkconf.bsc"
        -@erase "..\..\..\Build\Debug\named-checkconf.exe"
        -@erase "..\..\..\Build\Debug\named-checkconf.ilk"
        -@$(_VC_MANIFEST_CLEAN)
@@ -203,20 +203,20 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckconf.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\checkconf.bsc" 
 BSC32_SBRS= \
        "$(INTDIR)\check-tool.sbr" \
        "$(INTDIR)\named-checkconf.sbr"
 
-"$(OUTDIR)\namedcheckconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+"$(OUTDIR)\checkconf.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
     $(BSC32) @<<
   $(BSC32_FLAGS) $(BSC32_SBRS)
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib  ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkconf.pdb" /debug /machine:I386 /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib  ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkconf.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/named-checkconf.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\check-tool.obj" \
        "$(INTDIR)\named-checkconf.obj" \
@@ -264,15 +264,15 @@ LINK32_OBJS= \
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("namedcheckconf.dep")
-!INCLUDE "namedcheckconf.dep"
+!IF EXISTS("checkconf.dep")
+!INCLUDE "checkconf.dep"
 !ELSE 
-!MESSAGE Warning: cannot find "namedcheckconf.dep"
+!MESSAGE Warning: cannot find "checkconf.dep"
 !ENDIF 
 !ENDIF 
 
 
-!IF "$(CFG)" == "namedcheckconf - Win32 Release" || "$(CFG)" == "namedcheckconf - Win32 Debug"
+!IF "$(CFG)" == "checkconf - @PLATFORM@ Release" || "$(CFG)" == "checkconf - @PLATFORM@ Debug"
 SOURCE="..\check-tool.c"
 
 "$(INTDIR)\check-tool.obj"     "$(INTDIR)\check-tool.sbr" : $(SOURCE) "$(INTDIR)"
@@ -285,80 +285,80 @@ SOURCE="..\named-checkconf.c"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+!IF  "$(CFG)" == "checkconf - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\..\bin\check\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkconf - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\check\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+!IF  "$(CFG)" == "checkconf - @PLATFORM@ Release"
 
-"libisccfg - Win32 Release" : 
+"libisccfg - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" 
    cd "..\..\..\bin\check\win32"
 
-"libisccfg - Win32 ReleaseCLEAN" : 
+"libisccfg - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkconf - @PLATFORM@ Debug"
 
-"libisccfg - Win32 Debug" : 
+"libisccfg - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" 
    cd "..\..\..\bin\check\win32"
 
-"libisccfg - Win32 DebugCLEAN" : 
+"libisccfg - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "namedcheckconf - Win32 Release"
+!IF  "$(CFG)" == "checkconf - @PLATFORM@ Release"
 
-"libdns - Win32 Release" : 
+"libdns - @PLATFORM@ Release" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
    cd "..\..\..\bin\check\win32"
 
-"libdns - Win32 ReleaseCLEAN" : 
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
-!ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkconf - @PLATFORM@ Debug"
 
-"libdns - Win32 Debug" : 
+"libdns - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
    cd "..\..\..\bin\check\win32"
 
-"libdns - Win32 DebugCLEAN" : 
+"libdns - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ENDIF 
diff --git a/bin/check/win32/checkconf.vcxproj.filters.in b/bin/check/win32/checkconf.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..0f22cd3
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\check-tool.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\named-checkconf.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/check/win32/checkconf.vcxproj.in b/bin/check/win32/checkconf.vcxproj.in
new file mode 100644 (file)
index 0000000..2ef58e1
--- /dev/null
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{03A96113-CB14-43AA-AEB2-48950E3915C5}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>checkconf</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>named-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>named-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\check-tool.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\named-checkconf.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/check/win32/checkconf.vcxproj.user b/bin/check/win32/checkconf.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 62%
rename from bin/check/win32/checktool.dsp
rename to bin/check/win32/checktool.dsp.in
index f6b6c4c620f5c1ca833daa17ac1290aacc3504d8..ddb4729c239bd5b23440b205720844e4d1c9633d 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Static-Link Library" 0x0104
+# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104
 
-CFG=checktool - Win32 Debug
+CFG=checktool - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=checktool - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "checktool.mak" CFG="checktool - Win32 Debug"
+!MESSAGE NMAKE /f "checktool.mak" CFG="checktool - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "checktool - Win32 Release" (based on "Win32 (x86) Static-Link Library")
-!MESSAGE "checktool - Win32 Debug" (based on "Win32 (x86) Static-Link Library")
+!MESSAGE "checktool - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library")
+!MESSAGE "checktool - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "checktool - Win32 Release"
+!IF  "$(CFG)" == "checktool - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /YX /FD /c /Fdchecktool
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fdchecktool
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -56,7 +56,7 @@ LINK32=link.exe
 # ADD BASE LINK32 
 # ADD LINK32 /out:"Release/checktool.lib"
 
-!ELSEIF  "$(CFG)" == "checktool - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checktool - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR /YX /FD /GZ /c /Fdchecktool
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fdchecktool
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -87,8 +87,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "checktool - Win32 Release"
-# Name "checktool - Win32 Debug"
+# Name "checktool - @PLATFORM@ Release"
+# Name "checktool - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/bin/check/win32/checktool.vcxproj.filters.in b/bin/check/win32/checktool.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..09713e4
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\check-tool.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/check/win32/checktool.vcxproj.in b/bin/check/win32/checktool.vcxproj.in
new file mode 100644 (file)
index 0000000..2ece5fa
--- /dev/null
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\check-tool.c" />\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{2C1F7096-C5B5-48D4-846F-A7ACA454335D}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>checktool</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>.\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>.\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/check/win32/checktool.vcxproj.user b/bin/check/win32/checktool.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 61%
rename from bin/check/win32/namedcheckzone.dsp
rename to bin/check/win32/checkzone.dsp.in
index fda7a6ddb632d7bd2a3cf5588fc75d5c91f9db6e..8662daf38287c731c584382200a454856b170db4 100644 (file)
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="namedcheckzone" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="checkzone" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=namedcheckzone - Win32 Debug
+CFG=checkzone - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "namedcheckzone.mak".
+!MESSAGE NMAKE /f "checkzone.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "namedcheckzone.mak" CFG="namedcheckzone - Win32 Debug"
+!MESSAGE NMAKE /f "checkzone.mak" CFG="checkzone - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "namedcheckzone - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "namedcheckzone - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "checkzone - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "checkzone - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=namedcheckzone - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+!IF  "$(CFG)" == "checkzone - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,8 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" @COPTY@ /FD /c
 # SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -50,10 +50,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/checktool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named-checkzone.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/checktool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/named-checkzone.exe"
 
-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkzone - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -66,24 +66,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/checktool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/checktool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "namedcheckzone - Win32 Release"
-# Name "namedcheckzone - Win32 Debug"
+# Name "checkzone - @PLATFORM@ Release"
+# Name "checkzone - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/bin/check/win32/checkzone.dsw b/bin/check/win32/checkzone.dsw
new file mode 100644 (file)
index 0000000..0173dba
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "checkzone"=".\checkzone.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
similarity index 66%
rename from bin/check/win32/namedcheckzone.mak
rename to bin/check/win32/checkzone.mak.in
index df0e6817b275c097182b16a67799bcdd4b303727..11b074a09da730be9aab7cf5283e0838d69e3827 100644 (file)
@@ -1,20 +1,20 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on namedcheckzone.dsp
+# Microsoft Developer Studio Generated NMAKE File, Based on checkzone.dsp
 !IF "$(CFG)" == ""
-CFG=namedcheckzone - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to namedcheckzone - Win32 Debug.
+CFG=checkzone - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to checkzone - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "namedcheckzone - Win32 Release" && "$(CFG)" != "namedcheckzone - Win32 Debug"
+!IF "$(CFG)" != "checkzone - @PLATFORM@ Release" && "$(CFG)" != "checkzone - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "namedcheckzone.mak" CFG="namedcheckzone - Win32 Debug"
+!MESSAGE NMAKE /f "checkzone.mak" CFG="checkzone - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "namedcheckzone - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "namedcheckzone - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "checkzone - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "checkzone - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+!IF  "$(CFG)" == "checkzone - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+!IF  "$(CFG)" == "checkzone - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -111,12 +111,12 @@ ALL : "..\..\..\Build\Release\named-checkzone.exe"
 
 !ELSE 
 
-ALL : "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\named-checkzone.exe"
+ALL : "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\named-checkzone.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -130,7 +130,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /Fp"$(INTDIR)\namedcheckzone.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /Fp"$(INTDIR)\checkzone.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -164,11 +164,11 @@ CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-
 
 RSC=rc.exe
 BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckzone.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\checkzone.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkzone.pdb" /machine:I386 /out:"../../../Build/Release/named-checkzone.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkzone.pdb" @MACHINE@ /out:"../../../Build/Release/named-checkzone.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\check-tool.obj" \
        "$(INTDIR)\named-checkzone.obj" \
@@ -182,7 +182,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkzone - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -192,16 +192,16 @@ OutDir=.\Debug
 
 !IF "$(RECURSE)" == "0" 
 
-ALL : "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\namedcheckzone.bsc"
+ALL : "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\checkzone.bsc"
 
 !ELSE 
 
-ALL : "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\namedcheckzone.bsc"
+ALL : "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\named-checkzone.exe" "$(OUTDIR)\checkzone.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -212,7 +212,7 @@ CLEAN :
        -@erase "$(INTDIR)\vc60.idb"
        -@erase "$(INTDIR)\vc60.pdb"
        -@erase "$(OUTDIR)\named-checkzone.pdb"
-       -@erase "$(OUTDIR)\namedcheckzone.bsc"
+       -@erase "$(OUTDIR)\checkzone.bsc"
        -@erase "..\..\..\Build\Debug\named-checkzone.exe"
        -@erase "..\..\..\Build\Debug\named-checkzone.ilk"
        -@$(_VC_MANIFEST_CLEAN)
@@ -221,7 +221,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /I "../../../lib/isccfg/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -255,18 +255,18 @@ CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../..
 
 RSC=rc.exe
 BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckzone.bsc" 
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\checkzone.bsc" 
 BSC32_SBRS= \
        "$(INTDIR)\check-tool.sbr" \
        "$(INTDIR)\named-checkzone.sbr"
 
-"$(OUTDIR)\namedcheckzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+"$(OUTDIR)\checkzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
     $(BSC32) @<<
   $(BSC32_FLAGS) $(BSC32_SBRS)
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkzone.pdb" /debug /machine:I386 /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkzone.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\check-tool.obj" \
        "$(INTDIR)\named-checkzone.obj" \
@@ -284,25 +284,25 @@ LINK32_OBJS= \
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("namedcheckzone.dep")
-!INCLUDE "namedcheckzone.dep"
+!IF EXISTS("checkzone.dep")
+!INCLUDE "checkzone.dep"
 !ELSE 
-!MESSAGE Warning: cannot find "namedcheckzone.dep"
+!MESSAGE Warning: cannot find "checkzone.dep"
 !ENDIF 
 !ENDIF 
 
 
-!IF "$(CFG)" == "namedcheckzone - Win32 Release" || "$(CFG)" == "namedcheckzone - Win32 Debug"
+!IF "$(CFG)" == "checkzone - @PLATFORM@ Release" || "$(CFG)" == "checkzone - @PLATFORM@ Debug"
 SOURCE="..\check-tool.c"
 
-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+!IF  "$(CFG)" == "checkzone - @PLATFORM@ Release"
 
 
 "$(INTDIR)\check-tool.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkzone - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\check-tool.obj"     "$(INTDIR)\check-tool.sbr" : $(SOURCE) "$(INTDIR)"
@@ -313,14 +313,14 @@ SOURCE="..\check-tool.c"
 
 SOURCE="..\named-checkzone.c"
 
-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+!IF  "$(CFG)" == "checkzone - @PLATFORM@ Release"
 
 
 "$(INTDIR)\named-checkzone.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkzone - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\named-checkzone.obj"        "$(INTDIR)\named-checkzone.sbr" : $(SOURCE) "$(INTDIR)"
@@ -329,54 +329,54 @@ SOURCE="..\named-checkzone.c"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+!IF  "$(CFG)" == "checkzone - @PLATFORM@ Release"
 
-"libdns - Win32 Release" : 
+"libdns - @PLATFORM@ Release" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
    cd "..\..\..\bin\check\win32"
 
-"libdns - Win32 ReleaseCLEAN" : 
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkzone - @PLATFORM@ Debug"
 
-"libdns - Win32 Debug" : 
+"libdns - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
    cd "..\..\..\bin\check\win32"
 
-"libdns - Win32 DebugCLEAN" : 
+"libdns - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+!IF  "$(CFG)" == "checkzone - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\..\bin\check\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
-!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "checkzone - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\check\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ENDIF 
diff --git a/bin/check/win32/checkzone.vcxproj.filters.in b/bin/check/win32/checkzone.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..3333da2
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\check-tool.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\named-checkzone.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/check/win32/checkzone.vcxproj.in b/bin/check/win32/checkzone.vcxproj.in
new file mode 100644 (file)
index 0000000..04cfbfd
--- /dev/null
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{66028555-7DD5-4016-B601-9EF9A1EE8BFA}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>checkzone</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>named-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>named-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>cd ..\..\..\Build\$(Configuration)\r
+copy /Y named-checkzone.exe named-compilezone.exe\r
+copy /Y named-checkzone.ilk named-compilezone.ilk\r
+</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>checktool.lib;libisc.lib;libdns.lib;libisccfg.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>cd ..\..\..\Build\$(Configuration)\r
+copy /Y named-checkzone.exe named-compilezone.exe\r
+</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\check-tool.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\named-checkzone.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/check/win32/checkzone.vcxproj.user b/bin/check/win32/checkzone.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 66%
rename from bin/confgen/win32/confgentool.dsp
rename to bin/confgen/win32/confgentool.dsp.in
index 786222ad997a940cebe95f060b717625aed50e2f..833361b951a9d9cb7069e456d577dbf5e301005f 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Static-Link Library" 0x0104
+# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104
 
-CFG=confgentool - Win32 Debug
+CFG=confgentool - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=confgentool - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "confgentool.mak" CFG="confgentool - Win32 Debug"
+!MESSAGE NMAKE /f "confgentool.mak" CFG="confgentool - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "confgentool - Win32 Release" (based on "Win32 (x86) Static-Link Library")
-!MESSAGE "confgentool - Win32 Debug" (based on "Win32 (x86) Static-Link Library")
+!MESSAGE "confgentool - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library")
+!MESSAGE "confgentool - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "confgentool - Win32 Release"
+!IF  "$(CFG)" == "confgentool - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /YX /FD /c /Fdconfgentool
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fdconfgentool
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -59,7 +59,7 @@ LIB32=lib.exe
 # ADD BASE LIB32
 # ADD LIB32 /out:"Release/confgentool.lib"
 
-!ELSEIF  "$(CFG)" == "confgentool - Win32 Debug"
+!ELSEIF  "$(CFG)" == "confgentool - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -72,8 +72,8 @@ LIB32=lib.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR /YX /FD /GZ /c /Fdconfgentool
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fdconfgentool
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -93,8 +93,8 @@ LIB32=lib.exe
 
 # Begin Target
 
-# Name "confgentool - Win32 Release"
-# Name "confgentool - Win32 Debug"
+# Name "confgentool - @PLATFORM@ Release"
+# Name "confgentool - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/bin/confgen/win32/confgentool.vcxproj.filters.in b/bin/confgen/win32/confgentool.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..54b7e00
--- /dev/null
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\keygen.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\util.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\confgen\os.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\keygen.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\util.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="os.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/confgen/win32/confgentool.vcxproj.in b/bin/confgen/win32/confgentool.vcxproj.in
new file mode 100644 (file)
index 0000000..30da58c
--- /dev/null
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{64964B03-4815-41F0-9057-E766A94AF197}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>confgentool</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\confgen\os.h" />\r
+    <ClInclude Include="..\keygen.h" />\r
+    <ClInclude Include="..\util.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\keygen.c" />\r
+    <ClCompile Include="..\util.c" />\r
+    <ClCompile Include="os.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/confgen/win32/confgentool.vcxproj.user b/bin/confgen/win32/confgentool.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 63%
rename from bin/confgen/win32/ddnsconfgen.dsp
rename to bin/confgen/win32/ddnsconfgen.dsp.in
index b62c1794d836793e267ebd65ce847c61b0fae9c2..625351de9b43ee12515a0f52e52012bd0226265a 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=ddnsconfgen - Win32 Debug
+CFG=ddnsconfgen - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=ddnsconfgen - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "ddnsconfgen.mak" CFG="ddnsconfgen - Win32 Debug"
+!MESSAGE NMAKE /f "ddnsconfgen.mak" CFG="ddnsconfgen - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ddnsconfgen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ddnsconfgen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "ddnsconfgen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "ddnsconfgen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=ddnsconfgen - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ddnsconfgen - Win32 Release"
+!IF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/confgentool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/ddns-confgen.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/confgentool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/ddns-confgen.exe"
 
-!ELSEIF  "$(CFG)" == "ddnsconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/confgentool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/ddns-confgen.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/confgentool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/ddns-confgen.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "ddnsconfgen - Win32 Release"
-# Name "ddnsconfgen - Win32 Debug"
+# Name "ddnsconfgen - @PLATFORM@ Release"
+# Name "ddnsconfgen - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 76%
rename from bin/confgen/win32/ddnsconfgen.mak
rename to bin/confgen/win32/ddnsconfgen.mak.in
index 8605077bac332c1c2092905c92e52306024a98fe..9433404abb9842611216525ef7b3f84fb960b611 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on ddnsconfgen.dsp
 !IF "$(CFG)" == ""
-CFG=ddnsconfgen - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to ddnsconfgen - Win32 Debug.
+CFG=ddnsconfgen - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to ddnsconfgen - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "ddnsconfgen - Win32 Release" && "$(CFG)" != "ddnsconfgen - Win32 Debug"
+!IF "$(CFG)" != "ddnsconfgen - @PLATFORM@ Release" && "$(CFG)" != "ddnsconfgen - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "ddnsconfgen.mak" CFG="ddnsconfgen - Win32 Debug"
+!MESSAGE NMAKE /f "ddnsconfgen.mak" CFG="ddnsconfgen - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ddnsconfgen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ddnsconfgen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "ddnsconfgen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "ddnsconfgen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,7 +28,7 @@ NULL=nul
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ddnsconfgen - Win32 Release"
+!IF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -103,7 +103,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "ddnsconfgen - Win32 Release"
+!IF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -123,13 +123,13 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\ddnsconfgen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\ddnsconfgen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\ddnsconfgen.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\ddns-confgen.pdb" /machine:I386 /out:"../../../Build/Release/ddns-confgen.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\ddns-confgen.pdb" @MACHINE@ /out:"../../../Build/Release/ddns-confgen.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\os.obj" \
        "$(INTDIR)\ddns-confgen.obj" \
@@ -142,7 +142,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "ddnsconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -173,7 +173,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\ddnsconfgen.bsc" 
 BSC32_SBRS= \
@@ -188,7 +188,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ddns-confgen.pdb" /debug /machine:I386 /out:"../../../Build/Debug/ddns-confgen.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ddns-confgen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/ddns-confgen.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\os.obj" \
        "$(INTDIR)\ddns-confgen.obj" \
@@ -243,16 +243,16 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "ddnsconfgen - Win32 Release" || "$(CFG)" == "ddnsconfgen - Win32 Debug"
+!IF "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release" || "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug"
 SOURCE=.\os.c
 
-!IF  "$(CFG)" == "ddnsconfgen - Win32 Release"
+!IF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "ddnsconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\os.obj"     "$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"
@@ -262,14 +262,14 @@ SOURCE=.\os.c
 
 SOURCE="..\ddns-confgen.c"
 
-!IF  "$(CFG)" == "ddnsconfgen - Win32 Release"
+!IF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ddns-confgen.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "ddnsconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ddns-confgen.obj"   "$(INTDIR)\ddns-confgen.sbr" : $(SOURCE) "$(INTDIR)"
@@ -280,14 +280,14 @@ SOURCE="..\ddns-confgen.c"
 
 SOURCE=..\keygen.c
 
-!IF  "$(CFG)" == "ddnsconfgen - Win32 Release"
+!IF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\keygen.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "ddnsconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\keygen.obj" "$(INTDIR)\keygen.sbr" : $(SOURCE) "$(INTDIR)"
@@ -298,14 +298,14 @@ SOURCE=..\keygen.c
 
 SOURCE=..\util.c
 
-!IF  "$(CFG)" == "ddnsconfgen - Win32 Release"
+!IF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "ddnsconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ddnsconfgen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\util.obj"   "$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/confgen/win32/ddnsconfgen.vcxproj.filters.in b/bin/confgen/win32/ddnsconfgen.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..8988256
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\ddns-confgen.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/confgen/win32/ddnsconfgen.vcxproj.in b/bin/confgen/win32/ddnsconfgen.vcxproj.in
new file mode 100644 (file)
index 0000000..2495fa7
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{1EA4FC64-F33B-4A50-970A-EA052BBE9CF1}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>ddnsconfgen</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>ddns-confgen</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>ddns-confgen</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\ddns-confgen.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/confgen/win32/ddnsconfgen.vcxproj.user b/bin/confgen/win32/ddnsconfgen.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 63%
rename from bin/confgen/win32/rndcconfgen.dsp
rename to bin/confgen/win32/rndcconfgen.dsp.in
index 32960f105114379f9bc1bc9e4bdf9771dbf893e9..e4569c6aaa660ed7e68fd83e13d060e4d3ccae69 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=rndcconfgen - Win32 Debug
+CFG=rndcconfgen - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=rndcconfgen - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "rndcconfgen.mak" CFG="rndcconfgen - Win32 Debug"
+!MESSAGE NMAKE /f "rndcconfgen.mak" CFG="rndcconfgen - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "rndcconfgen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rndcconfgen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "rndcconfgen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "rndcconfgen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=rndcconfgen - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+!IF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/confgentool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/rndc-confgen.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/confgentool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/rndc-confgen.exe"
 
-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/confgentool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/confgentool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "rndcconfgen - Win32 Release"
-# Name "rndcconfgen - Win32 Debug"
+# Name "rndcconfgen - @PLATFORM@ Release"
+# Name "rndcconfgen - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 76%
rename from bin/confgen/win32/rndcconfgen.mak
rename to bin/confgen/win32/rndcconfgen.mak.in
index 82760c55db64f2d52907fe78ae5c8c4cf7f54d7b..4b0814de809d3e69bd69fe1215d60c915cf43e28 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on confgen.dsp
 !IF "$(CFG)" == ""
-CFG=rndcconfgen - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to rndcconfgen - Win32 Debug.
+CFG=rndcconfgen - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to rndcconfgen - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "rndcconfgen - Win32 Release" && "$(CFG)" != "rndcconfgen - Win32 Debug"
+!IF "$(CFG)" != "rndcconfgen - @PLATFORM@ Release" && "$(CFG)" != "rndcconfgen - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "rndcconfgen.mak" CFG="rndcconfgen - Win32 Debug"
+!MESSAGE NMAKE /f "rndcconfgen.mak" CFG="rndcconfgen - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "rndcconfgen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rndcconfgen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "rndcconfgen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "rndcconfgen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,7 +28,7 @@ NULL=nul
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+!IF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -103,7 +103,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+!IF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -123,13 +123,13 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\confgen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\confgen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\confgen.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rndc-confgen.pdb" /machine:I386 /out:"../../../Build/Release/rndc-confgen.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rndc-confgen.pdb" @MACHINE@ /out:"../../../Build/Release/rndc-confgen.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\os.obj" \
        "$(INTDIR)\rndc-confgen.obj" \
@@ -142,7 +142,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -173,7 +173,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\confgen.bsc" 
 BSC32_SBRS= \
@@ -188,7 +188,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc-confgen.pdb" /debug /machine:I386 /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc-confgen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/rndc-confgen.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\os.obj" \
        "$(INTDIR)\rndc-confgen.obj" \
@@ -243,16 +243,16 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "rndcconfgen - Win32 Release" || "$(CFG)" == "rndcconfgen - Win32 Debug"
+!IF "$(CFG)" == "rndcconfgen - @PLATFORM@ Release" || "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug"
 SOURCE=.\os.c
 
-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+!IF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\os.obj"     "$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"
@@ -262,14 +262,14 @@ SOURCE=.\os.c
 
 SOURCE="..\rndc-confgen.c"
 
-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+!IF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rndc-confgen.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rndc-confgen.obj"   "$(INTDIR)\rndc-confgen.sbr" : $(SOURCE) "$(INTDIR)"
@@ -280,14 +280,14 @@ SOURCE="..\rndc-confgen.c"
 
 SOURCE=..\keygen.c
 
-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+!IF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\keygen.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\keygen.obj" "$(INTDIR)\keygen.sbr" : $(SOURCE) "$(INTDIR)"
@@ -298,14 +298,14 @@ SOURCE=..\keygen.c
 
 SOURCE=..\util.c
 
-!IF  "$(CFG)" == "rndcconfgen - Win32 Release"
+!IF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "rndcconfgen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndcconfgen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\util.obj"   "$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/confgen/win32/rndcconfgen.vcxproj.filters.in b/bin/confgen/win32/rndcconfgen.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..75ba5d6
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\rndc-confgen.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/confgen/win32/rndcconfgen.vcxproj.in b/bin/confgen/win32/rndcconfgen.vcxproj.in
new file mode 100644 (file)
index 0000000..1ad57c5
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{1E2C1635-3093-4D59-80E7-4743AC10F22F}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>rndcconfgen</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>rndc-confgen</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>rndc-confgen</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>confgentool.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\rndc-confgen.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/confgen/win32/rndcconfgen.vcxproj.user b/bin/confgen/win32/rndcconfgen.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 06bb082ba3109338c1e344b1c26a141b8d80594c..7adeb555308199a713c3865c20c30cde3c846ba4 100644 (file)
@@ -467,7 +467,7 @@ reverse_octets(const char *in, char **p, char *end) {
                result = append(".", 1, p, end);
                if (result != ISC_R_SUCCESS)
                        return (result);
-               len = dot - in;
+               len = (int)(dot - in);
        } else {
                len = strlen(in);
        }
@@ -497,7 +497,7 @@ get_reverse(char *reverse, size_t len, char *value, isc_boolean_t ip6_int,
                result = dns_byaddr_createptrname2(&addr, options, name);
                if (result != ISC_R_SUCCESS)
                        return (result);
-               dns_name_format(name, reverse, len);
+               dns_name_format(name, reverse, (unsigned int)len);
                return (ISC_R_SUCCESS);
        } else {
                /*
@@ -3975,7 +3975,7 @@ output_filter(isc_buffer_t *buffer, unsigned int used_org,
 
        isc_buffer_subtract(buffer, isc_buffer_usedlength(buffer) - used_org);
        memcpy(isc_buffer_used(buffer), tmp1, tolen);
-       isc_buffer_add(buffer, tolen);
+       isc_buffer_add(buffer, (unsigned int)tolen);
 
        return (ISC_R_SUCCESS);
 }
similarity index 62%
rename from bin/dig/win32/dig.dsp
rename to bin/dig/win32/dig.dsp.in
index db03dfbc52ddcd6c80117de9e930ba7a462260ed..1993f6d8c327a9098e2576f470b35270da497668 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=dig - Win32 Debug
+CFG=dig - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=dig - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "dig.mak" CFG="dig - Win32 Debug"
+!MESSAGE NMAKE /f "dig.mak" CFG="dig - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "dig - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dig - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "dig - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "dig - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=dig - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "dig - Win32 Release"
+!IF  "$(CFG)" == "dig - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/dighost.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dig.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/dighost.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib @IDN_LIB@ /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dig.exe"
 
-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dig - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /u /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /u @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/dighost.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dig.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/dighost.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dig.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "dig - Win32 Release"
-# Name "dig - Win32 Debug"
+# Name "dig - @PLATFORM@ Release"
+# Name "dig - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 61%
rename from bin/dig/win32/dig.mak
rename to bin/dig/win32/dig.mak.in
index 4e33508068074b468b826ead10fd31a35cb0d76b..1fc8d0226ab1ff380bc152f687907ac9a5a298d6 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on dig.dsp
 !IF "$(CFG)" == ""
-CFG=dig - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to dig - Win32 Debug.
+CFG=dig - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to dig - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "dig - Win32 Release" && "$(CFG)" != "dig - Win32 Debug"
+!IF "$(CFG)" != "dig - @PLATFORM@ Release" && "$(CFG)" != "dig - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "dig.mak" CFG="dig - Win32 Debug"
+!MESSAGE NMAKE /f "dig.mak" CFG="dig - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "dig - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dig - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "dig - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "dig - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,7 +28,7 @@ NULL=nul
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "dig - Win32 Release"
+!IF  "$(CFG)" == "dig - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -103,7 +103,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "dig - Win32 Release"
+!IF  "$(CFG)" == "dig - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -114,12 +114,12 @@ ALL : "..\..\..\Build\Release\dig.exe"
 
 !ELSE 
 
-ALL : "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\dig.exe"
+ALL : "liblwres - @PLATFORM@ Release" "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\dig.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" "liblwres - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -132,13 +132,13 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\dig.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\dig.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\dig.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dig.pdb" /machine:I386 /out:"../../../Build/Release/dig.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dig.pdb" @MACHINE@ /out:"../../../Build/Release/dig.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\dig.obj" \
        "$(INTDIR)\dighost.obj" \
@@ -154,7 +154,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dig - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -168,12 +168,12 @@ ALL : "..\..\..\Build\Debug\dig.exe" "$(OUTDIR)\dig.bsc"
 
 !ELSE 
 
-ALL : "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\dig.exe" "$(OUTDIR)\dig.bsc"
+ALL : "liblwres - @PLATFORM@ Debug" "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\dig.exe" "$(OUTDIR)\dig.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" "liblwres - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -192,7 +192,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\dig.bsc" 
 BSC32_SBRS= \
@@ -205,7 +205,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dig.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dig.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dig.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dig.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\dig.obj" \
        "$(INTDIR)\dighost.obj" \
@@ -263,17 +263,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "dig - Win32 Release" || "$(CFG)" == "dig - Win32 Debug"
+!IF "$(CFG)" == "dig - @PLATFORM@ Release" || "$(CFG)" == "dig - @PLATFORM@ Debug"
 SOURCE=..\dig.c
 
-!IF  "$(CFG)" == "dig - Win32 Release"
+!IF  "$(CFG)" == "dig - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dig.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dig - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dig.obj"    "$(INTDIR)\dig.sbr" : $(SOURCE) "$(INTDIR)"
@@ -284,14 +284,14 @@ SOURCE=..\dig.c
 
 SOURCE=..\dighost.c
 
-!IF  "$(CFG)" == "dig - Win32 Release"
+!IF  "$(CFG)" == "dig - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dig - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dighost.obj"        "$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)"
@@ -300,106 +300,106 @@ SOURCE=..\dighost.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "dig - Win32 Release"
+!IF  "$(CFG)" == "dig - @PLATFORM@ Release"
 
-"libdns - Win32 Release" : 
+"libdns - @PLATFORM@ Release" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"libdns - Win32 ReleaseCLEAN" : 
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dig - @PLATFORM@ Debug"
 
-"libdns - Win32 Debug" : 
+"libdns - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"libdns - Win32 DebugCLEAN" : 
+"libdns - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "dig - Win32 Release"
+!IF  "$(CFG)" == "dig - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dig - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "dig - Win32 Release"
+!IF  "$(CFG)" == "dig - @PLATFORM@ Release"
 
-"libbind9 - Win32 Release" : 
+"libbind9 - @PLATFORM@ Release" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"libbind9 - Win32 ReleaseCLEAN" : 
+"libbind9 - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dig - @PLATFORM@ Debug"
 
-"libbind9 - Win32 Debug" : 
+"libbind9 - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"libbind9 - Win32 DebugCLEAN" : 
+"libbind9 - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "dig - Win32 Release"
+!IF  "$(CFG)" == "dig - @PLATFORM@ Release"
 
-"liblwres - Win32 Release" : 
+"liblwres - @PLATFORM@ Release" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"liblwres - Win32 ReleaseCLEAN" : 
+"liblwres - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "dig - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dig - @PLATFORM@ Debug"
 
-"liblwres - Win32 Debug" : 
+"liblwres - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"liblwres - Win32 DebugCLEAN" : 
+"liblwres - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
diff --git a/bin/dig/win32/dig.vcxproj.filters.in b/bin/dig/win32/dig.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..ad8ee78
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\dig\dig.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dig.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dig/win32/dig.vcxproj.in b/bin/dig/win32/dig.vcxproj.in
new file mode 100644 (file)
index 0000000..59c0852
--- /dev/null
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{F938F9B8-D395-4A40-BEC7-0122D289C692}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>dig</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\include;..\..\..\;@LIBXML2_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dighost.lib;libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\include;..\..\..\;@LIBXML2_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dighost.lib;libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;@IDN_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\dig\dig.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dig.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dig/win32/dig.vcxproj.user b/bin/dig/win32/dig.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 59%
rename from bin/dig/win32/dighost.dsp
rename to bin/dig/win32/dighost.dsp.in
index 51a2b0f5b5e3cb025b27c7b0c358b96487a79cea..4d6c1a2c5aa133debdde141e658c436cb3ef685a 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Static-Link Library" 0x0104
+# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104
 
-CFG=dighost - Win32 Debug
+CFG=dighost - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=dighost - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "dighost.mak" CFG="dighost - Win32 Debug"
+!MESSAGE NMAKE /f "dighost.mak" CFG="dighost - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "dighost - Win32 Release" (based on "Win32 (x86) Static-Link Library")
-!MESSAGE "dighost - Win32 Debug" (based on "Win32 (x86) Static-Link Library")
+!MESSAGE "dighost - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library")
+!MESSAGE "dighost - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "dighost - Win32 Release"
+!IF  "$(CFG)" == "dighost - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /YX /FD /c /Fddighost
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fddighost
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -56,7 +56,7 @@ LINK32=link.exe
 # ADD BASE LINK32 
 # ADD LINK32 /out:"Release/dighost.lib"
 
-!ELSEIF  "$(CFG)" == "dighost - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dighost - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR /YX /FD /GZ /c /Fddighost
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fddighost
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -87,8 +87,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "dighost - Win32 Release"
-# Name "dighost - Win32 Debug"
+# Name "dighost - @PLATFORM@ Release"
+# Name "dighost - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/bin/dig/win32/dighost.vcxproj.filters.in b/bin/dig/win32/dighost.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..f7370b2
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dighost.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dig/win32/dighost.vcxproj.in b/bin/dig/win32/dighost.vcxproj.in
new file mode 100644 (file)
index 0000000..f42867a
--- /dev/null
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{140DE800-E552-43CC-B0C7-A33A92E368CA}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>dighost</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@IDN_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@@IDN_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dighost.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dig/win32/dighost.vcxproj.user b/bin/dig/win32/dighost.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 62%
rename from bin/dig/win32/host.dsp
rename to bin/dig/win32/host.dsp.in
index aa0c600bc6d9c7538a6f1778f02701ab96a3a0fe..1e81bcd9b3966067efdb48690da71aaf5a0fce25 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=host - Win32 Debug
+CFG=host - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=host - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "host.mak" CFG="host - Win32 Debug"
+!MESSAGE NMAKE /f "host.mak" CFG="host - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "host - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "host - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "host - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "host - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=host - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "host - Win32 Release"
+!IF  "$(CFG)" == "host - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/dighost.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/host.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/dighost.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib @IDN_LIB@ /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/host.exe"
 
-!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+!ELSEIF  "$(CFG)" == "host - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /u /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /u @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/dighost.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/host.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/dighost.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/host.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "host - Win32 Release"
-# Name "host - Win32 Debug"
+# Name "host - @PLATFORM@ Release"
+# Name "host - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 61%
rename from bin/dig/win32/host.mak
rename to bin/dig/win32/host.mak.in
index ec02686109250cfdff55b9da013df9ff3826b596..67850b4a243052679f9dce5993b19df048f3ec7d 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on host.dsp
 !IF "$(CFG)" == ""
-CFG=host - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to host - Win32 Debug.
+CFG=host - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to host - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "host - Win32 Release" && "$(CFG)" != "host - Win32 Debug"
+!IF "$(CFG)" != "host - @PLATFORM@ Release" && "$(CFG)" != "host - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "host.mak" CFG="host - Win32 Debug"
+!MESSAGE NMAKE /f "host.mak" CFG="host - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "host - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "host - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "host - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "host - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,7 +28,7 @@ NULL=nul
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "host - Win32 Release"
+!IF  "$(CFG)" == "host - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -103,7 +103,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "host - Win32 Release"
+!IF  "$(CFG)" == "host - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -114,12 +114,12 @@ ALL : "..\..\..\Build\Release\host.exe"
 
 !ELSE 
 
-ALL : "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\host.exe"
+ALL : "liblwres - @PLATFORM@ Release" "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\host.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" "liblwres - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -132,13 +132,13 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\host.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\host.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\host.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib  ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\host.pdb" /machine:I386 /out:"../../../Build/Release/host.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib  ../../../lib/lwres/win32/Release/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\host.pdb" @MACHINE@ /out:"../../../Build/Release/host.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\dighost.obj" \
        "$(INTDIR)\host.obj" \
@@ -154,7 +154,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+!ELSEIF  "$(CFG)" == "host - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -168,12 +168,12 @@ ALL : "..\..\..\Build\Debug\host.exe" "$(OUTDIR)\host.bsc"
 
 !ELSE 
 
-ALL : "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\host.exe" "$(OUTDIR)\host.bsc"
+ALL : "liblwres - @PLATFORM@ Debug" "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\host.exe" "$(OUTDIR)\host.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" "liblwres - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -192,7 +192,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @IDN_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\host.bsc" 
 BSC32_SBRS= \
@@ -205,7 +205,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib  ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\host.pdb" /debug /machine:I386 /out:"../../../Build/Debug/host.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib  ../../../lib/lwres/win32/Debug/liblwres.lib @IDN_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\host.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/host.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\dighost.obj" \
        "$(INTDIR)\host.obj" \
@@ -263,17 +263,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "host - Win32 Release" || "$(CFG)" == "host - Win32 Debug"
+!IF "$(CFG)" == "host - @PLATFORM@ Release" || "$(CFG)" == "host - @PLATFORM@ Debug"
 SOURCE=..\dighost.c
 
-!IF  "$(CFG)" == "host - Win32 Release"
+!IF  "$(CFG)" == "host - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+!ELSEIF  "$(CFG)" == "host - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dighost.obj"        "$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)"
@@ -284,14 +284,14 @@ SOURCE=..\dighost.c
 
 SOURCE=..\host.c
 
-!IF  "$(CFG)" == "host - Win32 Release"
+!IF  "$(CFG)" == "host - @PLATFORM@ Release"
 
 
 "$(INTDIR)\host.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+!ELSEIF  "$(CFG)" == "host - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\host.obj"   "$(INTDIR)\host.sbr" : $(SOURCE) "$(INTDIR)"
@@ -300,106 +300,106 @@ SOURCE=..\host.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "host - Win32 Release"
+!IF  "$(CFG)" == "host - @PLATFORM@ Release"
 
-"libdns - Win32 Release" : 
+"libdns - @PLATFORM@ Release" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"libdns - Win32 ReleaseCLEAN" : 
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+!ELSEIF  "$(CFG)" == "host - @PLATFORM@ Debug"
 
-"libdns - Win32 Debug" : 
+"libdns - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"libdns - Win32 DebugCLEAN" : 
+"libdns - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "host - Win32 Release"
+!IF  "$(CFG)" == "host - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+!ELSEIF  "$(CFG)" == "host - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "host - Win32 Release"
+!IF  "$(CFG)" == "host - @PLATFORM@ Release"
 
-"libbind9 - Win32 Release" : 
+"libbind9 - @PLATFORM@ Release" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"libbind9 - Win32 ReleaseCLEAN" : 
+"libbind9 - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+!ELSEIF  "$(CFG)" == "host - @PLATFORM@ Debug"
 
-"libbind9 - Win32 Debug" : 
+"libbind9 - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"libbind9 - Win32 DebugCLEAN" : 
+"libbind9 - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "host - Win32 Release"
+!IF  "$(CFG)" == "host - @PLATFORM@ Release"
 
-"liblwres - Win32 Release" : 
+"liblwres - @PLATFORM@ Release" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"liblwres - Win32 ReleaseCLEAN" : 
+"liblwres - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "host - Win32 Debug"
+!ELSEIF  "$(CFG)" == "host - @PLATFORM@ Debug"
 
-"liblwres - Win32 Debug" : 
+"liblwres - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"liblwres - Win32 DebugCLEAN" : 
+"liblwres - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
diff --git a/bin/dig/win32/host.vcxproj.filters.in b/bin/dig/win32/host.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..f6251a3
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\host.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dig/win32/host.vcxproj.in b/bin/dig/win32/host.vcxproj.in
new file mode 100644 (file)
index 0000000..7c190c1
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{BA1048A8-6961-4A20-BE12-08BE20611C9D}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>host</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\include;..\..\..\;@LIBXML2_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\include;..\..\..\;@LIBXML2_INC@@IDN_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dighost.lib;@IDN_LIB@libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\host.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dig/win32/host.vcxproj.user b/bin/dig/win32/host.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 51%
rename from bin/dig/win32/nslookup.dsp
rename to bin/dig/win32/nslookup.dsp.in
index abd9cc53d25782495def990975afe1b0f62c841f..0630f1f14db25c2cded8c395fcd6207f6d086c23 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=nslookup - Win32 Debug
+CFG=nslookup - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=nslookup - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - Win32 Debug"
+!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "nslookup - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "nslookup - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "nslookup - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "nslookup - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=nslookup - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "nslookup - Win32 Release"
+!IF  "$(CFG)" == "nslookup - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "USE_READLINE_STATIC" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nslookup.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @READLINE_LIB@ @IDN_LIB@ user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/nslookup.exe"
 
-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nslookup - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /u /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "USE_READLINE_STATIC" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /u @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @READLINE_LIBD@ @IDN_LIB@ user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "nslookup - Win32 Release"
-# Name "nslookup - Win32 Debug"
+# Name "nslookup - @PLATFORM@ Release"
+# Name "nslookup - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 60%
rename from bin/dig/win32/nslookup.mak
rename to bin/dig/win32/nslookup.mak.in
index e4604686e52eebfb0719099c76a923c4eb7d506b..b134765c835723a884bbbefd520142b965610b79 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on nslookup.dsp
 !IF "$(CFG)" == ""
-CFG=nslookup - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to nslookup - Win32 Debug.
+CFG=nslookup - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to nslookup - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "nslookup - Win32 Release" && "$(CFG)" != "nslookup - Win32 Debug"
+!IF "$(CFG)" != "nslookup - @PLATFORM@ Release" && "$(CFG)" != "nslookup - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - Win32 Debug"
+!MESSAGE NMAKE /f "nslookup.mak" CFG="nslookup - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "nslookup - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "nslookup - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "nslookup - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "nslookup - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,7 +28,7 @@ NULL=nul
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "nslookup - Win32 Release"
+!IF  "$(CFG)" == "nslookup - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -103,7 +103,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "nslookup - Win32 Release"
+!IF  "$(CFG)" == "nslookup - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -114,12 +114,12 @@ ALL : "..\..\..\Build\Release\nslookup.exe"
 
 !ELSE 
 
-ALL : "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\nslookup.exe"
+ALL : "liblwres - @PLATFORM@ Release" "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\nslookup.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" "liblwres - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -132,13 +132,13 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nslookup.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "USE_READLINE_STATIC" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nslookup.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\nslookup.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib  ../../../lib/lwres/win32/Release/liblwres.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nslookup.pdb" /machine:I386 /out:"../../../Build/Release/nslookup.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/bind9/win32/Release/libbind9.lib  ../../../lib/lwres/win32/Release/liblwres.lib @READLINE_LIB@ @IDN_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nslookup.pdb" @MACHINE@ /out:"../../../Build/Release/nslookup.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\dighost.obj" \
        "$(INTDIR)\nslookup.obj" \
@@ -154,7 +154,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nslookup - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -168,12 +168,12 @@ ALL : "..\..\..\Build\Debug\nslookup.exe" "$(OUTDIR)\nslookup.bsc"
 
 !ELSE 
 
-ALL : "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\nslookup.exe" "$(OUTDIR)\nslookup.bsc"
+ALL : "liblwres - @PLATFORM@ Debug" "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\nslookup.exe" "$(OUTDIR)\nslookup.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" "liblwres - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -192,7 +192,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /D "WIN32" /D "USE_READLINE_STATIC" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\nslookup.bsc" 
 BSC32_SBRS= \
@@ -205,7 +205,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib  ../../../lib/lwres/win32/Debug/liblwres.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nslookup.pdb" /debug /machine:I386 /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/bind9/win32/Debug/libbind9.lib  ../../../lib/lwres/win32/Debug/liblwres.lib @READLINE_LIBD@ @IDN_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nslookup.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/nslookup.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\dighost.obj" \
        "$(INTDIR)\nslookup.obj" \
@@ -263,17 +263,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "nslookup - Win32 Release" || "$(CFG)" == "nslookup - Win32 Debug"
+!IF "$(CFG)" == "nslookup - @PLATFORM@ Release" || "$(CFG)" == "nslookup - @PLATFORM@ Debug"
 SOURCE=..\dighost.c
 
-!IF  "$(CFG)" == "nslookup - Win32 Release"
+!IF  "$(CFG)" == "nslookup - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dighost.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nslookup - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dighost.obj"        "$(INTDIR)\dighost.sbr" : $(SOURCE) "$(INTDIR)"
@@ -284,14 +284,14 @@ SOURCE=..\dighost.c
 
 SOURCE=..\nslookup.c
 
-!IF  "$(CFG)" == "nslookup - Win32 Release"
+!IF  "$(CFG)" == "nslookup - @PLATFORM@ Release"
 
 
 "$(INTDIR)\nslookup.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nslookup - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\nslookup.obj"       "$(INTDIR)\nslookup.sbr" : $(SOURCE) "$(INTDIR)"
@@ -300,106 +300,106 @@ SOURCE=..\nslookup.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "nslookup - Win32 Release"
+!IF  "$(CFG)" == "nslookup - @PLATFORM@ Release"
 
-"libdns - Win32 Release" : 
+"libdns - @PLATFORM@ Release" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"libdns - Win32 ReleaseCLEAN" : 
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nslookup - @PLATFORM@ Debug"
 
-"libdns - Win32 Debug" : 
+"libdns - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"libdns - Win32 DebugCLEAN" : 
+"libdns - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "nslookup - Win32 Release"
+!IF  "$(CFG)" == "nslookup - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nslookup - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "nslookup - Win32 Release"
+!IF  "$(CFG)" == "nslookup - @PLATFORM@ Release"
 
-"libbind9 - Win32 Release" : 
+"libbind9 - @PLATFORM@ Release" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"libbind9 - Win32 ReleaseCLEAN" : 
+"libbind9 - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nslookup - @PLATFORM@ Debug"
 
-"libbind9 - Win32 Debug" : 
+"libbind9 - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"libbind9 - Win32 DebugCLEAN" : 
+"libbind9 - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "nslookup - Win32 Release"
+!IF  "$(CFG)" == "nslookup - @PLATFORM@ Release"
 
-"liblwres - Win32 Release" : 
+"liblwres - @PLATFORM@ Release" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" 
    cd "..\..\..\bin\dig\win32"
 
-"liblwres - Win32 ReleaseCLEAN" : 
+"liblwres - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
-!ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nslookup - @PLATFORM@ Debug"
 
-"liblwres - Win32 Debug" : 
+"liblwres - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" 
    cd "..\..\..\bin\dig\win32"
 
-"liblwres - Win32 DebugCLEAN" : 
+"liblwres - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ENDIF 
diff --git a/bin/dig/win32/nslookup.vcxproj.filters.in b/bin/dig/win32/nslookup.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..05aa77b
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dighost.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\nslookup.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dig/win32/nslookup.vcxproj.in b/bin/dig/win32/nslookup.vcxproj.in
new file mode 100644 (file)
index 0000000..3b5b875
--- /dev/null
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{C15A6E1A-94CE-4686-99F9-6BC5FD623EB5}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>nslookup</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\include;..\..\..\;@LIBXML2_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@READLINE_LIBD@@IDN_LIB@libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;USE_READLINE_STATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\include;..\..\..\;@LIBXML2_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccfg\include;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@READLINE_LIB@@IDN_LIB@libisc.lib;libisccfg.lib;libdns.lib;libbind9.lib;liblwres.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dighost.c" />\r
+    <ClCompile Include="..\nslookup.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dig/win32/nslookup.vcxproj.user b/bin/dig/win32/nslookup.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 86c3aee7095e9d5b8114913e291bb18fe4506e46..44bbd4d3df0b12babbea5a48393a405e8fa2d837 100644 (file)
@@ -665,7 +665,8 @@ hashlist_add_dns_name(hashlist_t *l, /*const*/ dns_name_t *name,
        unsigned int len;
        size_t i;
 
-       len = isc_iterated_hash(hash, hashalg, iterations, salt, salt_length,
+       len = isc_iterated_hash(hash, hashalg, iterations,
+                               salt, (int)salt_length,
                                name->ndata, name->length);
        if (verbose) {
                dns_name_format(name, nametext, sizeof nametext);
@@ -717,7 +718,7 @@ static const unsigned char *
 hashlist_findnext(const hashlist_t *l,
                  const unsigned char hash[NSEC3_MAX_HASH_LENGTH])
 {
-       unsigned int entries = l->entries;
+       size_t entries = l->entries;
        const unsigned char *next = bsearch(hash, l->hashbuf, l->entries,
                                            l->length, hashlist_comp);
        INSIST(next != NULL);
@@ -2234,7 +2235,7 @@ nsecify(void) {
 
 static void
 addnsec3param(const unsigned char *salt, size_t salt_length,
-             unsigned int iterations)
+             dns_iterations_t iterations)
 {
        dns_dbnode_t *node = NULL;
        dns_rdata_nsec3param_t nsec3param;
@@ -2254,7 +2255,7 @@ addnsec3param(const unsigned char *salt, size_t salt_length,
        nsec3param.flags = 0;
        nsec3param.hash = unknownalg ? DNS_NSEC3_UNKNOWNALG : dns_hash_sha1;
        nsec3param.iterations = iterations;
-       nsec3param.salt_length = salt_length;
+       nsec3param.salt_length = (unsigned char)salt_length;
        DE_CONST(salt, nsec3param.salt);
 
        isc_buffer_init(&b, nsec3parambuf, sizeof(nsec3parambuf));
@@ -2551,7 +2552,7 @@ remove_duplicates(void) {
  * Generate NSEC3 records for the zone.
  */
 static void
-nsec3ify(unsigned int hashalg, unsigned int iterations,
+nsec3ify(unsigned int hashalg, dns_iterations_t iterations,
         const unsigned char *salt, size_t salt_length, hashlist_t *hashlist)
 {
        dns_dbiterator_t *dbiter = NULL;
similarity index 63%
rename from bin/dnssec/win32/dnssectool.dsp
rename to bin/dnssec/win32/dnssectool.dsp.in
index 9f5b60d7e57c5ce48dab857143bfa2dc4552e1e4..caa775c6d7e4e5b21398b6d9ba64ab2872ae8a6e 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Static-Link Library" 0x0104
+# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104
 
-CFG=dnssectool - Win32 Debug
+CFG=dnssectool - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=dnssectool - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "dnssectool.mak" CFG="dnssectool - Win32 Debug"
+!MESSAGE NMAKE /f "dnssectool.mak" CFG="dnssectool - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "dnssectool - Win32 Release" (based on "Win32 (x86) Static-Link Library")
-!MESSAGE "dnssectool - Win32 Debug" (based on "Win32 (x86) Static-Link Library")
+!MESSAGE "dnssectool - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library")
+!MESSAGE "dnssectool - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "dnssectool - Win32 Release"
+!IF  "$(CFG)" == "dnssectool - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /YX /FD /c /Fddnssectool
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fddnssectool
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -56,7 +56,7 @@ LINK32=link.exe
 # ADD BASE LINK32 
 # ADD LINK32 /out:"Release/dnssectool.lib"
 
-!ELSEIF  "$(CFG)" == "dnssectool - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dnssectool - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR /YX /FD /GZ /c /Fddnssectool
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fddnssectool
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -87,8 +87,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "dnssectool - Win32 Release"
-# Name "dnssectool - Win32 Debug"
+# Name "dnssectool - @PLATFORM@ Release"
+# Name "dnssectool - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/bin/dnssec/win32/dnssectool.vcxproj.filters.in b/bin/dnssec/win32/dnssectool.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..94246ae
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\dnssectool.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssectool.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/dnssectool.vcxproj.in b/bin/dnssec/win32/dnssectool.vcxproj.in
new file mode 100644 (file)
index 0000000..c20b39e
--- /dev/null
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\dnssectool.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssectool.c" />\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>dnssectool</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/dnssectool.vcxproj.user b/bin/dnssec/win32/dnssectool.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 63%
rename from bin/dnssec/win32/dsfromkey.dsp
rename to bin/dnssec/win32/dsfromkey.dsp.in
index ddb2cc83dcb7541764e9900d81e8ac0ed118cb43..f969b34cec5946c09a86d2af9442a8e6dfd60e03 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=dsfromkey - Win32 Debug
+CFG=dsfromkey - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=dsfromkey - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "dsfromkey.mak" CFG="dsfromkey - Win32 Debug"
+!MESSAGE NMAKE /f "dsfromkey.mak" CFG="dsfromkey - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "dsfromkey - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsfromkey - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "dsfromkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "dsfromkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=dsfromkey - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "dsfromkey - Win32 Release"
+!IF  "$(CFG)" == "dsfromkey - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-dsfromkey.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-dsfromkey.exe"
 
-!ELSEIF  "$(CFG)" == "dsfromkey - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dsfromkey - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-dsfromkey.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-dsfromkey.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "dsfromkey - Win32 Release"
-# Name "dsfromkey - Win32 Debug"
+# Name "dsfromkey - @PLATFORM@ Release"
+# Name "dsfromkey - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 79%
rename from bin/dnssec/win32/dsfromkey.mak
rename to bin/dnssec/win32/dsfromkey.mak.in
index 2e2111e54d92a943ce640e0da0ff28d9118d42ae..c5da46ded4f9d741f28b5df9eefa123afe549136 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on dsfromkey.dsp
 !IF "$(CFG)" == ""
-CFG=dsfromkey - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to dsfromkey - Win32 Debug.
+CFG=dsfromkey - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to dsfromkey - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "dsfromkey - Win32 Release" && "$(CFG)" != "dsfromkey - Win32 Debug"
+!IF "$(CFG)" != "dsfromkey - @PLATFORM@ Release" && "$(CFG)" != "dsfromkey - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "dsfromkey.mak" CFG="dsfromkey - Win32 Debug"
+!MESSAGE NMAKE /f "dsfromkey.mak" CFG="dsfromkey - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "dsfromkey - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "dsfromkey - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "dsfromkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "dsfromkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "dsfromkey - Win32 Release"
+!IF  "$(CFG)" == "dsfromkey - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "dsfromkey - Win32 Release"
+!IF  "$(CFG)" == "dsfromkey - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -119,7 +119,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\dsfromkey.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\dsfromkey.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -157,7 +157,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\dsfromkey.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-dsfromkey.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-dsfromkey.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-dsfromkey.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-dsfromkey.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-dsfromkey.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -168,7 +168,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "dsfromkey - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dsfromkey - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -196,7 +196,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -241,7 +241,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-dsfromkey.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-dsfromkey.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-dsfromkey.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-dsfromkey.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-dsfromkey.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -264,17 +264,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "dsfromkey - Win32 Release" || "$(CFG)" == "dsfromkey - Win32 Debug"
+!IF "$(CFG)" == "dsfromkey - @PLATFORM@ Release" || "$(CFG)" == "dsfromkey - @PLATFORM@ Debug"
 SOURCE="..\dnssec-dsfromkey.c"
 
-!IF  "$(CFG)" == "dsfromkey - Win32 Release"
+!IF  "$(CFG)" == "dsfromkey - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssec-dsfromkey.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "dsfromkey - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dsfromkey - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssec-dsfromkey.obj"       "$(INTDIR)\dnssec-dsfromkey.sbr" : $(SOURCE) "$(INTDIR)"
@@ -285,14 +285,14 @@ SOURCE="..\dnssec-dsfromkey.c"
 
 SOURCE=..\dnssectool.c
 
-!IF  "$(CFG)" == "dsfromkey - Win32 Release"
+!IF  "$(CFG)" == "dsfromkey - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "dsfromkey - Win32 Debug"
+!ELSEIF  "$(CFG)" == "dsfromkey - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssectool.obj"     "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.filters.in b/bin/dnssec/win32/dsfromkey.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..f60e2c2
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-dsfromkey.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.in b/bin/dnssec/win32/dsfromkey.vcxproj.in
new file mode 100644 (file)
index 0000000..71ba471
--- /dev/null
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{6E6297F4-69D7-4533-85E1-BD17C30017C8}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>dsfromkey</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+@IF PYTHON\r
+    <PostBuildEvent>\r
+      <Command>cd ..\..\python\r
+copy /Y dnssec-checkds.py ..\..\Build\$(Configuration)\dnssec-checkds.py\r
+copy /Y dnssec-coverage.py ..\..\Build\$(Configuration)\dnssec-coverage.py\r
+</Command>\r
+    </PostBuildEvent>\r
+@END PYTHON\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+@IF PYTHON\r
+    <PostBuildEvent>\r
+      <Command>cd ..\..\python\r
+copy /Y dnssec-checkds.py ..\..\Build\$(Configuration)\dnssec-checkds.py\r
+copy /Y dnssec-coverage.py ..\..\Build\$(Configuration)\dnssec-coverage.py\r
+</Command>\r
+    </PostBuildEvent>\r
+@END PYTHON\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-dsfromkey.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/dsfromkey.vcxproj.user b/bin/dnssec/win32/dsfromkey.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/importkey.dsp.in b/bin/dnssec/win32/importkey.dsp.in
new file mode 100644 (file)
index 0000000..8c6115f
--- /dev/null
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="importkey" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=importkey - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "importkey.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "importkey.mak" CFG="importkey - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "importkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "importkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "importkey - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-importkey.exe"
+
+!ELSEIF  "$(CFG)" == "importkey - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-importkey.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "importkey - @PLATFORM@ Release"
+# Name "importkey - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\dnssec-importkey.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/dnssec/win32/importkey.mak.in b/bin/dnssec/win32/importkey.mak.in
new file mode 100644 (file)
index 0000000..8887dea
--- /dev/null
@@ -0,0 +1,324 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on importkey.dsp
+!IF "$(CFG)" == ""
+CFG=importkey - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to importkey - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "importkey - @PLATFORM@ Release" && "$(CFG)" != "importkey - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "importkey.mak" CFG="importkey - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "importkey - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "importkey - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "importkey - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "importkey - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\dnssec-importkey.exe"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\dnssec-importkey.obj"
+       -@erase "$(INTDIR)\dnssectool.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\Build\Release\dnssec-importkey.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\importkey.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\importkey.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-importkey.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-importkey.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\dnssec-importkey.obj" \
+       "$(INTDIR)\dnssectool.obj"
+
+"..\..\..\Build\Release\dnssec-importkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "importkey - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\dnssec-importkey.exe" "$(OUTDIR)\importkey.bsc"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\dnssec-importkey.obj"
+       -@erase "$(INTDIR)\dnssec-importkey.sbr"
+       -@erase "$(INTDIR)\dnssectool.obj"
+       -@erase "$(INTDIR)\dnssectool.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\dnssec-importkey.pdb"
+       -@erase "$(OUTDIR)\importkey.bsc"
+       -@erase "..\..\..\Build\Debug\dnssec-importkey.exe"
+       -@erase "..\..\..\Build\Debug\dnssec-importkey.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\importkey.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\dnssec-importkey.sbr" \
+       "$(INTDIR)\dnssectool.sbr"
+
+"$(OUTDIR)\importkey.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-importkey.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-importkey.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\dnssec-importkey.obj" \
+       "$(INTDIR)\dnssectool.obj"
+
+"..\..\..\Build\Debug\dnssec-importkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("importkey.dep")
+!INCLUDE "importkey.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "importkey.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "importkey - @PLATFORM@ Release" || "$(CFG)" == "importkey - @PLATFORM@ Debug"
+SOURCE="..\dnssec-importkey.c"
+
+!IF  "$(CFG)" == "importkey - @PLATFORM@ Release"
+
+
+"$(INTDIR)\dnssec-importkey.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "importkey - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\dnssec-importkey.obj"       "$(INTDIR)\dnssec-importkey.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dnssectool.c
+
+!IF  "$(CFG)" == "importkey - @PLATFORM@ Release"
+
+
+"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "importkey - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\dnssectool.obj"     "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/dnssec/win32/importkey.vcxproj.filters.in b/bin/dnssec/win32/importkey.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..7fa1011
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-importkey.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>\r
diff --git a/bin/dnssec/win32/importkey.vcxproj.in b/bin/dnssec/win32/importkey.vcxproj.in
new file mode 100644 (file)
index 0000000..e3108f0
--- /dev/null
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{AB6690A0-055E-458f-BAC5-BF38BCC5834F}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>importkey</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+@IF PYTHON\r
+    <PostBuildEvent>\r
+      <Command>cd ..\..\python\r
+copy /Y dnssec-checkds.py ..\..\Build\$(Configuration)\dnssec-checkds.py\r
+copy /Y dnssec-coverage.py ..\..\Build\$(Configuration)\dnssec-coverage.py\r
+</Command>\r
+    </PostBuildEvent>\r
+@END PYTHON\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+@IF PYTHON\r
+    <PostBuildEvent>\r
+      <Command>cd ..\..\python\r
+copy /Y dnssec-checkds.py ..\..\Build\$(Configuration)\dnssec-checkds.py\r
+copy /Y dnssec-coverage.py ..\..\Build\$(Configuration)\dnssec-coverage.py\r
+</Command>\r
+    </PostBuildEvent>\r
+@END PYTHON\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-importkey.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>\r
diff --git a/bin/dnssec/win32/importkey.vcxproj.user b/bin/dnssec/win32/importkey.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 63%
rename from bin/dnssec/win32/keyfromlabel.dsp
rename to bin/dnssec/win32/keyfromlabel.dsp.in
index 245ca08e9742f2d13a23aaaa93bfe83c51f43da9..f643248593fa2d6ee02a036c5127690294d2b208 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=keyfromlabel - Win32 Debug
+CFG=keyfromlabel - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=keyfromlabel - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "keyfromlabel.mak" CFG="keyfromlabel - Win32 Debug"
+!MESSAGE NMAKE /f "keyfromlabel.mak" CFG="keyfromlabel - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "keyfromlabel - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "keyfromlabel - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "keyfromlabel - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "keyfromlabel - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=keyfromlabel - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "keyfromlabel - Win32 Release"
+!IF  "$(CFG)" == "keyfromlabel - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-keyfromlabel.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-keyfromlabel.exe"
 
-!ELSEIF  "$(CFG)" == "keyfromlabel - Win32 Debug"
+!ELSEIF  "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-keyfromlabel.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-keyfromlabel.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "keyfromlabel - Win32 Release"
-# Name "keyfromlabel - Win32 Debug"
+# Name "keyfromlabel - @PLATFORM@ Release"
+# Name "keyfromlabel - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 79%
rename from bin/dnssec/win32/keyfromlabel.mak
rename to bin/dnssec/win32/keyfromlabel.mak.in
index 88d1e6a6d5a818ade51e5c6961fefd1030561f90..7fa6ecde1dfbe5ca3e7ea1b6507e3707ad286dbf 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on keyfromlabel.dsp
 !IF "$(CFG)" == ""
-CFG=keyfromlabel - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to keyfromlabel - Win32 Debug.
+CFG=keyfromlabel - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to keyfromlabel - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "keyfromlabel - Win32 Release" && "$(CFG)" != "keyfromlabel - Win32 Debug"
+!IF "$(CFG)" != "keyfromlabel - @PLATFORM@ Release" && "$(CFG)" != "keyfromlabel - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "keyfromlabel.mak" CFG="keyfromlabel - Win32 Debug"
+!MESSAGE NMAKE /f "keyfromlabel.mak" CFG="keyfromlabel - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "keyfromlabel - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "keyfromlabel - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "keyfromlabel - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "keyfromlabel - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "keyfromlabel - Win32 Release"
+!IF  "$(CFG)" == "keyfromlabel - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "keyfromlabel - Win32 Release"
+!IF  "$(CFG)" == "keyfromlabel - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -119,7 +119,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keyfromlabel.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keyfromlabel.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -157,7 +157,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\keyfromlabel.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-keyfromlabel.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-keyfromlabel.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-keyfromlabel.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-keyfromlabel.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-keyfromlabel.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -168,7 +168,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "keyfromlabel - Win32 Debug"
+!ELSEIF  "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -196,7 +196,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -241,7 +241,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-keyfromlabel.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-keyfromlabel.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-keyfromlabel.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-keyfromlabel.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-keyfromlabel.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -264,17 +264,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "keyfromlabel - Win32 Release" || "$(CFG)" == "keyfromlabel - Win32 Debug"
+!IF "$(CFG)" == "keyfromlabel - @PLATFORM@ Release" || "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug"
 SOURCE="..\dnssec-keyfromlabel.c"
 
-!IF  "$(CFG)" == "keyfromlabel - Win32 Release"
+!IF  "$(CFG)" == "keyfromlabel - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssec-keyfromlabel.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "keyfromlabel - Win32 Debug"
+!ELSEIF  "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssec-keyfromlabel.obj"    "$(INTDIR)\dnssec-keyfromlabel.sbr" : $(SOURCE) "$(INTDIR)"
@@ -285,14 +285,14 @@ SOURCE="..\dnssec-keyfromlabel.c"
 
 SOURCE=..\dnssectool.c
 
-!IF  "$(CFG)" == "keyfromlabel - Win32 Release"
+!IF  "$(CFG)" == "keyfromlabel - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "keyfromlabel - Win32 Debug"
+!ELSEIF  "$(CFG)" == "keyfromlabel - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssectool.obj"     "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.filters.in b/bin/dnssec/win32/keyfromlabel.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..15baabb
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-keyfromlabel.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.in b/bin/dnssec/win32/keyfromlabel.vcxproj.in
new file mode 100644 (file)
index 0000000..f796081
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{17455DC6-5FBB-47C3-8F44-7DB574A188D3}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>keyfromlabel</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-keyfromlabel.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/keyfromlabel.vcxproj.user b/bin/dnssec/win32/keyfromlabel.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 64%
rename from bin/dnssec/win32/keygen.dsp
rename to bin/dnssec/win32/keygen.dsp.in
index 1099049832cb2ac433380b3c4bba4689589523e2..cd88cf6ad9110165107a8215d011dbf9cefc8f32 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=keygen - Win32 Debug
+CFG=keygen - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=keygen - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - Win32 Debug"
+!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "keygen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "keygen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "keygen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "keygen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=keygen - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "keygen - Win32 Release"
+!IF  "$(CFG)" == "keygen - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-keygen.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-keygen.exe"
 
-!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "keygen - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "keygen - Win32 Release"
-# Name "keygen - Win32 Debug"
+# Name "keygen - @PLATFORM@ Release"
+# Name "keygen - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 79%
rename from bin/dnssec/win32/keygen.mak
rename to bin/dnssec/win32/keygen.mak.in
index e3cb9d86d2b297dfa82524f5cf297f321a3ce8a3..57c17e0100f5ee1e30244935ff16ba41bc66c8ec 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on keygen.dsp
 !IF "$(CFG)" == ""
-CFG=keygen - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to keygen - Win32 Debug.
+CFG=keygen - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to keygen - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "keygen - Win32 Release" && "$(CFG)" != "keygen - Win32 Debug"
+!IF "$(CFG)" != "keygen - @PLATFORM@ Release" && "$(CFG)" != "keygen - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - Win32 Debug"
+!MESSAGE NMAKE /f "keygen.mak" CFG="keygen - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "keygen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "keygen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "keygen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "keygen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "keygen - Win32 Release"
+!IF  "$(CFG)" == "keygen - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "keygen - Win32 Release"
+!IF  "$(CFG)" == "keygen - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -119,7 +119,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keygen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\keygen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -157,7 +157,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\keygen.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-keygen.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-keygen.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-keygen.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-keygen.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-keygen.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -168,7 +168,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "keygen - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -196,7 +196,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -241,7 +241,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-keygen.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-keygen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-keygen.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-keygen.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -264,17 +264,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "keygen - Win32 Release" || "$(CFG)" == "keygen - Win32 Debug"
+!IF "$(CFG)" == "keygen - @PLATFORM@ Release" || "$(CFG)" == "keygen - @PLATFORM@ Debug"
 SOURCE="..\dnssec-keygen.c"
 
-!IF  "$(CFG)" == "keygen - Win32 Release"
+!IF  "$(CFG)" == "keygen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssec-keygen.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "keygen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssec-keygen.obj"  "$(INTDIR)\dnssec-keygen.sbr" : $(SOURCE) "$(INTDIR)"
@@ -285,14 +285,14 @@ SOURCE="..\dnssec-keygen.c"
 
 SOURCE=..\dnssectool.c
 
-!IF  "$(CFG)" == "keygen - Win32 Release"
+!IF  "$(CFG)" == "keygen - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "keygen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "keygen - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssectool.obj"     "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/dnssec/win32/keygen.vcxproj.filters.in b/bin/dnssec/win32/keygen.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..3ca7617
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-keygen.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/keygen.vcxproj.in b/bin/dnssec/win32/keygen.vcxproj.in
new file mode 100644 (file)
index 0000000..e6a593b
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{0BF11E21-168C-4CAA-B784-429D126BBAE5}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>keygen</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-keygen.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/keygen.vcxproj.user b/bin/dnssec/win32/keygen.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/nsupdate.dsp b/bin/dnssec/win32/nsupdate.dsp
deleted file mode 100644 (file)
index 72cdb0b..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="nsupdate" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=nsupdate - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "nsupdate.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "nsupdate - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "nsupdate - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "nsupdate - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nsupdate.exe"
-
-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /u /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "nsupdate - Win32 Release"
-# Name "nsupdate - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\nsupdate.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
similarity index 64%
rename from bin/dnssec/win32/revoke.dsp
rename to bin/dnssec/win32/revoke.dsp.in
index e49fb75685e2e0edae853764112a40e12389a254..725faa0cc922d2acfa392b9812e5a90315a29b80 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=revoke - Win32 Debug
+CFG=revoke - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=revoke - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "revoke.mak" CFG="revoke - Win32 Debug"
+!MESSAGE NMAKE /f "revoke.mak" CFG="revoke - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "revoke - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "revoke - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "revoke - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "revoke - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=revoke - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "revoke - Win32 Release"
+!IF  "$(CFG)" == "revoke - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-revoke.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-revoke.exe"
 
-!ELSEIF  "$(CFG)" == "revoke - Win32 Debug"
+!ELSEIF  "$(CFG)" == "revoke - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-revoke.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-revoke.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "revoke - Win32 Release"
-# Name "revoke - Win32 Debug"
+# Name "revoke - @PLATFORM@ Release"
+# Name "revoke - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 79%
rename from bin/dnssec/win32/revoke.mak
rename to bin/dnssec/win32/revoke.mak.in
index 08a70d04fa52ed0a4fc6594c2e6de7e6b74b7b14..5d2aa340dbcdff7b6169d432439c7888364d1390 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on revoke.dsp
 !IF "$(CFG)" == ""
-CFG=revoke - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to revoke - Win32 Debug.
+CFG=revoke - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to revoke - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "revoke - Win32 Release" && "$(CFG)" != "revoke - Win32 Debug"
+!IF "$(CFG)" != "revoke - @PLATFORM@ Release" && "$(CFG)" != "revoke - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "revoke.mak" CFG="revoke - Win32 Debug"
+!MESSAGE NMAKE /f "revoke.mak" CFG="revoke - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "revoke - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "revoke - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "revoke - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "revoke - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "revoke - Win32 Release"
+!IF  "$(CFG)" == "revoke - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "revoke - Win32 Release"
+!IF  "$(CFG)" == "revoke - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -119,7 +119,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\revoke.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\revoke.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -157,7 +157,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\revoke.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-revoke.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-revoke.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-revoke.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-revoke.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-revoke.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -168,7 +168,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "revoke - Win32 Debug"
+!ELSEIF  "$(CFG)" == "revoke - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -196,7 +196,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -241,7 +241,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-revoke.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-revoke.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-revoke.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-revoke.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-revoke.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -264,17 +264,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "revoke - Win32 Release" || "$(CFG)" == "revoke - Win32 Debug"
+!IF "$(CFG)" == "revoke - @PLATFORM@ Release" || "$(CFG)" == "revoke - @PLATFORM@ Debug"
 SOURCE="..\dnssec-revoke.c"
 
-!IF  "$(CFG)" == "revoke - Win32 Release"
+!IF  "$(CFG)" == "revoke - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssec-revoke.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "revoke - Win32 Debug"
+!ELSEIF  "$(CFG)" == "revoke - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssec-revoke.obj"  "$(INTDIR)\dnssec-revoke.sbr" : $(SOURCE) "$(INTDIR)"
@@ -285,14 +285,14 @@ SOURCE="..\dnssec-revoke.c"
 
 SOURCE=..\dnssectool.c
 
-!IF  "$(CFG)" == "revoke - Win32 Release"
+!IF  "$(CFG)" == "revoke - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "revoke - Win32 Debug"
+!ELSEIF  "$(CFG)" == "revoke - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssectool.obj"     "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/dnssec/win32/revoke.vcxproj.filters.in b/bin/dnssec/win32/revoke.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..22eef62
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-revoke.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/revoke.vcxproj.in b/bin/dnssec/win32/revoke.vcxproj.in
new file mode 100644 (file)
index 0000000..8fadab5
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{D171F185-D3C2-4463-9CF3-ED1D0B1D6832}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>revoke</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-revoke.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/revoke.vcxproj.user b/bin/dnssec/win32/revoke.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 64%
rename from bin/dnssec/win32/settime.dsp
rename to bin/dnssec/win32/settime.dsp.in
index 6540d41edba1ab57ec6ba4676e454a69788dc14d..d9b09822aa18c3b0d25031e94caf1fb8df92c3d9 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=settime - Win32 Debug
+CFG=settime - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=settime - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "settime.mak" CFG="settime - Win32 Debug"
+!MESSAGE NMAKE /f "settime.mak" CFG="settime - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "settime - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "settime - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "settime - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "settime - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=settime - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "settime - Win32 Release"
+!IF  "$(CFG)" == "settime - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-settime.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-settime.exe"
 
-!ELSEIF  "$(CFG)" == "settime - Win32 Debug"
+!ELSEIF  "$(CFG)" == "settime - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-settime.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-settime.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "settime - Win32 Release"
-# Name "settime - Win32 Debug"
+# Name "settime - @PLATFORM@ Release"
+# Name "settime - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 79%
rename from bin/dnssec/win32/settime.mak
rename to bin/dnssec/win32/settime.mak.in
index 967300c444c7b8dac000979e8b7d6482d5982837..e08bfe2ec94bd665039e74820ef5a01fdb2d1e51 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on settime.dsp
 !IF "$(CFG)" == ""
-CFG=settime - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to settime - Win32 Debug.
+CFG=settime - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to settime - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "settime - Win32 Release" && "$(CFG)" != "settime - Win32 Debug"
+!IF "$(CFG)" != "settime - @PLATFORM@ Release" && "$(CFG)" != "settime - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "settime.mak" CFG="settime - Win32 Debug"
+!MESSAGE NMAKE /f "settime.mak" CFG="settime - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "settime - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "settime - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "settime - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "settime - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "settime - Win32 Release"
+!IF  "$(CFG)" == "settime - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "settime - Win32 Release"
+!IF  "$(CFG)" == "settime - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -119,7 +119,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\settime.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\settime.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -157,7 +157,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\settime.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-settime.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-settime.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-settime.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-settime.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-settime.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -168,7 +168,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "settime - Win32 Debug"
+!ELSEIF  "$(CFG)" == "settime - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -196,7 +196,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -241,7 +241,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-settime.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-settime.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-settime.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-settime.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-settime.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -264,17 +264,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "settime - Win32 Release" || "$(CFG)" == "settime - Win32 Debug"
+!IF "$(CFG)" == "settime - @PLATFORM@ Release" || "$(CFG)" == "settime - @PLATFORM@ Debug"
 SOURCE="..\dnssec-settime.c"
 
-!IF  "$(CFG)" == "settime - Win32 Release"
+!IF  "$(CFG)" == "settime - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssec-settime.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "settime - Win32 Debug"
+!ELSEIF  "$(CFG)" == "settime - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssec-settime.obj" "$(INTDIR)\dnssec-settime.sbr" : $(SOURCE) "$(INTDIR)"
@@ -285,14 +285,14 @@ SOURCE="..\dnssec-settime.c"
 
 SOURCE=..\dnssectool.c
 
-!IF  "$(CFG)" == "settime - Win32 Release"
+!IF  "$(CFG)" == "settime - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "settime - Win32 Debug"
+!ELSEIF  "$(CFG)" == "settime - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssectool.obj"     "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/dnssec/win32/settime.vcxproj.filters.in b/bin/dnssec/win32/settime.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..84f528a
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-settime.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/settime.vcxproj.in b/bin/dnssec/win32/settime.vcxproj.in
new file mode 100644 (file)
index 0000000..2028dfa
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{03FB7588-C5A7-4572-968F-14F1206BC69C}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>settime</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-settime.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/settime.vcxproj.user b/bin/dnssec/win32/settime.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 63%
rename from bin/dnssec/win32/signzone.dsp
rename to bin/dnssec/win32/signzone.dsp.in
index 7e4227b45162a85bc49fc1f554e3de8f86c1ce97..89af5bf763876ea6209d50a98cb97f1e165e3acf 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=signzone - Win32 Debug
+CFG=signzone - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=signzone - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - Win32 Debug"
+!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "signzone - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "signzone - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "signzone - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "signzone - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=signzone - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "signzone - Win32 Release"
+!IF  "$(CFG)" == "signzone - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-signzone.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/dnssec-signzone.exe"
 
-!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "signzone - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "signzone - Win32 Release"
-# Name "signzone - Win32 Debug"
+# Name "signzone - @PLATFORM@ Release"
+# Name "signzone - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 79%
rename from bin/dnssec/win32/signzone.mak
rename to bin/dnssec/win32/signzone.mak.in
index dbbed7a0e783ac4546a8b39b29eb12ca84a2b67f..942c665e2798efddc244f7ecd19921347a813e0a 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on signzone.dsp
 !IF "$(CFG)" == ""
-CFG=signzone - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to signzone - Win32 Debug.
+CFG=signzone - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to signzone - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "signzone - Win32 Release" && "$(CFG)" != "signzone - Win32 Debug"
+!IF "$(CFG)" != "signzone - @PLATFORM@ Release" && "$(CFG)" != "signzone - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - Win32 Debug"
+!MESSAGE NMAKE /f "signzone.mak" CFG="signzone - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "signzone - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "signzone - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "signzone - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "signzone - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "signzone - Win32 Release"
+!IF  "$(CFG)" == "signzone - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "signzone - Win32 Release"
+!IF  "$(CFG)" == "signzone - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -119,7 +119,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\signzone.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\signzone.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -157,7 +157,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\signzone.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-signzone.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-signzone.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-signzone.pdb" @MACHINE@ /out:"../../../Build/Release/dnssec-signzone.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-signzone.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -168,7 +168,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "signzone - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -196,7 +196,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -241,7 +241,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-signzone.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-signzone.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/dnssec-signzone.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\dnssec-signzone.obj" \
        "$(INTDIR)\dnssectool.obj"
@@ -264,17 +264,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "signzone - Win32 Release" || "$(CFG)" == "signzone - Win32 Debug"
+!IF "$(CFG)" == "signzone - @PLATFORM@ Release" || "$(CFG)" == "signzone - @PLATFORM@ Debug"
 SOURCE="..\dnssec-signzone.c"
 
-!IF  "$(CFG)" == "signzone - Win32 Release"
+!IF  "$(CFG)" == "signzone - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssec-signzone.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "signzone - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssec-signzone.obj"        "$(INTDIR)\dnssec-signzone.sbr" : $(SOURCE) "$(INTDIR)"
@@ -285,14 +285,14 @@ SOURCE="..\dnssec-signzone.c"
 
 SOURCE=..\dnssectool.c
 
-!IF  "$(CFG)" == "signzone - Win32 Release"
+!IF  "$(CFG)" == "signzone - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "signzone - Win32 Debug"
+!ELSEIF  "$(CFG)" == "signzone - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssectool.obj"     "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/dnssec/win32/signzone.vcxproj.filters.in b/bin/dnssec/win32/signzone.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..736ea73
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-signzone.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/signzone.vcxproj.in b/bin/dnssec/win32/signzone.vcxproj.in
new file mode 100644 (file)
index 0000000..7c480d0
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{205ED8A9-2E4C-41CC-9385-F3613402AA90}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>signzone</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>dnssec-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>dnssectool.lib;libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\dnssec-signzone.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/dnssec/win32/signzone.vcxproj.user b/bin/dnssec/win32/signzone.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index e3ce3bd1547b837d940305a3cc9681c731f2322c..35053e85aadbb851a8e155f6ea8011a1a2718b5b 100644 (file)
@@ -124,6 +124,7 @@ main.@O@: main.c
                -DDESCRIPTION=\"${DESCRIPTION}\" \
                -DSRCID=\"${SRCID}\" \
                -DCONFIGARGS="\"${CONFIGARGS}\"" \
+               -DBUILDER="\"make\"" \
                -DNS_LOCALSTATEDIR=\"${localstatedir}\" \
                -DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c
 
index 14204cd295c6d651e13b92c1cfe1094a255bd569..607463bf0535d4a18a89c7c883a05ef3b5c691c6 100644 (file)
@@ -276,7 +276,8 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name,
                 */
                return (ISC_R_NOTFOUND);
        }
-       return (dns_sdb_putrdata(lookup, dns_rdatatype_cname, 600, rdata, len));
+       return (dns_sdb_putrdata(lookup, dns_rdatatype_cname, 600,
+                                rdata, (unsigned int)len));
 }
 
 static isc_result_t
index 11f54887565f2b7b3b3768db26fdbf1551b35a56..4cc814efc0bad2ea037a9b963c5fa70411d258f5 100644 (file)
@@ -2657,7 +2657,8 @@ ns_client_checkacl(ns_client_t *client, isc_sockaddr_t *sockaddr,
 static void
 ns_client_name(ns_client_t *client, char *peerbuf, size_t len) {
        if (client->peeraddr_valid)
-               isc_sockaddr_format(&client->peeraddr, peerbuf, len);
+               isc_sockaddr_format(&client->peeraddr, peerbuf,
+                                   (unsigned int)len);
        else
                snprintf(peerbuf, len, "@%p", client);
 }
index 39307f36996b17c0dab2a2d684779120907e538a..b632ad6c1a656dedd0b4ed8db59c8ceb327e8ac3 100644 (file)
@@ -70,6 +70,7 @@ EXTERN const char *           ns_g_product            INIT(PRODUCT);
 EXTERN const char *            ns_g_description        INIT(DESCRIPTION);
 EXTERN const char *            ns_g_srcid              INIT(SRCID);
 EXTERN const char *            ns_g_configargs         INIT(CONFIGARGS);
+EXTERN const char *            ns_g_builder            INIT(BUILDER);
 EXTERN in_port_t               ns_g_port               INIT(0);
 EXTERN in_port_t               lwresd_g_listenport     INIT(0);
 
index 44251fa825c696b5c367086480098128c0946e87..2ce481508552cab2681e0688b7883fc2015eba49 100644 (file)
 
 /*! \file */
 
+#ifdef ISC_MAIN_HOOK
+#define main(argc, argv) bindmain(argc, argv)
+#endif
+
 ISC_PLATFORM_NORETURN_PRE void
 ns_main_earlyfatal(const char *format, ...)
 ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
index f6c929e5b96723ddd3129ce70bb7380225078c69..d3d9fa23a7a39af96d72eb5467b7a432d0c2b456 100644 (file)
@@ -390,7 +390,7 @@ set_flags(const char *arg, struct flag_def *defs, unsigned int *ret) {
                int arglen;
                if (end == NULL)
                        end = arg + strlen(arg);
-               arglen = end - arg;
+               arglen = (int)(end - arg);
                for (def = defs; def->name != NULL; def++) {
                        if (arglen == (int)strlen(def->name) &&
                            memcmp(arg, def->name, arglen) == 0) {
@@ -415,6 +415,7 @@ parse_command_line(int argc, char *argv[]) {
 
        save_command_line(argc, argv);
 
+       /* PLEASE keep options synchronized when main is hooked! */
        isc_commandline_errprint = ISC_FALSE;
        while ((ch = isc_commandline_parse(argc, argv,
                                           "46c:C:d:E:fFgi:lm:n:N:p:P:"
@@ -544,8 +545,25 @@ parse_command_line(int argc, char *argv[]) {
                        printf("%s %s", ns_g_product, ns_g_version);
                        if (*ns_g_description != 0)
                                printf(" %s", ns_g_description);
-                       printf(" <id:%s> built with %s\n", ns_g_srcid,
-                               ns_g_configargs);
+                       printf(" <id:%s> built by %s with %s\n", ns_g_srcid,
+                              ns_g_builder, ns_g_configargs);
+#ifdef __clang__
+                       printf("compiled by CLANG %s\n", __VERSION__);
+#else
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+                       printf("compiled by ICC %s\n", __VERSION__);
+#else
+#ifdef __GNUC__
+                       printf("compiled by GCC %s\n", __VERSION__);
+#endif
+#endif
+#endif
+#ifdef _MSC_VER
+                       printf("compiled by MSVC %d\n", _MSC_VER);
+#endif
+#ifdef __SUNPRO_C
+                       printf("compiled by Solaris Studio %x\n", __SUNPRO_C);
+#endif
 #ifdef OPENSSL
                        printf("using OpenSSL version: %s\n",
                               OPENSSL_VERSION_TEXT);
@@ -1026,6 +1044,8 @@ ns_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) {
 }
 #endif /* HAVE_LIBSCF */
 
+/* main entry point, possibly hooked */
+
 int
 main(int argc, char *argv[]) {
        isc_result_t result;
index 770106586dac5491fb249ec3b45f69db9351697c..631681b9ad50cbeff076c4ffbc9ee0aa543a9459 100644 (file)
@@ -7691,7 +7691,7 @@ ns_server_add_zone(ns_server_t *server, char *args) {
 
        /* Try to parse the argument string */
        arglen = strlen(args);
-       isc_buffer_init(&argbuf, args, arglen);
+       isc_buffer_init(&argbuf, args, (unsigned int)arglen);
        isc_buffer_add(&argbuf, strlen(args));
        CHECK(cfg_parser_create(server->mctx, ns_g_lctx, &parser));
        CHECK(cfg_parse_buffer(parser, &argbuf, &cfg_type_addzoneconf,
similarity index 67%
rename from bin/named/win32/named.dsp
rename to bin/named/win32/named.dsp.in
index 2a15064d9d3681df4631a679633ed763f5389eba..f252528be119154f3cc705cefa47c78d533b800f 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=named - Win32 Debug
+CFG=named - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=named - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "named.mak" CFG="named - Win32 Debug"
+!MESSAGE NMAKE /f "named.mak" CFG="named - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "named - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "named - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "named - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "named - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=named - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,19 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../openssl-0.9.8l/inc32" /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "OPENSSL" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @USE_OPENSSL@ @USE_GSSAPI@ /D "BUILDER=\"old Visual Studio\"" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ../../../../libxml2-2.7.3/win32/bin.msvc/libxml2.lib 
-# ADD LINK32 user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ @GSSAPI_LIB@ @GEOIP_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/named.exe"
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -66,25 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../openssl-0.9.8l/inc32" /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "OPENSSL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @USE_OPENSSL@ @USE_GSSAPI@ /D "BUILDER=\"old Visual Studio\"" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ../../../../libxml2-2.7.3/win32/bin.msvc/libxml2.lib 
-# ADD LINK32 user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /map /debug /machine:I386 /out:"../../../Build/Debug/named.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ @GSSAPI_LIB@ @GEOIP_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../Build/Debug/named.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "named - Win32 Release"
-# Name "named - Win32 Debug"
+# Name "named - @PLATFORM@ Release"
+# Name "named - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -112,6 +110,12 @@ SOURCE=..\controlconf.c
 
 SOURCE=.\dlz_dlopen_driver.c
 # End Source File
+@IF GEOIP
+# Begin Source File
+
+SOURCE=..\geoip.c
+# End Source File
+@END GEOIP
 # Begin Source File
 
 SOURCE=..\interfacemgr.c
similarity index 66%
rename from bin/named/win32/named.mak
rename to bin/named/win32/named.mak.in
index a51468bce117143192710c115aebf0acf90dc389..735d5b70ada21b8f34cd7a80e3fe8f68068600f4 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on named.dsp
 !IF "$(CFG)" == ""
-CFG=named - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to named - Win32 Debug.
+CFG=named - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to named - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "named - Win32 Release" && "$(CFG)" != "named - Win32 Debug"
+!IF "$(CFG)" != "named - @PLATFORM@ Release" && "$(CFG)" != "named - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "named.mak" CFG="named - Win32 Debug"
+!MESSAGE NMAKE /f "named.mak" CFG="named - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "named - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "named - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "named - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "named - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -27,9 +27,9 @@ NULL=nul
 
 CPP=cl.exe
 RSC=rc.exe
-LIBXML=../../../../libxml2-2.7.3/win32/bin.msvc/libxml2.lib
+LIBXML=@LIBXML2_LIB@
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -104,7 +104,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -115,12 +115,12 @@ ALL : "..\..\..\Build\Release\named.exe"
 
 !ELSE 
 
-ALL : "libisccfg - Win32 Release" "libisccc - Win32 Release" "liblwres - Win32 Release" "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\named.exe"
+ALL : "libisccfg - @PLATFORM@ Release" "libisccc - @PLATFORM@ Release" "liblwres - @PLATFORM@ Release" "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\named.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" "liblwres - Win32 ReleaseCLEAN" "libisccc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" "liblwres - @PLATFORM@ ReleaseCLEAN" "libisccc - @PLATFORM@ ReleaseCLEAN" "libisccfg - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -130,6 +130,9 @@ CLEAN :
        -@erase "$(INTDIR)\control.obj"
        -@erase "$(INTDIR)\controlconf.obj"
        -@erase "$(INTDIR)\dlz_dlopen_driver.obj"
+@IF GEOIP
+       -@erase "$(INTDIR)\geoip.obj"
+@END GEOIP
        -@erase "$(INTDIR)\interfacemgr.obj"
        -@erase "$(INTDIR)\listenlist.obj"
        -@erase "$(INTDIR)\log.obj"
@@ -163,19 +166,22 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../../openssl-0.9.8l/inc32" /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "OPENSSL" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\named.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 @OPENSSL_INC@ @GSSAPI_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @USE_OPENSSL@ @USE_GSSAPI@ /D "BUILDER=\"nmake\"" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\named.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named.pdb" /machine:I386 /out:"../../../Build/Release/named.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/lwres/win32/Release/liblwres.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/bind9/win32/Release/libbind9.lib $(LIBXML) @GSSAPI_LIB@ @GEOIP_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named.pdb" @MACHINE@ /out:"../../../Build/Release/named.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\client.obj" \
        "$(INTDIR)\config.obj" \
        "$(INTDIR)\control.obj" \
        "$(INTDIR)\controlconf.obj" \
        "$(INTDIR)\dlz_dlopen_driver.obj" \
+@IF GEOIP
+       "$(INTDIR)\geoip.obj" \
+@END GEOIP
        "$(INTDIR)\interfacemgr.obj" \
        "$(INTDIR)\listenlist.obj" \
        "$(INTDIR)\log.obj" \
@@ -216,7 +222,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -230,12 +236,12 @@ ALL : "..\..\..\Build\Debug\named.exe" "$(OUTDIR)\named.bsc"
 
 !ELSE 
 
-ALL : "libisccfg - Win32 Debug" "libisccc - Win32 Debug" "liblwres - Win32 Debug" "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\named.exe" "$(OUTDIR)\named.bsc"
+ALL : "libisccfg - @PLATFORM@ Debug" "libisccc - @PLATFORM@ Debug" "liblwres - @PLATFORM@ Debug" "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\named.exe" "$(OUTDIR)\named.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" "liblwres - Win32 DebugCLEAN" "libisccc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" "liblwres - @PLATFORM@ DebugCLEAN" "libisccc - @PLATFORM@ DebugCLEAN" "libisccfg - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -251,6 +257,10 @@ CLEAN :
        -@erase "$(INTDIR)\controlconf.sbr"
        -@erase "$(INTDIR)\dlz_dlopen_driver.obj"
        -@erase "$(INTDIR)\dlz_dlopen_driver.sbr"
+@IF GEOIP
+       -@erase "$(INTDIR)\geoip.obj"
+       -@erase "$(INTDIR)\geoip.sbr"
+@END GEOIP
        -@erase "$(INTDIR)\interfacemgr.obj"
        -@erase "$(INTDIR)\interfacemgr.sbr"
        -@erase "$(INTDIR)\listenlist.obj"
@@ -315,7 +325,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../openssl-0.9.8l/inc32" /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "OPENSSL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @OPENSSL_INC@ @GSSAPI_INC@ /I "./" /I "../../../" @LIBXML2_INC@ /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" @USE_OPENSSL@ @USE_GSSAPI@ /D "BUILDER=\"nmake\"" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\named.bsc" 
 BSC32_SBRS= \
@@ -324,6 +334,9 @@ BSC32_SBRS= \
        "$(INTDIR)\control.sbr" \
        "$(INTDIR)\controlconf.sbr" \
        "$(INTDIR)\dlz_dlopen_driver.sbr" \
+@IF GEOIP
+       "$(INTDIR)\geoip.sbr" \
+@END GEOIP
        "$(INTDIR)\interfacemgr.sbr" \
        "$(INTDIR)\listenlist.sbr" \
        "$(INTDIR)\log.sbr" \
@@ -358,13 +371,16 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named.pdb" /map:"$(INTDIR)\named.map" /debug /machine:I386 /out:"../../../Build/Debug/named.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/lwres/win32/Debug/liblwres.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/bind9/win32/Debug/libbind9.lib $(LIBXML) @GSSAPI_LIB@ @GEOIP_LIB@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named.pdb" /map:"$(INTDIR)\named.map" /debug @MACHINE@ /out:"../../../Build/Debug/named.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\client.obj" \
        "$(INTDIR)\config.obj" \
        "$(INTDIR)\control.obj" \
        "$(INTDIR)\controlconf.obj" \
        "$(INTDIR)\dlz_dlopen_driver.obj" \
+@IF GEOIP
+       "$(INTDIR)\geoip.obj" \
+@END GEOIP
        "$(INTDIR)\interfacemgr.obj" \
        "$(INTDIR)\listenlist.obj" \
        "$(INTDIR)\log.obj" \
@@ -447,17 +463,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "named - Win32 Release" || "$(CFG)" == "named - Win32 Debug"
+!IF "$(CFG)" == "named - @PLATFORM@ Release" || "$(CFG)" == "named - @PLATFORM@ Debug"
 SOURCE=..\builtin.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\builtin.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\builtin.obj"        "$(INTDIR)\builtin.sbr" : $(SOURCE) "$(INTDIR)"
@@ -468,14 +484,14 @@ SOURCE=..\builtin.c
 
 SOURCE=..\client.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\client.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\client.obj" "$(INTDIR)\client.sbr" : $(SOURCE) "$(INTDIR)"
@@ -486,14 +502,14 @@ SOURCE=..\client.c
 
 SOURCE=..\config.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\config.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\config.obj" "$(INTDIR)\config.sbr" : $(SOURCE) "$(INTDIR)"
@@ -504,14 +520,14 @@ SOURCE=..\config.c
 
 SOURCE=..\control.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\control.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\control.obj"        "$(INTDIR)\control.sbr" : $(SOURCE) "$(INTDIR)"
@@ -522,14 +538,14 @@ SOURCE=..\control.c
 
 SOURCE=..\controlconf.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\controlconf.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\controlconf.obj"    "$(INTDIR)\controlconf.sbr" : $(SOURCE) "$(INTDIR)"
@@ -540,13 +556,13 @@ SOURCE=..\controlconf.c
 
 SOURCE=.\dlz_dlopen_driver.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dlz_dlopen_driver.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dlz_dlopen_driver.obj"      "$(INTDIR)\dlz_dlopen_driver.sbr" : $(SOURCE) "$(INTDIR)"
@@ -554,16 +570,36 @@ SOURCE=.\dlz_dlopen_driver.c
 
 !ENDIF 
 
+@IF GEOIP
+SOURCE=..\geoip.c
+
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
+
+
+"$(INTDIR)\geoip.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\geoip.obj"  "$(INTDIR)\geoip.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+@END GEOIP
+
 SOURCE=..\interfacemgr.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\interfacemgr.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\interfacemgr.obj"   "$(INTDIR)\interfacemgr.sbr" : $(SOURCE) "$(INTDIR)"
@@ -574,14 +610,14 @@ SOURCE=..\interfacemgr.c
 
 SOURCE=..\listenlist.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\listenlist.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\listenlist.obj"     "$(INTDIR)\listenlist.sbr" : $(SOURCE) "$(INTDIR)"
@@ -592,14 +628,14 @@ SOURCE=..\listenlist.c
 
 SOURCE=..\log.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\log.obj"    "$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"
@@ -610,14 +646,14 @@ SOURCE=..\log.c
 
 SOURCE=..\logconf.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\logconf.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\logconf.obj"        "$(INTDIR)\logconf.sbr" : $(SOURCE) "$(INTDIR)"
@@ -628,14 +664,14 @@ SOURCE=..\logconf.c
 
 SOURCE=..\lwaddr.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwaddr.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwaddr.obj" "$(INTDIR)\lwaddr.sbr" : $(SOURCE) "$(INTDIR)"
@@ -646,14 +682,14 @@ SOURCE=..\lwaddr.c
 
 SOURCE=..\lwdclient.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwdclient.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwdclient.obj"      "$(INTDIR)\lwdclient.sbr" : $(SOURCE) "$(INTDIR)"
@@ -664,14 +700,14 @@ SOURCE=..\lwdclient.c
 
 SOURCE=..\lwderror.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwderror.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwderror.obj"       "$(INTDIR)\lwderror.sbr" : $(SOURCE) "$(INTDIR)"
@@ -682,14 +718,14 @@ SOURCE=..\lwderror.c
 
 SOURCE=..\lwdgabn.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwdgabn.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwdgabn.obj"        "$(INTDIR)\lwdgabn.sbr" : $(SOURCE) "$(INTDIR)"
@@ -700,14 +736,14 @@ SOURCE=..\lwdgabn.c
 
 SOURCE=..\lwdgnba.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwdgnba.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwdgnba.obj"        "$(INTDIR)\lwdgnba.sbr" : $(SOURCE) "$(INTDIR)"
@@ -718,14 +754,14 @@ SOURCE=..\lwdgnba.c
 
 SOURCE=..\lwdgrbn.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwdgrbn.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwdgrbn.obj"        "$(INTDIR)\lwdgrbn.sbr" : $(SOURCE) "$(INTDIR)"
@@ -736,14 +772,14 @@ SOURCE=..\lwdgrbn.c
 
 SOURCE=..\lwdnoop.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwdnoop.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwdnoop.obj"        "$(INTDIR)\lwdnoop.sbr" : $(SOURCE) "$(INTDIR)"
@@ -754,14 +790,14 @@ SOURCE=..\lwdnoop.c
 
 SOURCE=..\lwresd.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwresd.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwresd.obj" "$(INTDIR)\lwresd.sbr" : $(SOURCE) "$(INTDIR)"
@@ -772,14 +808,14 @@ SOURCE=..\lwresd.c
 
 SOURCE=..\lwsearch.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwsearch.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwsearch.obj"       "$(INTDIR)\lwsearch.sbr" : $(SOURCE) "$(INTDIR)"
@@ -790,14 +826,14 @@ SOURCE=..\lwsearch.c
 
 SOURCE=..\main.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\main.obj"   "$(INTDIR)\main.sbr" : $(SOURCE) "$(INTDIR)"
@@ -808,14 +844,14 @@ SOURCE=..\main.c
 
 SOURCE=..\notify.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\notify.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\notify.obj" "$(INTDIR)\notify.sbr" : $(SOURCE) "$(INTDIR)"
@@ -826,13 +862,13 @@ SOURCE=..\notify.c
 
 SOURCE=.\ntservice.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ntservice.obj"      "$(INTDIR)\ntservice.sbr" : $(SOURCE) "$(INTDIR)"
@@ -842,13 +878,13 @@ SOURCE=.\ntservice.c
 
 SOURCE=.\os.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\os.obj"     "$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"
@@ -858,14 +894,14 @@ SOURCE=.\os.c
 
 SOURCE=..\query.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\query.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\query.obj"  "$(INTDIR)\query.sbr" : $(SOURCE) "$(INTDIR)"
@@ -876,14 +912,14 @@ SOURCE=..\query.c
 
 SOURCE=..\server.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\server.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\server.obj" "$(INTDIR)\server.sbr" : $(SOURCE) "$(INTDIR)"
@@ -894,14 +930,14 @@ SOURCE=..\server.c
 
 SOURCE=..\sortlist.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\sortlist.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\sortlist.obj"       "$(INTDIR)\sortlist.sbr" : $(SOURCE) "$(INTDIR)"
@@ -912,14 +948,14 @@ SOURCE=..\sortlist.c
 
 SOURCE=..\statschannel.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\statschannel.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\statschannel.obj"   "$(INTDIR)\statschannel.sbr" : $(SOURCE) "$(INTDIR)"
@@ -930,14 +966,14 @@ SOURCE=..\statschannel.c
 
 SOURCE=..\tkeyconf.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\tkeyconf.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\tkeyconf.obj"       "$(INTDIR)\tkeyconf.sbr" : $(SOURCE) "$(INTDIR)"
@@ -948,14 +984,14 @@ SOURCE=..\tkeyconf.c
 
 SOURCE=..\tsigconf.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\tsigconf.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\tsigconf.obj"       "$(INTDIR)\tsigconf.sbr" : $(SOURCE) "$(INTDIR)"
@@ -966,14 +1002,14 @@ SOURCE=..\tsigconf.c
 
 SOURCE=..\update.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\update.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\update.obj" "$(INTDIR)\update.sbr" : $(SOURCE) "$(INTDIR)"
@@ -984,14 +1020,14 @@ SOURCE=..\update.c
 
 SOURCE=..\xfrout.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\xfrout.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\xfrout.obj" "$(INTDIR)\xfrout.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1002,14 +1038,14 @@ SOURCE=..\xfrout.c
 
 SOURCE=..\zoneconf.c
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
 
 "$(INTDIR)\zoneconf.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\zoneconf.obj"       "$(INTDIR)\zoneconf.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1018,158 +1054,158 @@ SOURCE=..\zoneconf.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
-"libdns - Win32 Release" : 
+"libdns - @PLATFORM@ Release" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
    cd "..\..\..\bin\named\win32"
 
-"libdns - Win32 ReleaseCLEAN" : 
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
-"libdns - Win32 Debug" : 
+"libdns - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
    cd "..\..\..\bin\named\win32"
 
-"libdns - Win32 DebugCLEAN" : 
+"libdns - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\..\bin\named\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\named\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
-"libbind9 - Win32 Release" : 
+"libbind9 - @PLATFORM@ Release" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" 
    cd "..\..\..\bin\named\win32"
 
-"libbind9 - Win32 ReleaseCLEAN" : 
+"libbind9 - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
-"libbind9 - Win32 Debug" : 
+"libbind9 - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" 
    cd "..\..\..\bin\named\win32"
 
-"libbind9 - Win32 DebugCLEAN" : 
+"libbind9 - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
-"liblwres - Win32 Release" : 
+"liblwres - @PLATFORM@ Release" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" 
    cd "..\..\..\bin\named\win32"
 
-"liblwres - Win32 ReleaseCLEAN" : 
+"liblwres - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
-"liblwres - Win32 Debug" : 
+"liblwres - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" 
    cd "..\..\..\bin\named\win32"
 
-"liblwres - Win32 DebugCLEAN" : 
+"liblwres - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\lwres\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
-"libisccc - Win32 Release" : 
+"libisccc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isccc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Release" 
    cd "..\..\..\bin\named\win32"
 
-"libisccc - Win32 ReleaseCLEAN" : 
+"libisccc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isccc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
-"libisccc - Win32 Debug" : 
+"libisccc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isccc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\named\win32"
 
-"libisccc - Win32 DebugCLEAN" : 
+"libisccc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isccc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "named - Win32 Release"
+!IF  "$(CFG)" == "named - @PLATFORM@ Release"
 
-"libisccfg - Win32 Release" : 
+"libisccfg - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" 
    cd "..\..\..\bin\named\win32"
 
-"libisccfg - Win32 ReleaseCLEAN" : 
+"libisccfg - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
-!ELSEIF  "$(CFG)" == "named - Win32 Debug"
+!ELSEIF  "$(CFG)" == "named - @PLATFORM@ Debug"
 
-"libisccfg - Win32 Debug" : 
+"libisccfg - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" 
    cd "..\..\..\bin\named\win32"
 
-"libisccfg - Win32 DebugCLEAN" : 
+"libisccfg - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ENDIF 
diff --git a/bin/named/win32/named.vcxproj.filters.in b/bin/named/win32/named.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..0e7c604
--- /dev/null
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="dlz_dlopen_driver.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ntservice.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="os.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\builtin.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\client.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\config.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\control.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\controlconf.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+@IF GEOIP\r
+    <ClCompile Include="..\geoip.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+@END GEOIP\r
+    <ClCompile Include="..\interfacemgr.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\listenlist.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\log.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\logconf.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwaddr.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwdclient.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwderror.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwdgabn.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwdgnba.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwdgrbn.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwdnoop.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwresd.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwsearch.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\main.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\notify.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\query.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\server.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\sortlist.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\statschannel.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\tkeyconf.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\tsigconf.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\update.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\xfrout.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\zoneconf.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="include\named\ntservice.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\named\os.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\builtin.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\client.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\config.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\control.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+@IF GEOIP\r
+    <ClInclude Include="..\include\named\geoip.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+@END GEOIP\r
+    <ClInclude Include="..\include\named\globals.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\interfacemgr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\listenlist.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\log.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\logconf.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\lwaddr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\lwdclient.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\lwresd.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\lwsearch.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\main.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\notify.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\query.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\server.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\sortlist.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\statschannel.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\tkeyconf.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\tsigconf.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\types.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\update.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\xfrout.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\named\zoneconf.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/named/win32/named.vcxproj.in b/bin/named/win32/named.vcxproj.in
new file mode 100644 (file)
index 0000000..91252d3
--- /dev/null
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{723C65DA-A96C-4BA3-A34E-44F11CA346F9}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>named</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;@USE_OPENSSL@@USE_GSSAPI@BUILDER="Visual Studio";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;liblwres.lib;libisccfg.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;@USE_OPENSSL@@USE_GSSAPI@BUILDER="Visual Studio";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;liblwres.lib;libisccfg.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\builtin.c" />\r
+    <ClCompile Include="..\client.c" />\r
+    <ClCompile Include="..\config.c" />\r
+    <ClCompile Include="..\control.c" />\r
+    <ClCompile Include="..\controlconf.c" />\r
+@IF GEOIP\r
+    <ClCompile Include="..\geoip.c" />\r
+@END GEOIP\r
+    <ClCompile Include="..\interfacemgr.c" />\r
+    <ClCompile Include="..\listenlist.c" />\r
+    <ClCompile Include="..\log.c" />\r
+    <ClCompile Include="..\logconf.c" />\r
+    <ClCompile Include="..\lwaddr.c" />\r
+    <ClCompile Include="..\lwdclient.c" />\r
+    <ClCompile Include="..\lwderror.c" />\r
+    <ClCompile Include="..\lwdgabn.c" />\r
+    <ClCompile Include="..\lwdgnba.c" />\r
+    <ClCompile Include="..\lwdgrbn.c" />\r
+    <ClCompile Include="..\lwdnoop.c" />\r
+    <ClCompile Include="..\lwresd.c" />\r
+    <ClCompile Include="..\lwsearch.c" />\r
+    <ClCompile Include="..\main.c" />\r
+    <ClCompile Include="..\notify.c" />\r
+    <ClCompile Include="..\query.c" />\r
+    <ClCompile Include="..\server.c" />\r
+    <ClCompile Include="..\sortlist.c" />\r
+    <ClCompile Include="..\statschannel.c" />\r
+    <ClCompile Include="..\tkeyconf.c" />\r
+    <ClCompile Include="..\tsigconf.c" />\r
+    <ClCompile Include="..\update.c" />\r
+    <ClCompile Include="..\xfrout.c" />\r
+    <ClCompile Include="..\zoneconf.c" />\r
+    <ClCompile Include="dlz_dlopen_driver.c" />\r
+    <ClCompile Include="ntservice.c" />\r
+    <ClCompile Include="os.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\named\builtin.h" />\r
+    <ClInclude Include="..\include\named\client.h" />\r
+    <ClInclude Include="..\include\named\config.h" />\r
+    <ClInclude Include="..\include\named\control.h" />\r
+@IF GEOIP\r
+    <ClInclude Include="..\include\named\geoip.h" />\r
+@END GEOIP\r
+    <ClInclude Include="..\include\named\globals.h" />\r
+    <ClInclude Include="..\include\named\interfacemgr.h" />\r
+    <ClInclude Include="..\include\named\listenlist.h" />\r
+    <ClInclude Include="..\include\named\log.h" />\r
+    <ClInclude Include="..\include\named\logconf.h" />\r
+    <ClInclude Include="..\include\named\lwaddr.h" />\r
+    <ClInclude Include="..\include\named\lwdclient.h" />\r
+    <ClInclude Include="..\include\named\lwresd.h" />\r
+    <ClInclude Include="..\include\named\lwsearch.h" />\r
+    <ClInclude Include="..\include\named\main.h" />\r
+    <ClInclude Include="..\include\named\notify.h" />\r
+    <ClInclude Include="..\include\named\query.h" />\r
+    <ClInclude Include="..\include\named\server.h" />\r
+    <ClInclude Include="..\include\named\sortlist.h" />\r
+    <ClInclude Include="..\include\named\statschannel.h" />\r
+    <ClInclude Include="..\include\named\tkeyconf.h" />\r
+    <ClInclude Include="..\include\named\tsigconf.h" />\r
+    <ClInclude Include="..\include\named\types.h" />\r
+    <ClInclude Include="..\include\named\update.h" />\r
+    <ClInclude Include="..\include\named\xfrout.h" />\r
+    <ClInclude Include="..\include\named\zoneconf.h" />\r
+    <ClInclude Include="include\named\ntservice.h" />\r
+    <ClInclude Include="include\named\os.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/named/win32/named.vcxproj.user b/bin/named/win32/named.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index e05c7462db3104f4f43cff2e06634ee934f06706..5fb533da412a31e7910ad98ad7d13f7c25781fa8 100644 (file)
@@ -21,6 +21,7 @@
 #include <stdio.h>
 
 #include <isc/app.h>
+#include <isc/commandline.h>
 #include <isc/log.h>
 
 #include <named/globals.h>
 #include <named/main.h>
 #include <named/server.h>
 
-/* In fact more bound to the platform toolset... */
-#if defined(_M_IX86) && (_MSC_VER < 1600)
-#define ISC_ADJUST_FDIV
-#endif
-
 /* Handle to SCM for updating service status */
 static SERVICE_STATUS_HANDLE hServiceStatus = 0;
 static BOOL foreground = FALSE;
@@ -42,67 +38,7 @@ static char ConsoleTitle[128];
  * Forward declarations
  */
 void ServiceControl(DWORD dwCtrlCode);
-void GetArgs(int *, char ***, char ***);
-int main(int, char *[], char *[]); /* From ns_main.c */
-
-/*
- * Here we change the entry point for the executable to bindmain() from main()
- * This allows us to invoke as a service or from the command line easily.
- */
-#pragma comment(linker, "/entry:bindmain")
-
-/*
- * This is the entry point for the executable
- * We can now call main() explicitly or via StartServiceCtrlDispatcher()
- * as we need to.
- */
-int bindmain()
-{
-       int rc,
-       i = 1;
-
-       int argc;
-       char **envp, **argv;
-
-       /*
-        * We changed the entry point function, so we must initialize argv,
-        * etc. ourselves.  Ick.
-        */
-       GetArgs(&argc, &argv, &envp);
-
-       /* Command line users should put -f in the options. */
-       /* XXXMPA should use isc_commandline_parse() here. */
-       while (argv[i]) {
-               if (!strcmp(argv[i], "-f") ||
-                   !strcmp(argv[i], "-g") ||
-                   !strcmp(argv[i], "-v") ||
-                   !strcmp(argv[i], "-V")) {
-                       foreground = TRUE;
-                       break;
-               }
-               i++;
-       }
-
-       if (foreground) {
-               /* run in console window */
-               exit(main(argc, argv, envp));
-       } else {
-               /* Start up as service */
-               char *SERVICE_NAME = BIND_SERVICE_NAME;
-
-               SERVICE_TABLE_ENTRY dispatchTable[] = {
-                       { TEXT(SERVICE_NAME), (LPSERVICE_MAIN_FUNCTION)main },
-                       { NULL, NULL }
-               };
-
-               rc = StartServiceCtrlDispatcher(dispatchTable);
-               if (!rc) {
-                       fprintf(stderr, "Use -f to run from the command line.\n");
-                       exit(GetLastError());
-               }
-       }
-       exit(0);
-}
+int bindmain(int, char *[]); /* From main.c */
 
 /*
  * Initialize the Service by registering it.
@@ -189,60 +125,57 @@ void UpdateSCM(DWORD state) {
        }
 }
 
-/*
- * C-runtime stuff used to initialize the app and
- * get argv, argc, envp.
- */
+/* unhook main */
 
-typedef struct
-{
-       int newmode;
-} _startupinfo;
-
-_CRTIMP void __cdecl __set_app_type(int);
-_CRTIMP void __cdecl __getmainargs(int *, char ***, char ***, int,
-                                  _startupinfo *);
-void __cdecl _setargv(void);
-
-#ifdef ISC_ADJUST_FDIV
-/* Pentium FDIV adjustment */
-extern int _adjust_fdiv;
-extern int * _imp___adjust_fdiv;
-/* Floating point precision */
-extern void _setdefaultprecision();
-#endif
-
-extern int _newmode;           /* malloc new() handler mode */
-extern int _dowildcard;                /* passed to __getmainargs() */
-
-typedef void (__cdecl *_PVFV)(void);
-extern void __cdecl _initterm(_PVFV *, _PVFV *);
-extern _PVFV *__onexitbegin;
-extern _PVFV *__onexitend;
-extern _CRTIMP char **__initenv;
+#undef main
 
 /*
- * Do the work that mainCRTStartup() would normally do
+ * This is the entry point for the executable
+ * We can now call bindmain() explicitly or via StartServiceCtrlDispatcher()
+ * as we need to.
  */
-void GetArgs(int *argc, char ***argv, char ***envp)
+int main(int argc, char *argv[])
 {
-       _startupinfo startinfo;
+       int rc, ch;
 
-       /*
-        * Set the app type to Console (check CRT/SRC/INTERNAL.H:
-        * \#define _CONSOLE_APP 1)
-        */
-       __set_app_type(1);
+       /* Command line users should put -f in the options. */
+       isc_commandline_errprint = ISC_FALSE;
+       while ((ch = isc_commandline_parse(argc, argv,
+                                          "46c:C:d:D:E:fFgi:lm:n:N:p:P:"
+                                          "sS:t:T:U:u:vVx:")) != -1) {
+               switch (ch) {
+               case 'f':
+               case 'g':
+               case 'v':
+               case 'V':
+                       foreground = TRUE;
+                       break;
+               default:
+                       break;
+               }
+       }
+       isc_commandline_reset = ISC_TRUE;
 
-       /* Mark this module as an EXE file */
-       __onexitbegin = __onexitend = (_PVFV *)(-1);
+       if (foreground) {
+               /* run in console window */
+               exit(bindmain(argc, argv));
+       } else {
+               /* Start up as service */
+               char *SERVICE_NAME = BIND_SERVICE_NAME;
 
-       startinfo.newmode = _newmode;
-       __getmainargs(argc, argv, envp, _dowildcard, &startinfo);
-       __initenv = *envp;
+               SERVICE_TABLE_ENTRY dispatchTable[] = {
+                       { TEXT(SERVICE_NAME),
+                         (LPSERVICE_MAIN_FUNCTION)bindmain },
+                       { NULL, NULL }
+               };
 
-#ifdef ISC_ADJUST_FDIV
-       _adjust_fdiv = * _imp___adjust_fdiv;
-       _setdefaultprecision();
-#endif
+               rc = StartServiceCtrlDispatcher(dispatchTable);
+               if (!rc) {
+                       fprintf(stderr,
+                               "Use -f to run from the command line.\n");
+                       /* will be 1063 when launched as a console app */
+                       exit(GetLastError());
+               }
+       }
+       exit(0);
 }
index 416c44089ae86f2c5fd8ef8b365d3793d2f994d4..623e585e2a8542e5e85a1d50c9dbff4db4a964f6 100644 (file)
@@ -293,7 +293,7 @@ isc_result_t
 ns_os_gethostname(char *buf, size_t len) {
        int n;
 
-       n = gethostname(buf, len);
+       n = gethostname(buf, (int)len);
        return ((n == 0) ? ISC_R_SUCCESS : ISC_R_FAILURE);
 }
 
index 9914159306f0d3a0f3cab4c93ecd1062154e569f..729b125f64190c98abc2b5f273817d907640a536 100644 (file)
 
 #ifdef GSSAPI
 #include <dst/gssapi.h>
+#ifdef WIN32
+#include <krb5/krb5.h>
+#else
 #include ISC_PLATFORM_KRB5HEADER
 #endif
+#endif
 #include <bind9/getaddresses.h>
 
 
@@ -539,8 +543,8 @@ setup_keystr(void) {
                n = s;
        }
 
-       isc_buffer_init(&keynamesrc, name, n - name);
-       isc_buffer_add(&keynamesrc, n - name);
+       isc_buffer_init(&keynamesrc, name, (unsigned int)(n - name));
+       isc_buffer_add(&keynamesrc, (unsigned int)(n - name));
 
        debug("namefromtext");
        result = dns_name_fromtext(keyname, &keynamesrc, dns_rootname, 0, NULL);
diff --git a/bin/nsupdate/win32/nsupdate.dsp b/bin/nsupdate/win32/nsupdate.dsp
deleted file mode 100644 (file)
index a44b87e..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="nsupdate" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=nsupdate - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "nsupdate.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "nsupdate - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "nsupdate - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "nsupdate - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nsupdate.exe"
-
-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /u /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "nsupdate - Win32 Release"
-# Name "nsupdate - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\nsupdate.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/bin/nsupdate/win32/nsupdate.dsp.in b/bin/nsupdate/win32/nsupdate.dsp.in
new file mode 100644 (file)
index 0000000..7fd58cb
--- /dev/null
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="nsupdate" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=nsupdate - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "nsupdate.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "nsupdate - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "nsupdate - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "nsupdate - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @GSSAPI_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" @USE_GSSAPI@ /D "USE_READLINE_STATIC" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @GSSAPI_LIB@ @KRB5_LIB@ @READLINE_LIB@ ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/nsupdate.exe"
+
+!ELSEIF  "$(CFG)" == "nsupdate - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @GSSAPI_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" @USE_GSSAPI@ /D "USE_READLINE_STATIC" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /u @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @GSSAPI_LIB@ @KRB5_LIB@ @READLINE_LIBD@ ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "nsupdate - @PLATFORM@ Release"
+# Name "nsupdate - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\nsupdate.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
similarity index 61%
rename from bin/nsupdate/win32/nsupdate.mak
rename to bin/nsupdate/win32/nsupdate.mak.in
index 033c9a8e5395e97b7d208ddac7f0de3f3a781c83..67b2c94390aa5ba7e7b28b4f7533c1b5d4d3f94f 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on nsupdate.dsp
 !IF "$(CFG)" == ""
-CFG=nsupdate - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to nsupdate - Win32 Debug.
+CFG=nsupdate - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to nsupdate - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "nsupdate - Win32 Release" && "$(CFG)" != "nsupdate - Win32 Debug"
+!IF "$(CFG)" != "nsupdate - @PLATFORM@ Release" && "$(CFG)" != "nsupdate - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - Win32 Debug"
+!MESSAGE NMAKE /f "nsupdate.mak" CFG="nsupdate - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "nsupdate - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "nsupdate - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "nsupdate - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "nsupdate - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,7 +28,7 @@ NULL=nul
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "nsupdate - Win32 Release"
+!IF  "$(CFG)" == "nsupdate - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -103,7 +103,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "nsupdate - Win32 Release"
+!IF  "$(CFG)" == "nsupdate - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -114,12 +114,12 @@ ALL : "..\..\..\Build\Release\nsupdate.exe"
 
 !ELSE 
 
-ALL : "libbind9 - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\nsupdate.exe"
+ALL : "libbind9 - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\nsupdate.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -131,13 +131,13 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nsupdate.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @GSSAPI_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" @USE_GSSAPI@ /D "USE_READLINE_STATIC" /D "__STDC__" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nsupdate.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsupdate.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib  ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/isccfg/win32/Release/libisccfg.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nsupdate.pdb" /machine:I386 /out:"../../../Build/Release/nsupdate.exe" 
+LINK32_FLAGS=../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/lwres/win32/Release/liblwres.lib user32.lib advapi32.lib ws2_32.lib  ../../../lib/bind9/win32/Release/libbind9.lib ../../../lib/isccfg/win32/Release/libisccfg.lib @GSSAPI_LIB@ @KRB5_LIB@ @READLINE_LIB@ /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nsupdate.pdb" @MACHINE@ /out:"../../../Build/Release/nsupdate.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\nsupdate.obj" \
        "..\..\..\lib\dns\win32\Release\libdns.lib" \
@@ -151,7 +151,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nsupdate - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -165,12 +165,12 @@ ALL : "..\..\..\Build\Debug\nsupdate.exe" "$(OUTDIR)\nsupdate.bsc"
 
 !ELSE 
 
-ALL : "libbind9 - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\nsupdate.exe" "$(OUTDIR)\nsupdate.bsc"
+ALL : "libbind9 - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\nsupdate.exe" "$(OUTDIR)\nsupdate.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -187,7 +187,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../include" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../include" /I "../../../" @LIBXML2_INC@ @GSSAPI_INC@ @READLINE_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/lwres/win32/include/lwres" /I "../../../lib/dns/include" /I "../../../lib/bind9/include" /I "../../../lib/isccfg/include" /D "WIN32" @USE_GSSAPI@ /D "USE_READLINE_STATIC" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsupdate.bsc" 
 BSC32_SBRS= \
@@ -199,7 +199,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib  ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nsupdate.pdb" /debug /machine:I386 /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept 
+LINK32_FLAGS=../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/lwres/win32/Debug/liblwres.lib user32.lib advapi32.lib ws2_32.lib  ../../../lib/bind9/win32/Debug/libbind9.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib @GSSAPI_LIB@ @KRB5_LIB@ @READLINE_LIBD@ /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nsupdate.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/nsupdate.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\nsupdate.obj" \
        "..\..\..\lib\dns\win32\Debug\libdns.lib" \
@@ -255,17 +255,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "nsupdate - Win32 Release" || "$(CFG)" == "nsupdate - Win32 Debug"
+!IF "$(CFG)" == "nsupdate - @PLATFORM@ Release" || "$(CFG)" == "nsupdate - @PLATFORM@ Debug"
 SOURCE=..\nsupdate.c
 
-!IF  "$(CFG)" == "nsupdate - Win32 Release"
+!IF  "$(CFG)" == "nsupdate - @PLATFORM@ Release"
 
 
 "$(INTDIR)\nsupdate.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nsupdate - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\nsupdate.obj"       "$(INTDIR)\nsupdate.sbr" : $(SOURCE) "$(INTDIR)"
@@ -274,80 +274,80 @@ SOURCE=..\nsupdate.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "nsupdate - Win32 Release"
+!IF  "$(CFG)" == "nsupdate - @PLATFORM@ Release"
 
-"libdns - Win32 Release" : 
+"libdns - @PLATFORM@ Release" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
    cd "..\..\..\bin\nsupdate\win32"
 
-"libdns - Win32 ReleaseCLEAN" : 
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nsupdate - @PLATFORM@ Debug"
 
-"libdns - Win32 Debug" : 
+"libdns - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
    cd "..\..\..\bin\nsupdate\win32"
 
-"libdns - Win32 DebugCLEAN" : 
+"libdns - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "nsupdate - Win32 Release"
+!IF  "$(CFG)" == "nsupdate - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\..\bin\nsupdate\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nsupdate - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\nsupdate\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "nsupdate - Win32 Release"
+!IF  "$(CFG)" == "nsupdate - @PLATFORM@ Release"
 
-"libbind9 - Win32 Release" : 
+"libbind9 - @PLATFORM@ Release" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" 
    cd "..\..\..\bin\nsupdate\win32"
 
-"libbind9 - Win32 ReleaseCLEAN" : 
+"libbind9 - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
-!ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nsupdate - @PLATFORM@ Debug"
 
-"libbind9 - Win32 Debug" : 
+"libbind9 - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" 
    cd "..\..\..\bin\nsupdate\win32"
 
-"libbind9 - Win32 DebugCLEAN" : 
+"libbind9 - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
 !ENDIF 
diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.filters.in b/bin/nsupdate/win32/nsupdate.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..c5758d3
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\nsupdate.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.in b/bin/nsupdate/win32/nsupdate.vcxproj.in
new file mode 100644 (file)
index 0000000..414f556
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{C41266C7-E27E-4D60-9815-82D3B32BF82F}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>nsupdate</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;@USE_GSSAPI@USE_READLINE_STATIC;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\include;..\..\..\;@LIBXML2_INC@@GSSAPI_INC@@READLINE_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\lwres\win32\include\lwres;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@READLINE_LIBD@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;liblwres.lib;libbind9.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;@USE_GSSAPI@USE_READLINE_STATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\include;..\..\..\;@LIBXML2_INC@@READLINE_INC@@GSSAPI_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\lwres\win32\include;..\..\..\lib\lwres\include;..\..\..\lib\lwres\win32\include\lwres;..\..\..\lib\dns\include;..\..\..\lib\bind9\include;..\..\..\lib\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\lwres\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@READLINE_LIB@@GSSAPI_LIB@@KRB5_LIB@libisc.lib;libdns.lib;liblwres.lib;libbind9.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\nsupdate.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/nsupdate/win32/nsupdate.vcxproj.user b/bin/nsupdate/win32/nsupdate.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 65%
rename from bin/pkcs11/win32/pk11destroy.dsp
rename to bin/pkcs11/win32/pk11destroy.dsp.in
index 43c0950f4a55743566eb473f2da913c03d3c9f50..aedbc61a0f714afc78e8d1ef8cbb2a083651bfea 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
 # ** DO NOT EDIT **\r
 \r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103\r
 \r
-CFG=pk11destroy - Win32 Debug\r
+CFG=pk11destroy - @PLATFORM@ Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,12 +13,12 @@ CFG=pk11destroy - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "pk11destroy.mak" CFG="pk11destroy - Win32 Debug"\r
+!MESSAGE NMAKE /f "pk11destroy.mak" CFG="pk11destroy - @PLATFORM@ Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "pk11destroy - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "pk11destroy - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "pk11destroy - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")\r
+!MESSAGE "pk11destroy - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -28,7 +28,7 @@ CFG=pk11destroy - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "pk11destroy - Win32 Release"\r
+!IF  "$(CFG)" == "pk11destroy - @PLATFORM@ Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /YX /FD /c\r
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c\r
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/pkcs11-destroy.exe"\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@\r
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-destroy.exe"\r
 \r
-!ELSEIF  "$(CFG)" == "pk11destroy - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "pk11destroy - @PLATFORM@ Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /FR /FD /GZ /c\r
-# SUBTRACT CPP /X /YX\r
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c\r
+# SUBTRACT CPP /X @COPTY@\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept\r
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
-# Name "pk11destroy - Win32 Release"\r
-# Name "pk11destroy - Win32 Debug"\r
+# Name "pk11destroy - @PLATFORM@ Release"\r
+# Name "pk11destroy - @PLATFORM@ Debug"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
similarity index 76%
rename from bin/pkcs11/win32/pk11destroy.mak
rename to bin/pkcs11/win32/pk11destroy.mak.in
index 75d310ee9725c84def4d8be4a8087502d9c0c402..15384d520e2a2738740529c6502611cc3475fc37 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on pk11destroy.dsp\r
 !IF "$(CFG)" == ""\r
-CFG=pk11destroy - Win32 Debug\r
-!MESSAGE No configuration specified. Defaulting to pk11destroy - Win32 Debug.\r
+CFG=pk11destroy - @PLATFORM@ Debug\r
+!MESSAGE No configuration specified. Defaulting to pk11destroy - @PLATFORM@ Debug.\r
 !ENDIF \r
 \r
-!IF "$(CFG)" != "pk11destroy - Win32 Release" && "$(CFG)" != "pk11destroy - Win32 Debug"\r
+!IF "$(CFG)" != "pk11destroy - @PLATFORM@ Release" && "$(CFG)" != "pk11destroy - @PLATFORM@ Debug"\r
 !MESSAGE Invalid configuration "$(CFG)" specified.\r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "pk11destroy.mak" CFG="pk11destroy - Win32 Debug"\r
+!MESSAGE NMAKE /f "pk11destroy.mak" CFG="pk11destroy - @PLATFORM@ Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "pk11destroy - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "pk11destroy - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "pk11destroy - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")\r
+!MESSAGE "pk11destroy - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")\r
 !MESSAGE \r
 !ERROR An invalid configuration is specified.\r
 !ENDIF \r
@@ -25,7 +25,7 @@ NULL=
 NULL=nul\r
 !ENDIF \r
 \r
-!IF  "$(CFG)" == "pk11destroy - Win32 Release"\r
+!IF  "$(CFG)" == "pk11destroy - @PLATFORM@ Release"\r
 _VC_MANIFEST_INC=0\r
 _VC_MANIFEST_BASENAME=__VC80\r
 !ELSE\r
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 \r
 !endif\r
 \r
-!IF  "$(CFG)" == "pk11destroy - Win32 Release"\r
+!IF  "$(CFG)" == "pk11destroy - @PLATFORM@ Release"\r
 \r
 OUTDIR=.\Release\r
 INTDIR=.\Release\r
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
 CPP=cl.exe\r
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /Fp"$(INTDIR)\pk11destroy.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11destroy.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 \r
 .c{$(INTDIR)}.obj::\r
    $(CPP) @<<\r
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11destroy.bsc"
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" /machine:I386 /out:"../../../Build/Release/pkcs11-destroy.exe" \r
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-destroy.exe" \r
 LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj"\r
 \r
 "..\..\..\Build\Release\pkcs11-destroy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
@@ -165,7 +165,7 @@ LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj"
 <<\r
     $(_VC_MANIFEST_EMBED_EXE)\r
 \r
-!ELSEIF  "$(CFG)" == "pk11destroy - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "pk11destroy - @PLATFORM@ Debug"\r
 \r
 OUTDIR=.\Debug\r
 INTDIR=.\Debug\r
@@ -191,7 +191,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
 CPP=cl.exe\r
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 \r
 .c{$(INTDIR)}.obj::\r
    $(CPP) @<<\r
@@ -234,7 +234,7 @@ BSC32_SBRS= "$(INTDIR)\pkcs11-destroy.sbr"
 <<\r
 \r
 LINK32=link.exe\r
-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" /debug /machine:I386 /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept \r
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-destroy.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-destroy.exe" /pdbtype:sept \r
 LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj"\r
 \r
 "..\..\..\Build\Debug\pkcs11-destroy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
@@ -255,17 +255,17 @@ LINK32_OBJS= "$(INTDIR)\pkcs11-destroy.obj"
 !ENDIF \r
 \r
 \r
-!IF "$(CFG)" == "pk11destroy - Win32 Release" || "$(CFG)" == "pk11destroy - Win32 Debug"\r
+!IF "$(CFG)" == "pk11destroy - @PLATFORM@ Release" || "$(CFG)" == "pk11destroy - @PLATFORM@ Debug"\r
 SOURCE="..\pkcs11-destroy.c"\r
 \r
-!IF  "$(CFG)" == "pk11destroy - Win32 Release"\r
+!IF  "$(CFG)" == "pk11destroy - @PLATFORM@ Release"\r
 \r
 \r
 "$(INTDIR)\pkcs11-destroy.obj" : $(SOURCE) "$(INTDIR)"\r
        $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "pk11destroy - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "pk11destroy - @PLATFORM@ Debug"\r
 \r
 \r
 "$(INTDIR)\pkcs11-destroy.obj" "$(INTDIR)\pkcs11-destroy.sbr" : $(SOURCE) "$(INTDIR)"\r
diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.filters.in b/bin/pkcs11/win32/pk11destroy.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..6796831
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="cryptoki.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\pkcs11.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\pkcs11f.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\pkcs11t.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\pkcs11-destroy.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.in b/bin/pkcs11/win32/pk11destroy.vcxproj.in
new file mode 100644 (file)
index 0000000..d745bd5
--- /dev/null
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5B3137E5-7E1F-49AA-8810-A09AA417D326}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>pk11destroy</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>pkcs11-destroy</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;@PK11_LIB_LOCATION@NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\pkcs11.h" />\r
+    <ClInclude Include="..\include\pkcs11f.h" />\r
+    <ClInclude Include="..\include\pkcs11t.h" />\r
+    <ClInclude Include="cryptoki.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\pkcs11-destroy.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/pkcs11/win32/pk11destroy.vcxproj.user b/bin/pkcs11/win32/pk11destroy.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 65%
rename from bin/pkcs11/win32/pk11keygen.dsp
rename to bin/pkcs11/win32/pk11keygen.dsp.in
index b0eb1c13f719dc736e8beae43d7ad61dfa41c39c..d2da38781f052d290ad13c236360d11fa8608eb7 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
 # ** DO NOT EDIT **\r
 \r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103\r
 \r
-CFG=pk11keygen - Win32 Debug\r
+CFG=pk11keygen - @PLATFORM@ Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,12 +13,12 @@ CFG=pk11keygen - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "pk11keygen.mak" CFG="pk11keygen - Win32 Debug"\r
+!MESSAGE NMAKE /f "pk11keygen.mak" CFG="pk11keygen - @PLATFORM@ Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "pk11keygen - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "pk11keygen - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "pk11keygen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")\r
+!MESSAGE "pk11keygen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -28,7 +28,7 @@ CFG=pk11keygen - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "pk11keygen - Win32 Release"\r
+!IF  "$(CFG)" == "pk11keygen - @PLATFORM@ Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /YX /FD /c\r
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c\r
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/pkcs11-keygen.exe"\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@\r
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-keygen.exe"\r
 \r
-!ELSEIF  "$(CFG)" == "pk11keygen - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "pk11keygen - @PLATFORM@ Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /FR /FD /GZ /c\r
-# SUBTRACT CPP /X /YX\r
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c\r
+# SUBTRACT CPP /X @COPTY@\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept\r
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
-# Name "pk11keygen - Win32 Release"\r
-# Name "pk11keygen - Win32 Debug"\r
+# Name "pk11keygen - @PLATFORM@ Release"\r
+# Name "pk11keygen - @PLATFORM@ Debug"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
similarity index 76%
rename from bin/pkcs11/win32/pk11keygen.mak
rename to bin/pkcs11/win32/pk11keygen.mak.in
index be76e8b7479a9ccfc9d9b19a940950f4c90ac337..7d2956aebc1be68d224dd5bfd0cf72ecd42cc074 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on pk11keygen.dsp\r
 !IF "$(CFG)" == ""\r
-CFG=pk11keygen - Win32 Debug\r
-!MESSAGE No configuration specified. Defaulting to pk11keygen - Win32 Debug.\r
+CFG=pk11keygen - @PLATFORM@ Debug\r
+!MESSAGE No configuration specified. Defaulting to pk11keygen - @PLATFORM@ Debug.\r
 !ENDIF \r
 \r
-!IF "$(CFG)" != "pk11keygen - Win32 Release" && "$(CFG)" != "pk11keygen - Win32 Debug"\r
+!IF "$(CFG)" != "pk11keygen - @PLATFORM@ Release" && "$(CFG)" != "pk11keygen - @PLATFORM@ Debug"\r
 !MESSAGE Invalid configuration "$(CFG)" specified.\r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "pk11keygen.mak" CFG="pk11keygen - Win32 Debug"\r
+!MESSAGE NMAKE /f "pk11keygen.mak" CFG="pk11keygen - @PLATFORM@ Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "pk11keygen - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "pk11keygen - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "pk11keygen - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")\r
+!MESSAGE "pk11keygen - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")\r
 !MESSAGE \r
 !ERROR An invalid configuration is specified.\r
 !ENDIF \r
@@ -25,7 +25,7 @@ NULL=
 NULL=nul\r
 !ENDIF \r
 \r
-!IF  "$(CFG)" == "pk11keygen - Win32 Release"\r
+!IF  "$(CFG)" == "pk11keygen - @PLATFORM@ Release"\r
 _VC_MANIFEST_INC=0\r
 _VC_MANIFEST_BASENAME=__VC80\r
 !ELSE\r
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 \r
 !endif\r
 \r
-!IF  "$(CFG)" == "pk11keygen - Win32 Release"\r
+!IF  "$(CFG)" == "pk11keygen - @PLATFORM@ Release"\r
 \r
 OUTDIR=.\Release\r
 INTDIR=.\Release\r
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
 CPP=cl.exe\r
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /Fp"$(INTDIR)\pk11keygen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11keygen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 \r
 .c{$(INTDIR)}.obj::\r
    $(CPP) @<<\r
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11keygen.bsc"
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" /machine:I386 /out:"../../../Build/Release/pkcs11-keygen.exe" \r
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-keygen.exe" \r
 LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj"\r
 \r
 "..\..\..\Build\Release\pkcs11-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
@@ -165,7 +165,7 @@ LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj"
 <<\r
     $(_VC_MANIFEST_EMBED_EXE)\r
 \r
-!ELSEIF  "$(CFG)" == "pk11keygen - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "pk11keygen - @PLATFORM@ Debug"\r
 \r
 OUTDIR=.\Debug\r
 INTDIR=.\Debug\r
@@ -191,7 +191,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
 CPP=cl.exe\r
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 \r
 .c{$(INTDIR)}.obj::\r
    $(CPP) @<<\r
@@ -234,7 +234,7 @@ BSC32_SBRS= "$(INTDIR)\pkcs11-keygen.sbr"
 <<\r
 \r
 LINK32=link.exe\r
-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" /debug /machine:I386 /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept \r
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-keygen.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-keygen.exe" /pdbtype:sept \r
 LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj"\r
 \r
 "..\..\..\Build\Debug\pkcs11-keygen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
@@ -255,17 +255,17 @@ LINK32_OBJS= "$(INTDIR)\pkcs11-keygen.obj"
 !ENDIF \r
 \r
 \r
-!IF "$(CFG)" == "pk11keygen - Win32 Release" || "$(CFG)" == "pk11keygen - Win32 Debug"\r
+!IF "$(CFG)" == "pk11keygen - @PLATFORM@ Release" || "$(CFG)" == "pk11keygen - @PLATFORM@ Debug"\r
 SOURCE="..\pkcs11-keygen.c"\r
 \r
-!IF  "$(CFG)" == "pk11keygen - Win32 Release"\r
+!IF  "$(CFG)" == "pk11keygen - @PLATFORM@ Release"\r
 \r
 \r
 "$(INTDIR)\pkcs11-keygen.obj" : $(SOURCE) "$(INTDIR)"\r
        $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "pk11keygen - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "pk11keygen - @PLATFORM@ Debug"\r
 \r
 \r
 "$(INTDIR)\pkcs11-keygen.obj"  "$(INTDIR)\pkcs11-keygen.sbr" : $(SOURCE) "$(INTDIR)"\r
diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.filters.in b/bin/pkcs11/win32/pk11keygen.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..369a616
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="cryptoki.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\pkcs11.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\pkcs11f.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\pkcs11t.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\pkcs11-keygen.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.in b/bin/pkcs11/win32/pk11keygen.vcxproj.in
new file mode 100644 (file)
index 0000000..f737221
--- /dev/null
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5042D371-0402-4FA3-A52A-769708694422}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>pk11keygen</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>pkcs11-keygen</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>pkcs11-keygen</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;@PK11_LIB_LOCATION@NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\pkcs11.h" />\r
+    <ClInclude Include="..\include\pkcs11f.h" />\r
+    <ClInclude Include="..\include\pkcs11t.h" />\r
+    <ClInclude Include="cryptoki.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\pkcs11-keygen.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/pkcs11/win32/pk11keygen.vcxproj.user b/bin/pkcs11/win32/pk11keygen.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 65%
rename from bin/pkcs11/win32/pk11list.dsp
rename to bin/pkcs11/win32/pk11list.dsp.in
index ad564e2dbd33cd31d276f37ae2ca44ec3cb27677..d027eeccd9d268f0c72386d789995264104d4859 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
 # ** DO NOT EDIT **\r
 \r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103\r
 \r
-CFG=pk11list - Win32 Debug\r
+CFG=pk11list - @PLATFORM@ Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
@@ -13,12 +13,12 @@ CFG=pk11list - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "pk11list.mak" CFG="pk11list - Win32 Debug"\r
+!MESSAGE NMAKE /f "pk11list.mak" CFG="pk11list - @PLATFORM@ Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "pk11list - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "pk11list - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "pk11list - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")\r
+!MESSAGE "pk11list - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -28,7 +28,7 @@ CFG=pk11list - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "pk11list - Win32 Release"\r
+!IF  "$(CFG)" == "pk11list - @PLATFORM@ Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /YX /FD /c\r
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c\r
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ @COPTY@ /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/pkcs11-list.exe"\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@\r
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/pkcs11-list.exe"\r
 \r
-!ELSEIF  "$(CFG)" == "pk11list - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "pk11list - @PLATFORM@ Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /FR /FD /GZ /c\r
-# SUBTRACT CPP /X /YX\r
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR /FD /GZ /c\r
+# SUBTRACT CPP /X @COPTY@\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept\r
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
-# Name "pk11list - Win32 Release"\r
-# Name "pk11list - Win32 Debug"\r
+# Name "pk11list - @PLATFORM@ Release"\r
+# Name "pk11list - @PLATFORM@ Debug"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
similarity index 75%
rename from bin/pkcs11/win32/pk11list.mak
rename to bin/pkcs11/win32/pk11list.mak.in
index dad24430b92d572d802586c295e26e8ef2ec2c50..6b585ee97e4c1897b0b1daa5275e8894cd01f35a 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on pk11list.dsp\r
 !IF "$(CFG)" == ""\r
-CFG=pk11list - Win32 Debug\r
-!MESSAGE No configuration specified. Defaulting to pk11list - Win32 Debug.\r
+CFG=pk11list - @PLATFORM@ Debug\r
+!MESSAGE No configuration specified. Defaulting to pk11list - @PLATFORM@ Debug.\r
 !ENDIF \r
 \r
-!IF "$(CFG)" != "pk11list - Win32 Release" && "$(CFG)" != "pk11list - Win32 Debug"\r
+!IF "$(CFG)" != "pk11list - @PLATFORM@ Release" && "$(CFG)" != "pk11list - @PLATFORM@ Debug"\r
 !MESSAGE Invalid configuration "$(CFG)" specified.\r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "pk11list.mak" CFG="pk11list - Win32 Debug"\r
+!MESSAGE NMAKE /f "pk11list.mak" CFG="pk11list - @PLATFORM@ Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "pk11list - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "pk11list - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "pk11list - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")\r
+!MESSAGE "pk11list - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")\r
 !MESSAGE \r
 !ERROR An invalid configuration is specified.\r
 !ENDIF \r
@@ -25,7 +25,7 @@ NULL=
 NULL=nul\r
 !ENDIF \r
 \r
-!IF  "$(CFG)" == "pk11list - Win32 Release"\r
+!IF  "$(CFG)" == "pk11list - @PLATFORM@ Release"\r
 _VC_MANIFEST_INC=0\r
 _VC_MANIFEST_BASENAME=__VC80\r
 !ELSE\r
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 \r
 !endif\r
 \r
-!IF  "$(CFG)" == "pk11list - Win32 Release"\r
+!IF  "$(CFG)" == "pk11list - @PLATFORM@ Release"\r
 \r
 OUTDIR=.\Release\r
 INTDIR=.\Release\r
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
 CPP=cl.exe\r
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /Fp"$(INTDIR)\pk11list.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /Fp"$(INTDIR)\pk11list.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 \r
 .c{$(INTDIR)}.obj::\r
    $(CPP) @<<\r
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\pk11list.bsc"
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-list.pdb" /machine:I386 /out:"../../../Build/Release/pkcs11-list.exe" \r
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\pkcs11-list.pdb" @MACHINE@ /out:"../../../Build/Release/pkcs11-list.exe" \r
 LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj"\r
 \r
 "..\..\..\Build\Release\pkcs11-list.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
@@ -165,7 +165,7 @@ LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj"
 <<\r
     $(_VC_MANIFEST_EMBED_EXE)\r
 \r
-!ELSEIF  "$(CFG)" == "pk11list - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "pk11list - @PLATFORM@ Debug"\r
 \r
 OUTDIR=.\Debug\r
 INTDIR=.\Debug\r
@@ -191,7 +191,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
 CPP=cl.exe\r
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /D "PK11_LIB_LOCATION=\"unknown_provider\"" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../.." /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @PK11_LIB_LOCATION@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 \r
 .c{$(INTDIR)}.obj::\r
    $(CPP) @<<\r
@@ -234,7 +234,7 @@ BSC32_SBRS= "$(INTDIR)\pkcs11-list.sbr"
 <<\r
 \r
 LINK32=link.exe\r
-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-list.pdb" /debug /machine:I386 /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept \r
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pkcs11-list.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/pkcs11-list.exe" /pdbtype:sept \r
 LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj"\r
 \r
 "..\..\..\Build\Debug\pkcs11-list.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
@@ -255,17 +255,17 @@ LINK32_OBJS= "$(INTDIR)\pkcs11-list.obj"
 !ENDIF \r
 \r
 \r
-!IF "$(CFG)" == "pk11list - Win32 Release" || "$(CFG)" == "pk11list - Win32 Debug"\r
+!IF "$(CFG)" == "pk11list - @PLATFORM@ Release" || "$(CFG)" == "pk11list - @PLATFORM@ Debug"\r
 SOURCE="..\pkcs11-list.c"\r
 \r
-!IF  "$(CFG)" == "pk11list - Win32 Release"\r
+!IF  "$(CFG)" == "pk11list - @PLATFORM@ Release"\r
 \r
 \r
 "$(INTDIR)\pkcs11-list.obj" : $(SOURCE) "$(INTDIR)"\r
        $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "pk11list - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "pk11list - @PLATFORM@ Debug"\r
 \r
 \r
 "$(INTDIR)\pkcs11-list.obj"    "$(INTDIR)\pkcs11-list.sbr" : $(SOURCE) "$(INTDIR)"\r
diff --git a/bin/pkcs11/win32/pk11list.vcxproj.filters.in b/bin/pkcs11/win32/pk11list.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..7198a1a
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="cryptoki.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\pkcs11.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\pkcs11f.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\pkcs11t.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\pkcs11-list.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/pkcs11/win32/pk11list.vcxproj.in b/bin/pkcs11/win32/pk11list.vcxproj.in
new file mode 100644 (file)
index 0000000..7527e8c
--- /dev/null
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{C663B088-F7BC-4C8C-8D06-A76636EED651}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>pk11list</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>pkcs11-list</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>pkcs11-list</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;@PK11_LIB_LOCATION@_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;@PK11_LIB_LOCATION@NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\pkcs11.h" />\r
+    <ClInclude Include="..\include\pkcs11f.h" />\r
+    <ClInclude Include="..\include\pkcs11t.h" />\r
+    <ClInclude Include="cryptoki.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\pkcs11-list.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/pkcs11/win32/pk11list.vcxproj.user b/bin/pkcs11/win32/pk11list.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/python/dnssec-checkds.py.in b/bin/python/dnssec-checkds.py.in
new file mode 100644 (file)
index 0000000..8f11468
--- /dev/null
@@ -0,0 +1,300 @@
+#!@PYTHON@
+############################################################################
+# Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+############################################################################
+
+# $Id$
+
+import argparse
+import pprint
+import os
+
+def shellquote(s):
+    if os.name == 'nt':
+        return s
+    return "'" + s.replace("'", "'\\''") + "'"
+
+############################################################################
+# DSRR class:
+# Delegation Signer (DS) resource record
+############################################################################
+class DSRR:
+    hashalgs = {1: 'SHA-1', 2: 'SHA-256', 3: 'GOST'}
+    rrname=''
+    rrclass='IN'
+    rrtype='DS'
+    keyid=None
+    keyalg=None
+    hashalg=None
+    digest=''
+    ttl=0
+
+    def __init__(self, rrtext):
+        if not rrtext:
+            return
+
+        fields = rrtext.split()
+        if len(fields) < 7:
+            return
+
+        self.rrname = fields[0].lower()
+        fields = fields[1:]
+        if fields[0].upper() in ['IN','CH','HS']:
+            self.rrclass = fields[0].upper()
+            fields = fields[1:]
+        else:
+            self.ttl = int(fields[0])
+            self.rrclass = fields[1].upper()
+            fields = fields[2:]
+
+        if fields[0].upper() != 'DS':
+            raise Exception
+
+        self.rrtype = 'DS'
+        self.keyid = int(fields[1])
+        self.keyalg = int(fields[2])
+        self.hashalg = int(fields[3])
+        self.digest = ''.join(fields[4:]).upper()
+
+    def __repr__(self):
+        return('%s %s %s %d %d %d %s' %
+                (self.rrname, self.rrclass, self.rrtype, self.keyid,
+                self.keyalg, self.hashalg, self.digest))
+
+    def __eq__(self, other):
+        return self.__repr__() == other.__repr__()
+
+############################################################################
+# DLVRR class:
+# DNSSEC Lookaside Validation (DLV) resource record
+############################################################################
+class DLVRR:
+    hashalgs = {1: 'SHA-1', 2: 'SHA-256', 3: 'GOST'}
+    parent=''
+    dlvname=''
+    rrname='IN'
+    rrclass='IN'
+    rrtype='DLV'
+    keyid=None
+    keyalg=None
+    hashalg=None
+    digest=''
+    ttl=0
+
+    def __init__(self, rrtext, dlvname):
+        if not rrtext:
+            return
+
+        fields = rrtext.split()
+        if len(fields) < 7:
+            return
+
+        self.dlvname = dlvname.lower()
+        parent = fields[0].lower().strip('.').split('.')
+        parent.reverse()
+        dlv = dlvname.split('.')
+        dlv.reverse()
+        while len(dlv) != 0 and len(parent) != 0 and parent[0] == dlv[0]:
+            parent = parent[1:]
+            dlv = dlv[1:]
+        if len(dlv) != 0:
+            raise Exception
+        parent.reverse()
+        self.parent = '.'.join(parent)
+        self.rrname = self.parent + '.' + self.dlvname + '.'
+        
+        fields = fields[1:]
+        if fields[0].upper() in ['IN','CH','HS']:
+            self.rrclass = fields[0].upper()
+            fields = fields[1:]
+        else:
+            self.ttl = int(fields[0])
+            self.rrclass = fields[1].upper()
+            fields = fields[2:]
+
+        if fields[0].upper() != 'DLV':
+            raise Exception
+
+        self.rrtype = 'DLV'
+        self.keyid = int(fields[1])
+        self.keyalg = int(fields[2])
+        self.hashalg = int(fields[3])
+        self.digest = ''.join(fields[4:]).upper()
+
+    def __repr__(self):
+        return('%s %s %s %d %d %d %s' %
+                (self.rrname, self.rrclass, self.rrtype,
+                self.keyid, self.keyalg, self.hashalg, self.digest))
+
+    def __eq__(self, other):
+        return self.__repr__() == other.__repr__()
+
+############################################################################
+# checkds:
+# Fetch DS RRset for the given zone from the DNS; fetch DNSKEY
+# RRset from the masterfile if specified, or from DNS if not.
+# Generate a set of expected DS records from the DNSKEY RRset,
+# and report on congruency.
+############################################################################
+def checkds(zone, masterfile = None):
+    dslist=[]
+    fp=os.popen("%s +noall +answer -t ds -q %s" %
+                (shellquote(args.dig), shellquote(zone)))
+    for line in fp:
+        dslist.append(DSRR(line))
+    dslist = sorted(dslist, key=lambda ds: (ds.keyid, ds.keyalg, ds.hashalg))
+    fp.close()
+
+    dsklist=[]
+
+    if masterfile:
+        fp = os.popen("%s -f %s %s " %
+                      (shellquote(args.dsfromkey), shellquote(masterfile),
+                       shellquote(zone)))
+    else:
+        fp = os.popen("%s +noall +answer -t dnskey -q %s | %s -f - %s" %
+                      (shellquote(args.dig), shellquote(zone),
+                       shellquote(args.dsfromkey), shellquote(zone)))
+
+    for line in fp:
+        dsklist.append(DSRR(line))
+
+    fp.close()
+
+    if (len(dsklist) < 1):
+        print ("No DNSKEY records found in zone apex")
+        return False
+
+    found = False
+    for ds in dsklist:
+        if ds in dslist:
+            print ("DS for KSK %s/%03d/%05d (%s) found in parent" %
+                   (ds.rrname.strip('.'), ds.keyalg,
+                    ds.keyid, DSRR.hashalgs[ds.hashalg]))
+            found = True
+        else:
+            print ("DS for KSK %s/%03d/%05d (%s) missing from parent" %
+                   (ds.rrname.strip('.'), ds.keyalg,
+                    ds.keyid, DSRR.hashalgs[ds.hashalg]))
+
+    if not found:
+        print ("No DS records were found for any DNSKEY")
+
+    return found
+
+############################################################################
+# checkdlv:
+# Fetch DLV RRset for the given zone from the DNS; fetch DNSKEY
+# RRset from the masterfile if specified, or from DNS if not.
+# Generate a set of expected DLV records from the DNSKEY RRset,
+# and report on congruency.
+############################################################################
+def checkdlv(zone, lookaside, masterfile = None):
+    dlvlist=[]
+    fp=os.popen("%s +noall +answer -t dlv -q %s" %
+                (shellquote(args.dig), shellquote(zone + '.' + lookaside)))
+    for line in fp:
+        dlvlist.append(DLVRR(line, lookaside))
+    dlvlist = sorted(dlvlist,
+                     key=lambda dlv: (dlv.keyid, dlv.keyalg, dlv.hashalg))
+    fp.close()
+
+    #
+    # Fetch DNSKEY records from DNS and generate DLV records from them
+    #
+    dlvklist=[]
+    if masterfile:
+        fp = os.popen("%s -f %s -l %s %s " %
+                      (args.dsfromkey, masterfile, lookaside, zone))
+    else:
+        fp = os.popen("%s +noall +answer -t dnskey %s | %s -f - -l %s %s"
+                      % (shellquote(args.dig), shellquote(zone),
+                         shellquote(args.dsfromkey), shellquote(lookaside),
+                         shellquote(zone)))
+
+    for line in fp:
+        dlvklist.append(DLVRR(line, lookaside))
+
+    fp.close()
+
+    if (len(dlvklist) < 1):
+        print ("No DNSKEY records found in zone apex")
+        return False
+
+    found = False
+    for dlv in dlvklist:
+        if dlv in dlvlist:
+            print ("DLV for KSK %s/%03d/%05d (%s) found in %s" %
+                   (dlv.parent, dlv.keyalg, dlv.keyid,
+                    DLVRR.hashalgs[dlv.hashalg], dlv.dlvname))
+            found = True
+        else:
+            print ("DLV for KSK %s/%03d/%05d (%s) missing from %s" %
+                   (dlv.parent, dlv.keyalg, dlv.keyid, 
+                    DLVRR.hashalgs[dlv.hashalg], dlv.dlvname))
+
+    if not found:
+        print ("No DLV records were found for any DNSKEY")
+
+    return found
+
+
+############################################################################
+# parse_args:
+# Read command line arguments, set global 'args' structure
+############################################################################
+def parse_args():
+    global args
+    bindir = 'bin'
+    if os.name != 'nt':
+        sbindir = 'sbin'
+    else:
+        sbindir = 'bin'
+    parser = argparse.ArgumentParser(description='checkds: checks DS coverage')
+
+    parser.add_argument('zone', type=str, help='zone to check')
+    parser.add_argument('-f', '--file', dest='masterfile', type=str,
+                        help='zone master file')
+    parser.add_argument('-l', '--lookaside', dest='lookaside', type=str,
+                        help='DLV lookaside zone')
+    parser.add_argument('-d', '--dig', dest='dig',
+                        default=os.path.join('@prefix@', bindir, 'dig'),
+                        type=str, help='path to \'dig\'')
+    parser.add_argument('-D', '--dsfromkey', dest='dsfromkey',
+                        default=os.path.join('@prefix@', sbindir,
+                                             'dnssec-dsfromkey'),
+                        type=str, help='path to \'dig\'')
+    parser.add_argument('-v', '--version', action='version', version='9.9.1')
+    args = parser.parse_args()
+
+    args.zone = args.zone.strip('.')
+    if args.lookaside:
+        lookaside = args.lookaside.strip('.')
+
+############################################################################
+# Main
+############################################################################
+def main():
+    parse_args()
+
+    if args.lookaside:
+        found = checkdlv(args.zone, args.lookaside, args.masterfile)
+    else:
+        found = checkds(args.zone, args.masterfile)
+
+    exit(0 if found else 1)
+
+if __name__ == "__main__":
+    main()
diff --git a/bin/python/dnssec-coverage.py.in b/bin/python/dnssec-coverage.py.in
new file mode 100755 (executable)
index 0000000..5d2714d
--- /dev/null
@@ -0,0 +1,740 @@
+#!@PYTHON@
+############################################################################
+# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+############################################################################
+
+import argparse
+import os
+import glob
+import sys
+import re
+import time
+import calendar
+from collections import defaultdict
+import pprint
+
+prog='dnssec-coverage'
+
+########################################################################
+# Class Event
+########################################################################
+class Event:
+    """ A discrete key metadata event, e.g., Publish, Activate, Inactive,    
+    Delete. Stores the date of the event, and identifying information about 
+    the key to which the event will occur."""
+
+    def __init__(self, _what, _key):
+        now = time.time()
+        self.what = _what
+        self.when = _key.metadata[_what]
+        self.key = _key
+        self.keyid = _key.keyid
+        self.sep = _key.sep
+        self.zone = _key.zone
+        self.alg = _key.alg
+
+    def __repr__(self):
+        return repr((self.when, self.what, self.keyid, self.sep,
+                     self.zone, self.alg))
+
+    def showtime(self):
+        return time.strftime("%a %b %d %H:%M:%S UTC %Y", self.when)
+
+    def showkey(self):
+        return self.key.showkey()
+
+    def showkeytype(self):
+        return self.key.showkeytype()
+
+########################################################################
+# Class Key
+########################################################################
+class Key:
+    """An individual DNSSEC key.  Identified by path, zone, algorithm, keyid.
+    Contains a dictionary of metadata events."""
+
+    def __init__(self, keyname):
+        directory = os.path.dirname(keyname)
+        key = os.path.basename(keyname)
+        (zone, alg, keyid) = key.split('+')
+        keyid = keyid.split('.')[0]
+        key = [zone, alg, keyid]
+        key_file = directory + os.sep + '+'.join(key) + ".key"
+        private_file = directory + os.sep + '+'.join(key) + ".private"
+
+        self.zone = zone[1:-1]
+        self.alg = int(alg)
+        self.keyid = int(keyid)
+
+        kfp = file(key_file, "r")
+        for line in kfp:
+            if line[0] == ';':
+                continue
+            tokens = line.split()
+            if not tokens:
+                continue
+
+            if tokens[1].lower() in ('in', 'ch', 'hs'):
+                septoken = 3
+                self.ttl = args.keyttl
+                if not self.ttl:
+                    vspace()
+                    print("WARNING: Unable to determine TTL for DNSKEY %s." %
+                           self.showkey())
+                    print("\t Using 1 day (86400 seconds); re-run with the -d "
+                          "option for more\n\t accurate results.")
+                    self.ttl = 86400
+            else:
+                septoken = 4
+                self.ttl = int(tokens[1]) if not args.keyttl else args.keyttl
+
+            if (int(tokens[septoken]) & 0x1) == 1:
+                self.sep = True
+            else:
+                self.sep = False
+        kfp.close()
+
+        pfp = file(private_file, "rU")
+        propDict = dict()
+        for propLine in pfp:
+            propDef = propLine.strip()
+            if len(propDef) == 0:
+                continue
+            if propDef[0] in ('!', '#'):
+                continue
+            punctuation = [propDef.find(c) for c in ':= '] + [len(propDef)]
+            found = min([ pos for pos in punctuation if pos != -1 ])
+            name = propDef[:found].rstrip()
+            value =  propDef[found:].lstrip(":= ").rstrip()
+            propDict[name] = value
+
+        if("Publish" in propDict):
+            propDict["Publish"] = time.strptime(propDict["Publish"],
+                                                "%Y%m%d%H%M%S")
+
+        if("Activate" in propDict):
+            propDict["Activate"] = time.strptime(propDict["Activate"],
+                                                 "%Y%m%d%H%M%S")
+
+        if("Inactive" in propDict):
+            propDict["Inactive"] = time.strptime(propDict["Inactive"],
+                                                 "%Y%m%d%H%M%S")
+
+        if("Delete" in propDict):
+            propDict["Delete"] = time.strptime(propDict["Delete"],
+                                               "%Y%m%d%H%M%S")
+
+        if("Revoke" in propDict):
+            propDict["Revoke"] = time.strptime(propDict["Revoke"],
+                                               "%Y%m%d%H%M%S")
+        pfp.close()
+        self.metadata = propDict
+
+    def showkey(self):
+        return "%s/%03d/%05d" % (self.zone, self.alg, self.keyid);
+
+    def showkeytype(self):
+        return ("KSK" if self.sep else "ZSK")
+
+    # ensure that the gap between Publish and Activate is big enough
+    def check_prepub(self):
+        now = time.time()
+
+        if (not "Activate" in self.metadata):
+            debug_print("No Activate information in key: %s" % self.showkey())
+            return False
+        a = calendar.timegm(self.metadata["Activate"])
+
+        if (not "Publish" in self.metadata):
+            debug_print("No Publish information in key: %s" % self.showkey())
+            if a > now:
+                vspace()
+                print("WARNING: Key %s (%s) is scheduled for activation but \n"
+                  "\t not for publication." %
+                  (self.showkey(), self.showkeytype()))
+            return False
+        p = calendar.timegm(self.metadata["Publish"])
+
+        now = time.time()
+        if p < now and a < now:
+            return True
+
+        if p == a:
+            vspace()
+            print ("WARNING: %s (%s) is scheduled to be published and\n"
+                   "\t activated at the same time. This could result in a\n"
+                   "\t coverage gap if the zone was previously signed." %
+                   (self.showkey(), self.showkeytype()))
+            print("\t Activation should be at least %s after publication."
+                    % duration(self.ttl))
+            return True
+
+        if a < p:
+            vspace()
+            print("WARNING: Key %s (%s) is active before it is published" %
+                  (self.showkey(), self.showkeytype()))
+            return False
+
+        if (a - p < self.ttl):
+            vspace()
+            print("WARNING: Key %s (%s) is activated too soon after\n"
+                  "\t publication; this could result in coverage gaps due to\n"
+                  "\t resolver caches containing old data."
+                  % (self.showkey(), self.showkeytype()))
+            print("\t Activation should be at least %s after publication." %
+                  duration(self.ttl))
+            return False
+
+        return True
+
+    # ensure that the gap between Inactive and Delete is big enough
+    def check_postpub(self, timespan = None):
+        if not timespan:
+            timespan = self.ttl
+
+        now = time.time()
+
+        if (not "Delete" in self.metadata):
+            debug_print("No Delete information in key: %s" % self.showkey())
+            return False
+        d = calendar.timegm(self.metadata["Delete"])
+
+        if (not "Inactive" in self.metadata):
+            debug_print("No Inactive information in key: %s" % self.showkey())
+            if d > now:
+                vspace()
+                print("WARNING: Key %s (%s) is scheduled for deletion but\n"
+                      "\t not for inactivation." %
+                      (self.showkey(), self.showkeytype()))
+            return False
+        i = calendar.timegm(self.metadata["Inactive"])
+
+        if d < now and i < now:
+            return True
+
+        if (d < i):
+            vspace()
+            print("WARNING: Key %s (%s) is scheduled for deletion before\n"
+                  "\t inactivation." % (self.showkey(), self.showkeytype()))
+            return False
+
+        if (d - i < timespan):
+            vspace()
+            print("WARNING: Key %s (%s) scheduled for deletion too soon after\n"
+                  "\t deactivation; this may result in coverage gaps due to\n"
+                  "\t resolver caches containing old data."
+                  % (self.showkey(), self.showkeytype()))
+            print("\t Deletion should be at least %s after inactivation." %
+                  duration(timespan))
+            return False
+
+        return True
+
+########################################################################
+# class Zone
+########################################################################
+class Zone:
+    """Stores data about a specific zone"""
+
+    def __init__(self, _name, _keyttl = None, _maxttl = None):
+        self.name = _name
+        self.keyttl = _keyttl
+        self.maxttl = _maxttl
+
+    def load(self, filename):
+        if not args.compilezone:
+            sys.stderr.write(prog + ': FATAL: "named-compilezone" not found\n')
+            exit(1)
+
+        if not self.name:
+            return
+
+        maxttl = keyttl = None
+
+        fp = os.popen("%s -o - %s %s 2> /dev/null" %
+                      (args.compilezone, self.name, filename))
+        for line in fp:
+            fields = line.split()
+            if not maxttl or int(fields[1]) > maxttl:
+                maxttl = int(fields[1])
+            if fields[3] == "DNSKEY":
+                keyttl = int(fields[1])
+        fp.close()
+
+        self.keyttl = keyttl
+        self.maxttl = maxttl
+
+############################################################################
+# debug_print:
+############################################################################
+def debug_print(debugVar):
+    """pretty print a variable iff debug mode is enabled"""
+    if not args.debug_mode:
+        return
+    if type(debugVar) == str:
+        print("DEBUG: " + debugVar)
+    else:
+        print("DEBUG: " + pprint.pformat(debugVar))
+    return
+
+############################################################################
+# vspace:
+############################################################################
+_firstline = True
+def vspace():
+    """adds vertical space between two sections of output text if and only
+    if this is *not* the first section being printed"""
+    global _firstline
+    if _firstline:
+        _firstline = False
+    else:
+        print
+
+############################################################################
+# vreset:
+############################################################################
+def vreset():
+    """reset vertical spacing"""
+    global _firstline
+    _firstline = True
+
+############################################################################
+# getunit
+############################################################################
+def getunit(secs, size):
+    """given a number of seconds, and a number of seconds in a larger unit of
+    time, calculate how many of the larger unit there are and return both
+    that and a remainder value"""
+    bigunit = secs // size 
+    if bigunit:
+        secs %= size
+    return (bigunit, secs)
+
+############################################################################
+# addtime
+############################################################################
+def addtime(output, unit, t):
+    """add a formatted unit of time to an accumulating string"""
+    if t:
+        output += ("%s%d %s%s" %
+                  ((", " if output else ""),
+                   t, unit, ("s" if t > 1 else "")))
+
+    return output
+
+############################################################################
+# duration:
+############################################################################
+def duration(secs):
+    """given a length of time in seconds, print a formatted human duration
+    in larger units of time
+    """
+    # define units:
+    minute = 60
+    hour = minute * 60
+    day = hour * 24
+    month = day * 30
+    year = day * 365
+
+    # calculate time in units:
+    (years, secs) = getunit(secs, year)
+    (months, secs) = getunit(secs, month)
+    (days, secs) = getunit(secs, day)
+    (hours, secs) = getunit(secs, hour)
+    (minutes, secs) = getunit(secs, minute)
+
+    output = ''
+    output = addtime(output, "year", years)
+    output = addtime(output, "month", months)
+    output = addtime(output, "day", days)
+    output = addtime(output, "hour", hours)
+    output = addtime(output, "minute", minutes)
+    output = addtime(output, "second", secs)
+    return output
+
+############################################################################
+# parse_time
+############################################################################
+def parse_time(s):
+    """convert a formatted time (e.g., 1y, 6mo, 15mi, etc) into seconds"""
+    s = s.strip()
+
+    # if s is an integer, we're done already
+    try:
+        n = int(s)
+        return n
+    except:
+        pass
+
+    # try to parse as a number with a suffix indicating unit of time
+    r = re.compile('([0-9][0-9]*)\s*([A-Za-z]*)')
+    m = r.match(s)
+    if not m:
+        raise Exception("Cannot parse %s" % s)
+    (n, unit) = m.groups()
+    n = int(n)
+    unit = unit.lower()
+    if unit[0] == 'y':
+        return n * 31536000
+    elif unit[0] == 'm' and unit[1] == 'o':
+        return n * 2592000
+    elif unit[0] == 'w':
+        return n * 604800
+    elif unit[0] == 'd':
+        return n * 86400
+    elif unit[0] == 'h':
+        return n * 3600
+    elif unit[0] == 'm' and unit[1] == 'i':
+        return n * 60 
+    elif unit[0] == 's':
+        return n
+    else:
+        raise Exception("Invalid suffix %s" % unit)
+
+############################################################################
+# algname:
+############################################################################
+def algname(alg):
+    """return the mnemonic for a DNSSEC algorithm"""
+    names = (None, 'RSAMD5', 'DH', 'DSA', 'ECC', 'RSASHA1',
+            'NSEC3DSA', 'NSEC3RSASHA1', 'RSASHA256', None,
+            'RSASHA512', None, 'ECCGOST', 'ECDSAP256SHA256', 
+            'ECDSAP384SHA384')
+    name = None
+    if alg in range(len(names)):
+        name = names[alg]
+    return (name if name else str(alg))
+
+############################################################################
+# list_events:
+############################################################################
+def list_events(eventgroup):
+    """print a list of the events in an eventgroup"""
+    if not eventgroup:
+        return
+    print ("  " + eventgroup[0].showtime() + ":")
+    for event in eventgroup:
+        print ("    %s: %s (%s)" %
+               (event.what, event.showkey(), event.showkeytype()))
+
+############################################################################
+# process_events:
+############################################################################
+def process_events(eventgroup, active, published):
+    """go through the events in an event group in time-order, add to active
+     list upon Activate event, add to published list upon Publish event,
+     remove from active list upon Inactive event, and remove from published
+     upon Delete event. Emit warnings when inconsistant states are reached"""
+    for event in eventgroup:
+        if event.what == "Activate":
+            active.add(event.keyid)
+        elif event.what == "Publish":
+            published.add(event.keyid)
+        elif event.what == "Inactive":
+            if event.keyid not in active:
+                vspace()
+                print ("\tWARNING: %s (%s) scheduled to become inactive "
+                       "before it is active" %
+                       (event.showkey(), event.showkeytype()))
+            else:
+                active.remove(event.keyid)
+        elif event.what == "Delete":
+            if event.keyid in published:
+                published.remove(event.keyid)
+            else:
+                vspace()
+                print ("WARNING: key %s (%s) is scheduled for deletion before "
+                       "it is published, at %s" %
+                       (event.showkey(), event.showkeytype()))
+        elif event.what == "Revoke":
+            # We don't need to worry about the logic of this one;
+            # just stop counting this key as either active or published
+            if event.keyid in published:
+                published.remove(event.keyid)
+            if event.keyid in active:
+                active.remove(event.keyid)
+
+    return (active, published)
+
+############################################################################
+# check_events:
+############################################################################
+def check_events(eventsList, ksk):
+    """create lists of events happening at the same time, check for 
+    inconsistancies"""
+    active = set()
+    published = set()
+    eventgroups = list()
+    eventgroup = list()
+    keytype = ("KSK" if ksk else "ZSK")
+
+    # collect up all events that have the same time
+    eventsfound = False
+    for event in eventsList:
+        # if checking ZSKs, skip KSKs, and vice versa
+        if (ksk and not event.sep) or (event.sep and not ksk):
+            continue
+
+        # we found an appropriate (ZSK or KSK event)
+        eventsfound = True
+
+        # add event to current eventgroup
+        if (not eventgroup or eventgroup[0].when == event.when):
+            eventgroup.append(event)
+
+        # if we're at the end of the list, we're done.  if
+        # we've found an event with a later time, start a new
+        # eventgroup
+        if (eventgroup[0].when != event.when):
+            eventgroups.append(eventgroup)
+            eventgroup = list()
+            eventgroup.append(event)
+
+    if eventgroup:
+        eventgroups.append(eventgroup)
+
+    for eventgroup in eventgroups:
+        (active, published) = \
+           process_events(eventgroup, active, published)
+
+        list_events(eventgroup)
+
+        # and then check for inconsistencies:
+        if len(active) == 0:
+            print ("ERROR: No %s's are active after this event" % keytype)
+            return False
+        elif len(published) == 0:
+            sys.stdout.write("ERROR: ")
+            print ("ERROR: No %s's are published after this event" % keytype)
+            return False
+        elif len(published.intersection(active)) == 0:
+            sys.stdout.write("ERROR: ")
+            print (("ERROR: No %s's are both active and published " +
+                    "after this event") % keytype)
+            return False
+
+    if not eventsfound:
+        print ("ERROR: No %s events found in '%s'" %
+               (keytype, args.path))
+        return False
+
+    return True
+
+############################################################################
+# check_zones:
+# ############################################################################
+def check_zones(eventsList):
+    """scan events per zone, algorithm, and key type, in order of occurrance,
+    noting inconsistent states when found"""
+    global foundprob
+
+    foundprob = False
+    zonesfound = False
+    for zone in eventsList:
+        if args.zone and zone != args.zone:
+            continue
+
+        zonesfound = True
+        for alg in eventsList[zone]:
+            vspace()
+            print("Checking scheduled KSK events for zone %s, algorithm %s..." %
+                   (zone, algname(alg)))
+            if not check_events(eventsList[zone][alg], True):
+                foundprob = True
+            else:
+                print ("No errors found")
+
+            vspace()
+            print("Checking scheduled ZSK events for zone %s, algorithm %s..." %
+                  (zone, algname(alg)))
+            if not check_events(eventsList[zone][alg], False):
+                foundprob = True
+            else:
+                print ("No errors found")
+
+    if not zonesfound:
+        print("ERROR: No key events found for %s in '%s'" %
+               (args.zone, args.path))
+        exit(1)
+
+############################################################################
+# fill_eventsList:
+############################################################################
+def fill_eventsList(eventsList):
+    """populate the list of events"""
+    for zone, algorithms in keyDict.items():
+        for alg, keys in  algorithms.items():
+            for keyid, keydata in keys.items():
+                if("Publish" in keydata.metadata):
+                    eventsList[zone][alg].append(Event("Publish", keydata))
+                if("Activate" in keydata.metadata):
+                    eventsList[zone][alg].append(Event("Activate", keydata))
+                if("Inactive" in keydata.metadata):
+                    eventsList[zone][alg].append(Event("Inactive", keydata))
+                if("Delete" in keydata.metadata):
+                    eventsList[zone][alg].append(Event("Delete", keydata))
+
+            eventsList[zone][alg] = sorted(eventsList[zone][alg],
+                                           key=lambda event: event.when)
+
+    foundprob = False
+    if not keyDict:
+        print("ERROR: No key events found in '%s'" % args.path)
+        exit(1)
+
+############################################################################
+# set_path:
+############################################################################
+def set_path(command, default=None):
+    """find the location of a specified command.  if a default is supplied
+    and it works, we use it; otherwise we search PATH for a match.  If
+    not found, error and exit"""
+    fpath = default
+    if not fpath or not os.path.isfile(fpath) or not os.access(fpath, os.X_OK):
+        path = os.environ["PATH"]
+        if not path:
+            path = os.path.defpath
+        for directory in path.split(os.pathsep):
+            fpath = directory + os.sep + command
+            if os.path.isfile(fpath) or os.access(fpath, os.X_OK):
+                break
+            fpath = None
+
+    return fpath
+
+############################################################################
+# parse_args:
+############################################################################
+def parse_args():
+    """Read command line arguments, set global 'args' structure"""
+    global args
+    bindir = 'bin';
+
+    compilezone = set_path('named-compilezone',
+                           os.path.join('@prefix@', bindir,
+                                        'named-compilezone'))
+
+    parser = argparse.ArgumentParser(description=prog + ': checks future ' +
+                                     'DNSKEY coverage for a zone')
+
+    parser.add_argument('zone', type=str, help='zone to check')
+    parser.add_argument('-K', dest='path', default='.', type=str,
+                        help='a directory containing keys to process',
+                        metavar='dir')
+    parser.add_argument('-f', dest='filename', type=str,
+                        help='zone master file', metavar='file')
+    parser.add_argument('-m', dest='maxttl', type=str,
+                        help='the longest TTL in the zone(s)',
+                        metavar='int')
+    parser.add_argument('-d', dest='keyttl', type=str,
+                        help='the DNSKEY TTL', metavar='int')
+    parser.add_argument('-r', dest='resign', default='1944000', 
+                        type=int, help='the RRSIG refresh interval '
+                                       'in seconds [default: 22.5 days]',
+                        metavar='int')
+    parser.add_argument('-c', dest='compilezone',
+                        default=compilezone, type=str,
+                        help='path to \'named-compilezone\'',
+                        metavar='path')
+    parser.add_argument('-D', '--debug', dest='debug_mode',
+                        action='store_true', default=False,
+                        help='Turn on debugging output')
+    parser.add_argument('-v', '--version', action='version', version='9.9.1')
+
+    args = parser.parse_args()
+
+    # convert from time arguments to seconds
+    try:
+        if args.maxttl:
+            m = parse_time(args.maxttl)
+            args.maxttl = m
+    except:
+        pass
+
+    try:
+        if args.keyttl:
+            k = parse_time(args.keyttl)
+            args.keyttl = k
+    except:
+        pass
+
+    try:
+        if args.resign:
+            r = parse_time(args.resign)
+            args.resign = r
+    except:
+        pass
+
+    # if we've got the values we need from the command line, stop now
+    if args.maxttl and args.keyttl:
+        return
+
+    # load keyttl and maxttl data from zonefile
+    if args.zone and args.filename:
+        try:
+            zone = Zone(args.zone)
+            zone.load(args.filename)
+            if not args.maxttl:
+                args.maxttl = zone.maxttl
+            if not args.keyttl:
+                args.keyttl = zone.maxttl
+        except Exception as e:
+            print("Unable to load zone data from %s: " % args.filename, e)
+
+    if not args.maxttl:
+        vspace()
+        print ("WARNING: Maximum TTL value was not specified.  Using 1 week\n"
+               "\t (604800 seconds); re-run with the -m option to get more\n"
+               "\t accurate results.")
+        args.maxttl = 604800
+
+############################################################################
+# Main
+############################################################################
+def main():
+    global keyDict
+
+    parse_args()
+    path=args.path
+
+    print ("PHASE 1--Loading keys to check for internal timing problems")
+    keyDict = defaultdict(lambda : defaultdict(dict))
+    files = glob.glob(os.path.join(path, '*.private'))
+    for infile in files:
+        key = Key(infile)
+        if args.zone and key.zone != args.zone:
+            continue
+        keyDict[key.zone][key.alg][key.keyid] = key
+        key.check_prepub()
+        if key.sep:
+            key.check_postpub()
+        else:
+            key.check_postpub(args.maxttl + args.resign)
+
+    vspace()
+    print ("PHASE 2--Scanning future key events for coverage failures")
+    vreset()
+
+    eventsList = defaultdict(lambda : defaultdict(list))
+    fill_eventsList(eventsList)
+    check_zones(eventsList)
+
+    if foundprob:
+        exit(1)
+    else:
+        exit(0)
+
+if __name__ == "__main__":
+    main()
similarity index 52%
rename from win32utils/todos.pl
rename to bin/python/win32.py
index 2baf66342ae6ec9d2e28d4e409b1df78fdcef323..b347370bba52648e6aeb633dc5abf73ac8d4cadd 100644 (file)
@@ -1,5 +1,5 @@
-#!/usr/bin/perl
-#
+#!@PYTHON@
+############################################################################
 # Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
+############################################################################
 
-# todos.pl
-# This script performs the equivalent of unix2dos on all the files in
-# the BIND 9 source tree that require DOS-style newlines when building
-# for win32.
-#
-# Path and directory
-use strict;
-use File::Find;
+# $Id$
 
-sub todos {
-       local @ARGV = @_;
-       unshift (@ARGV, '-') unless @ARGV;
-       while ($ARGV = shift) {
-               open(FH, $ARGV);
-               binmode(FH);
-               my @lines = <FH>;
-               close(FH);
+# ntpath rewrote in Python
 
-               open(FH, ">$ARGV");
-               binmode(FH);
-               for my $line (@lines) {
-                       $line =~ s/[\r\n]+$/\r\n/;
-                       print FH $line;
-               }
-               close(FH);
-       }
-}
+import win32con
+import win32api
 
-sub wanted {
-       return unless -f && $_ =~ qr/\.(mak|dsp|dsw|txt|bat)$/;
-       todos $_;
-}
+BIND_SUBKEY = "Software\\ISC\\BIND"
 
-finddepth(\&wanted, "..");
+def base():
+    hKey = None
+    keyFound = True
+    try:
+        hKey = win32api.RegOpenKeyEx(win32con.HKEY_LOCAL_MACHINE, BIND_SUBKEY)
+    except:
+        keyFound = False
+    if keyFound:
+        try:
+            (namedBase, _) = win32api.RegQueryValueEx(hKey, "InstallDir")
+        except:
+            keyFound = False
+        win32api.RegCloseKey(hKey)
+    if keyFound:
+        return namedBase
+    return win32api.GetSystemDirectory()
similarity index 65%
rename from bin/rndc/win32/rndc.dsp
rename to bin/rndc/win32/rndc.dsp.in
index 31803158e7ccfd15ea50ba9e412fa0e9b4e60d48..5bee95a7555eeec2b36eb76e4204423849ea324b 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=rndc - Win32 Debug
+CFG=rndc - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=rndc - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - Win32 Debug"
+!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "rndc - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rndc - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "rndc - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "rndc - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=rndc - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "rndc - Win32 Release"
+!IF  "$(CFG)" == "rndc - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/util.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile /machine:I386 /out:"../../../Build/Release/rndc.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Release/util.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile @MACHINE@ /out:"../../../Build/Release/rndc.exe"
 
-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndc - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/util.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib Debug/util.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "rndc - Win32 Release"
-# Name "rndc - Win32 Debug"
+# Name "rndc - @PLATFORM@ Release"
+# Name "rndc - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 61%
rename from bin/rndc/win32/rndc.mak
rename to bin/rndc/win32/rndc.mak.in
index ab4e47b2cab681729add49f53e9a5aa4565d45dc..242f0bbca690de26c5bea9ac9e5cad43ae348158 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on rndc.dsp
 !IF "$(CFG)" == ""
-CFG=rndc - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to rndc - Win32 Debug.
+CFG=rndc - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to rndc - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "rndc - Win32 Release" && "$(CFG)" != "rndc - Win32 Debug"
+!IF "$(CFG)" != "rndc - @PLATFORM@ Release" && "$(CFG)" != "rndc - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - Win32 Debug"
+!MESSAGE NMAKE /f "rndc.mak" CFG="rndc - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "rndc - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rndc - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "rndc - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "rndc - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,7 +28,7 @@ NULL=nul
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "rndc - Win32 Release"
+!IF  "$(CFG)" == "rndc - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -103,7 +103,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "rndc - Win32 Release"
+!IF  "$(CFG)" == "rndc - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -114,12 +114,12 @@ ALL : "..\..\..\Build\Release\rndc.exe"
 
 !ELSE 
 
-ALL : "libbind9 - Win32 Release" "libisccfg - Win32 Release" "libisccc - Win32 Release" "libisc - Win32 Release" "..\..\..\Build\Release\rndc.exe"
+ALL : "libbind9 - @PLATFORM@ Release" "libisccfg - @PLATFORM@ Release" "libisccc - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\Build\Release\rndc.exe"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - Win32 ReleaseCLEAN" "libisccc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" "libbind9 - Win32 ReleaseCLEAN" 
+CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libisccc - @PLATFORM@ ReleaseCLEAN" "libisccfg - @PLATFORM@ ReleaseCLEAN" "libbind9 - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -132,13 +132,13 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\rndc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\rndc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\rndc.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib  ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile /machine:I386 /out:"../../../Build/Release/rndc.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/isccc/win32/Release/libisccc.lib  ../../../lib/bind9/win32/Release/libbind9.lib /nologo /subsystem:console /profile @MACHINE@ /out:"../../../Build/Release/rndc.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\rndc.obj" \
        "$(INTDIR)\util.obj" \
@@ -153,7 +153,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndc - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -167,12 +167,12 @@ ALL : "..\..\..\Build\Debug\rndc.exe" "$(OUTDIR)\rndc.bsc"
 
 !ELSE 
 
-ALL : "libbind9 - Win32 Debug" "libisccfg - Win32 Debug" "libisccc - Win32 Debug" "libisc - Win32 Debug" "..\..\..\Build\Debug\rndc.exe" "$(OUTDIR)\rndc.bsc"
+ALL : "libbind9 - @PLATFORM@ Debug" "libisccfg - @PLATFORM@ Debug" "libisccc - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\Build\Debug\rndc.exe" "$(OUTDIR)\rndc.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - Win32 DebugCLEAN" "libisccc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" "libbind9 - Win32 DebugCLEAN" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libisccc - @PLATFORM@ DebugCLEAN" "libisccfg - @PLATFORM@ DebugCLEAN" "libbind9 - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -191,7 +191,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /I "../../../lib/dns/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\rndc.bsc" 
 BSC32_SBRS= \
@@ -204,7 +204,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib  ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc.pdb" /debug /machine:I386 /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/isccc/win32/Debug/libisccc.lib  ../../../lib/bind9/win32/Debug/libbind9.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rndc.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/rndc.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\rndc.obj" \
        "$(INTDIR)\util.obj" \
@@ -261,17 +261,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "rndc - Win32 Release" || "$(CFG)" == "rndc - Win32 Debug"
+!IF "$(CFG)" == "rndc - @PLATFORM@ Release" || "$(CFG)" == "rndc - @PLATFORM@ Debug"
 SOURCE=..\rndc.c
 
-!IF  "$(CFG)" == "rndc - Win32 Release"
+!IF  "$(CFG)" == "rndc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rndc.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rndc.obj"   "$(INTDIR)\rndc.sbr" : $(SOURCE) "$(INTDIR)"
@@ -282,14 +282,14 @@ SOURCE=..\rndc.c
 
 SOURCE=..\util.c
 
-!IF  "$(CFG)" == "rndc - Win32 Release"
+!IF  "$(CFG)" == "rndc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\util.obj"   "$(INTDIR)\util.sbr" : $(SOURCE) "$(INTDIR)"
@@ -298,106 +298,106 @@ SOURCE=..\util.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "rndc - Win32 Release"
+!IF  "$(CFG)" == "rndc - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\..\bin\rndc\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndc - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\rndc\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "rndc - Win32 Release"
+!IF  "$(CFG)" == "rndc - @PLATFORM@ Release"
 
-"libisccc - Win32 Release" : 
+"libisccc - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isccc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Release" 
    cd "..\..\..\bin\rndc\win32"
 
-"libisccc - Win32 ReleaseCLEAN" : 
+"libisccc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isccc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndc - @PLATFORM@ Debug"
 
-"libisccc - Win32 Debug" : 
+"libisccc - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isccc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Debug" 
    cd "..\..\..\bin\rndc\win32"
 
-"libisccc - Win32 DebugCLEAN" : 
+"libisccc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isccc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "rndc - Win32 Release"
+!IF  "$(CFG)" == "rndc - @PLATFORM@ Release"
 
-"libisccfg - Win32 Release" : 
+"libisccfg - @PLATFORM@ Release" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" 
    cd "..\..\..\bin\rndc\win32"
 
-"libisccfg - Win32 ReleaseCLEAN" : 
+"libisccfg - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndc - @PLATFORM@ Debug"
 
-"libisccfg - Win32 Debug" : 
+"libisccfg - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" 
    cd "..\..\..\bin\rndc\win32"
 
-"libisccfg - Win32 DebugCLEAN" : 
+"libisccfg - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "rndc - Win32 Release"
+!IF  "$(CFG)" == "rndc - @PLATFORM@ Release"
 
-"libbind9 - Win32 Release" : 
+"libbind9 - @PLATFORM@ Release" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" 
    cd "..\..\..\bin\rndc\win32"
 
-"libbind9 - Win32 ReleaseCLEAN" : 
+"libbind9 - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
-!ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndc - @PLATFORM@ Debug"
 
-"libbind9 - Win32 Debug" : 
+"libbind9 - @PLATFORM@ Debug" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" 
    cd "..\..\..\bin\rndc\win32"
 
-"libbind9 - Win32 DebugCLEAN" : 
+"libbind9 - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\..\lib\bind9\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
 !ENDIF 
diff --git a/bin/rndc/win32/rndc.vcxproj.filters.in b/bin/rndc/win32/rndc.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..a0ad33c
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\util.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\rndc.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/rndc/win32/rndc.vcxproj.in b/bin/rndc/win32/rndc.vcxproj.in
new file mode 100644 (file)
index 0000000..9be4dd3
--- /dev/null
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{39721F26-8B80-4AA9-9826-2AEF7322C3D5}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>rndc</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>util.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>$(Configuration);..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>util.lib;libisc.lib;libdns.lib;libisccfg.lib;libisccc.lib;libbind9.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\util.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\rndc.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/rndc/win32/rndc.vcxproj.user b/bin/rndc/win32/rndc.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 65%
rename from bin/rndc/win32/rndcutil.dsp
rename to bin/rndc/win32/rndcutil.dsp.in
index eeac917752756881bc32920ef57b815d9daded3c..aafdd3c7ffc12caf3885e1e567ae7335c4e64af0 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Static-Link Library" 0x0104
+# TARGTYPE "@PLATFORM@ (x86) Static-Link Library" 0x0104
 
-CFG=rndcutil - Win32 Debug
+CFG=rndcutil - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=rndcutil - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "rndcutil.mak" CFG="rndcutil - Win32 Debug"
+!MESSAGE NMAKE /f "rndcutil.mak" CFG="rndcutil - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "rndcutil - Win32 Release" (based on "Win32 (x86) Static-Link Library")
-!MESSAGE "rndcutil - Win32 Debug" (based on "Win32 (x86) Static-Link Library")
+!MESSAGE "rndcutil - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Static-Link Library")
+!MESSAGE "rndcutil - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Static-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "rndcutil - Win32 Release"
+!IF  "$(CFG)" == "rndcutil - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /YX /FD /c /Fdutil
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" @COPTY@ /FD /c /Fdutil
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -59,7 +59,7 @@ LIB32=lib.exe
 # ADD BASE LIB32
 # ADD LIB32 /out:"Release/util.lib"
 
-!ELSEIF  "$(CFG)" == "rndcutil - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rndcutil - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -72,8 +72,8 @@ LIB32=lib.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR /YX /FD /GZ /c /Fdutil
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /FR @COPTY@ /FD /GZ /c /Fdutil
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -93,8 +93,8 @@ LIB32=lib.exe
 
 # Begin Target
 
-# Name "rndcutil - Win32 Release"
-# Name "rndcutil - Win32 Debug"
+# Name "rndcutil - @PLATFORM@ Release"
+# Name "rndcutil - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/bin/rndc/win32/rndcutil.vcxproj.filters.in b/bin/rndc/win32/rndcutil.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..5d2d581
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\util.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\util.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/rndc/win32/rndcutil.vcxproj.in b/bin/rndc/win32/rndcutil.vcxproj.in
new file mode 100644 (file)
index 0000000..d02c001
--- /dev/null
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{7C8681A1-E3A8-470E-9EEF-16054D111A19}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>rndcutil</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>util</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>.\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>util</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\util.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\util.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/rndc/win32/rndcutil.vcxproj.user b/bin/rndc/win32/rndcutil.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 5f713c02835fcab8a3d566bb13f96e13a4fd7369..811b3a140e397058bd9a88d3f285fd16bf888bb1 100644 (file)
@@ -191,11 +191,18 @@ test_atomic_xaddq() {
 
 testspec_t T_testlist[] = {
 #if defined(ISC_PLATFORM_HAVEXADD)
-       { test_atomic_xadd,     "test_atomic_xadd"              },
+       { (PFV) test_atomic_xadd,       "test_atomic_xadd"              },
 #endif
 #if defined(ISC_PLATFORM_HAVEXADDQ)
-       { test_atomic_xaddq,    "test_atomic_xaddq"             },
+       { (PFV) test_atomic_xaddq,      "test_atomic_xaddq"             },
 #endif
-       { NULL, NULL }
+       { (PFV) 0,                      NULL }
 };
 
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/atomic/win32/t_atomic.dsp.in b/bin/tests/atomic/win32/t_atomic.dsp.in
new file mode 100644 (file)
index 0000000..85b0a1e
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_atomic" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_atomic - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_atomic.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_atomic.mak" CFG="t_atomic - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_atomic - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_atomic - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_atomic.exe"
+
+!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_atomic.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_atomic - @PLATFORM@ Release"
+# Name "t_atomic - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_atomic.c
+# End Source File
+# End Group
+# End Target
+# End Project
similarity index 88%
rename from bin/dnssec/win32/nsupdate.dsw
rename to bin/tests/atomic/win32/t_atomic.dsw
index e3b777225a059574ba1fcead6fbb77225aa4811b..132da3d3c8fff3e1de91efa28cc21687c36b1e6e 100644 (file)
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "nsupdate"=".\nsupdate.dsp" - Package Owner=<4>
+Project: "t_atomic"=".\t_atomic.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/bin/tests/atomic/win32/t_atomic.mak.in b/bin/tests/atomic/win32/t_atomic.mak.in
new file mode 100644 (file)
index 0000000..1f9fa64
--- /dev/null
@@ -0,0 +1,375 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_atomic.dsp
+!IF "$(CFG)" == ""
+CFG=t_atomic - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_atomic - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_atomic - @PLATFORM@ Release" && "$(CFG)" != "t_atomic - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_atomic.mak" CFG="t_atomic - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_atomic - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_atomic - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_atomic.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_atomic.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_atomic.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_atomic.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_atomic.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_atomic.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_atomic.pdb" @MACHINE@ /out:"../../../../Build/Release/t_atomic.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_atomic.obj" \
+       "..\..\..\..\lib\dns\win32\Release\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_atomic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_atomic.exe" "$(OUTDIR)\t_atomic.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_atomic.exe" "$(OUTDIR)\t_atomic.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_atomic.obj"
+       -@erase "$(INTDIR)\t_atomic.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_atomic.bsc"
+       -@erase "$(OUTDIR)\t_atomic.map"
+       -@erase "$(OUTDIR)\t_atomic.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_atomic.exe"
+       -@erase "..\..\..\..\Build\Debug\t_atomic.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_atomic.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_atomic.sbr"
+
+"$(OUTDIR)\t_atomic.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_atomic.pdb" /map:"$(INTDIR)\t_atomic.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_atomic.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_atomic.obj" \
+       "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_atomic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_atomic.dep")
+!INCLUDE "t_atomic.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_atomic.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_atomic - @PLATFORM@ Release" || "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
+SOURCE=..\t_atomic.c
+
+!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_atomic.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_atomic.obj"       "$(INTDIR)\t_atomic.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
+
+"libdns - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
+
+"libdns - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+"libdns - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\atomic\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/atomic/win32/t_atomic.vcxproj.filters.in b/bin/tests/atomic/win32/t_atomic.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..7f864e4
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_atomic.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/atomic/win32/t_atomic.vcxproj.in b/bin/tests/atomic/win32/t_atomic.vcxproj.in
new file mode 100644 (file)
index 0000000..6b5d8dc
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_atomic</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_atomic.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/atomic/win32/t_atomic.vcxproj.user b/bin/tests/atomic/win32/t_atomic.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 9253ca77143e18f4fe50c067d8fe90463df4600e..7a62a57dde7070f2c0e702ae1bf6d88630d3e805 100644 (file)
@@ -72,8 +72,8 @@ func3() {
                        if (result == ISC_R_SUCCESS)
                                printf("  [%d] %s\n", i, fname);
                        else {
-                               printf("  [%d] getsymbol failed: %s\n", i,
-                                      isc_result_totext(result));
+                               printf("  [%d] %p getsymbol failed: %s\n", i,
+                                      tracebuf[i], isc_result_totext(result));
                        }
                }
        }
index 070b5fb72d0e9c9a3dd4b04e4753339677951596..de2f4ce14a92fda4d9e1d05208e1bf97302daeb4 100644 (file)
@@ -3118,30 +3118,38 @@ t25(void) {
 }
 
 testspec_t     T_testlist[] = {
-       {       t1,             "dns_db_load"           },
-       {       t2,             "dns_db_iscache"        },
-       {       t3,             "dns_db_iscache"        },
-       {       t4,             "dns_db_iszone"         },
-       {       t5,             "dns_db_iszone"         },
-       {       t6,             "dns_db_origin"         },
-       {       t7,             "dns_db_class"          },
-       {       t8,             "dns_db_currentversion" },
-       {       t9,             "dns_db_newversion"     },
-       {       t10,            "dns_db_closeversion"   },
-       {       t11,            "dns_db_closeversion"   },
-       {       t12,            "dns_db_expirenode"     },
-       {       t13,            "dns_db_findnode"       },
-       {       t14,            "dns_db_findnode"       },
-       {       t15,            "dns_db_find"           },
-       {       t16,            "dns_db_find"           },
-       {       t17,            "dns_db_find"           },
-       {       t18,            "dns_db_find"           },
-       {       t19,            "dns_db_find"           },
-       {       t20,            "dns_db_find"           },
-       {       t21,            "dns_db_find"           },
-       {       t22,            "dns_db_find"           },
-       {       t23,            "dns_db_find"           },
-       {       t24,            "dns_db_find"           },
-       {       t25,            "dns_db_load"           },
-       {       NULL,           NULL                    }
+       {       (PFV) t1,               "dns_db_load"           },
+       {       (PFV) t2,               "dns_db_iscache"        },
+       {       (PFV) t3,               "dns_db_iscache"        },
+       {       (PFV) t4,               "dns_db_iszone"         },
+       {       (PFV) t5,               "dns_db_iszone"         },
+       {       (PFV) t6,               "dns_db_origin"         },
+       {       (PFV) t7,               "dns_db_class"          },
+       {       (PFV) t8,               "dns_db_currentversion" },
+       {       (PFV) t9,               "dns_db_newversion"     },
+       {       (PFV) t10,              "dns_db_closeversion"   },
+       {       (PFV) t11,              "dns_db_closeversion"   },
+       {       (PFV) t12,              "dns_db_expirenode"     },
+       {       (PFV) t13,              "dns_db_findnode"       },
+       {       (PFV) t14,              "dns_db_findnode"       },
+       {       (PFV) t15,              "dns_db_find"           },
+       {       (PFV) t16,              "dns_db_find"           },
+       {       (PFV) t17,              "dns_db_find"           },
+       {       (PFV) t18,              "dns_db_find"           },
+       {       (PFV) t19,              "dns_db_find"           },
+       {       (PFV) t20,              "dns_db_find"           },
+       {       (PFV) t21,              "dns_db_find"           },
+       {       (PFV) t22,              "dns_db_find"           },
+       {       (PFV) t23,              "dns_db_find"           },
+       {       (PFV) t24,              "dns_db_find"           },
+       {       (PFV) t25,              "dns_db_load"           },
+       {       (PFV) 0,                NULL                    }
 };
+
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/db/win32/t_db.dsp.in b/bin/tests/db/win32/t_db.dsp.in
new file mode 100644 (file)
index 0000000..c665024
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_db" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_db - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_db.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_db.mak" CFG="t_db - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_db - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_db - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_db - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/isccfg/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/isccfg/win32/Release/libisccfg.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_db.exe"
+
+!ELSEIF  "$(CFG)" == "t_db - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/isccfg/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/isccfg/win32/Release/libisccfg.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_db.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_db - @PLATFORM@ Release"
+# Name "t_db - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_db.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/db/win32/t_db.dsw b/bin/tests/db/win32/t_db.dsw
new file mode 100644 (file)
index 0000000..38d7b05
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_db"=".\t_db.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/db/win32/t_db.mak.in b/bin/tests/db/win32/t_db.mak.in
new file mode 100644 (file)
index 0000000..b285b73
--- /dev/null
@@ -0,0 +1,403 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_db.dsp
+!IF "$(CFG)" == ""
+CFG=t_db - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_db - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_db - @PLATFORM@ Release" && "$(CFG)" != "t_db - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_db.mak" CFG="t_db - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_db - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_db - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_db - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_db - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_db.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisccfg - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_db.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" "libisccfg - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_db.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_db.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/isccfg/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_db.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_db.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/isccfg/win32/Release/libisccfg.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_db.pdb" @MACHINE@ /out:"../../../../Build/Release/t_db.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_db.obj" \
+       "..\..\..\..\lib\dns\win32\Release\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\isccfg\win32\Release\libisccfg.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_db.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_db - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_db.exe" "$(OUTDIR)\t_db.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisccfg - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_db.exe" "$(OUTDIR)\t_db.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" "libisccfg - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_db.obj"
+       -@erase "$(INTDIR)\t_db.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_db.bsc"
+       -@erase "$(OUTDIR)\t_db.map"
+       -@erase "$(OUTDIR)\t_db.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_db.exe"
+       -@erase "..\..\..\..\Build\Debug\t_db.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/isccfg/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_db.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_db.sbr"
+
+"$(OUTDIR)\t_db.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_db.pdb" /map:"$(INTDIR)\t_db.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_db.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_db.obj" \
+       "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\isccfg\win32\Debug\libisccfg.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_db.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_db.dep")
+!INCLUDE "t_db.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_db.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_db - @PLATFORM@ Release" || "$(CFG)" == "t_db - @PLATFORM@ Debug"
+SOURCE=..\t_db.c
+
+!IF  "$(CFG)" == "t_db - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_db.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_db - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_db.obj"   "$(INTDIR)\t_db.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_db - @PLATFORM@ Release"
+
+"libdns - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\db\win32"
+
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\db\win32"
+
+!ELSEIF  "$(CFG)" == "t_db - @PLATFORM@ Debug"
+
+"libdns - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\db\win32"
+
+"libdns - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\db\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_db - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\db\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\db\win32"
+
+!ELSEIF  "$(CFG)" == "t_db - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\db\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\db\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_db - @PLATFORM@ Release"
+
+"libisccfg - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\db\win32"
+
+"libisccfg - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\db\win32"
+
+!ELSEIF  "$(CFG)" == "t_db - @PLATFORM@ Debug"
+
+"libisccfg - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\db\win32"
+
+"libisccfg - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isccfg\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\db\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_db - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\db\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\db\win32"
+
+!ELSEIF  "$(CFG)" == "t_db - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\db\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\db\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/db/win32/t_db.vcxproj.filters.in b/bin/tests/db/win32/t_db.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..e0dfcd6
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_db.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/db/win32/t_db.vcxproj.in b/bin/tests/db/win32/t_db.vcxproj.in
new file mode 100644 (file)
index 0000000..e3de100
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{E6338E67-3224-4E66-9463-7AD719DA9346}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_db</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\isccfg\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libisccfg.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\isccfg\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libisccfg.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_db.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/db/win32/t_db.vcxproj.user b/bin/tests/db/win32/t_db.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index e05762cf75e290bf156cf45661a04b14e3d905e3..89d62e4188e2ce089cdde0d9475bfcdb0c88ad2a 100644 (file)
 
 #include <config.h>
 
-#include <sys/types.h>         /* Required for dirent.h */
-#include <sys/stat.h>
-
-#include <dirent.h>            /* XXX */
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdlib.h>
 
+#ifndef WIN32
 #include <unistd.h>            /* XXX */
+#else
+#include <direct.h>
+#endif
 
 #include <isc/buffer.h>
 #include <isc/dir.h>
@@ -36,6 +36,7 @@
 #include <isc/file.h>
 #include <isc/mem.h>
 #include <isc/region.h>
+#include <isc/stdio.h>
 #include <isc/string.h>
 #include <isc/util.h>
 
 
 /*
  * Adapted from the original dst_test.c program.
- * XXXDCL should use isc_dir_*.
  */
 
 static void
 cleandir(char *path) {
-       DIR             *dirp;
-       struct dirent   *pe;
+       isc_dir_t       dir;
        char            fullname[PATH_MAX + 1];
        size_t          l;
+       isc_result_t    ret;
 
-       dirp = opendir(path);
-       if (dirp == NULL) {
-               t_info("opendir(%s) failed %d\n", path, errno);
+       isc_dir_init(&dir);
+       ret = isc_dir_open(&dir, path);
+       if (ret != ISC_R_SUCCESS) {
+               t_info("isc_dir_open(%s) failed %s\n",
+                      path, isc_result_totext(ret));
                return;
        }
 
-       while ((pe = readdir(dirp)) != NULL) {
-               if (! strcmp(pe->d_name, "."))
+       while (isc_dir_read(&dir) == ISC_R_SUCCESS) {
+               if (!strcmp(dir.entry.name, "."))
                        continue;
-               if (! strcmp(pe->d_name, ".."))
+               if (!strcmp(dir.entry.name, ".."))
                        continue;
                (void)strlcpy(fullname, path, sizeof(fullname));
                (void)strlcat(fullname, "/", sizeof(fullname));
-               l = strlcat(fullname, pe->d_name, sizeof(fullname));
+               l = strlcat(fullname, dir.entry.name, sizeof(fullname));
                if (l < sizeof(fullname)) {
                        if (remove(fullname))
                                t_info("remove(%s) failed %d\n", fullname,
                                       errno);
                } else
                       t_info("unable to remove '%s/%s': path too long\n",
-                             path, pe->d_name);
+                             path, dir.entry.name);
 
        }
-       (void)closedir(dirp);
+       isc_dir_close(&dir);
        if (rmdir(path))
                t_info("rmdir(%s) failed %d\n", path, errno);
 
@@ -204,7 +206,11 @@ dh(dns_name_t *name1, int id1, dns_name_t *name2, int id2, isc_mem_t *mctx,
                goto cleanup;
        }
 
+#ifndef WIN32
        ret = isc_file_mktemplate("/tmp/", tmp, sizeof(tmp));
+#else
+       ret = isc_file_mktemplate(getenv("TEMP"), tmp, sizeof(tmp));
+#endif
        if (ret != ISC_R_SUCCESS) {
                t_info("isc_file_mktemplate failed %s\n",
                       isc_result_totext(ret));
@@ -297,7 +303,11 @@ io(dns_name_t *name, int id, int alg, int type, isc_mem_t *mctx,
                return;
        }
 
+#ifndef WIN32
        ret = isc_file_mktemplate("/tmp/", tmp, sizeof(tmp));
+#else
+       ret = isc_file_mktemplate(getenv("TEMP"), tmp, sizeof(tmp));
+#endif
        if (ret != ISC_R_SUCCESS) {
                t_info("isc_file_mktemplate failed %s\n",
                       isc_result_totext(ret));
@@ -558,56 +568,59 @@ sig_tofile(char *path, isc_buffer_t *buf) {
  */
 static int
 sig_fromfile(char *path, isc_buffer_t *iscbuf) {
-       int             rval;
-       int             len;
-       int             fd;
+       size_t          rval;
+       size_t          len;
+       FILE            *fp;
        unsigned char   val;
-       struct stat     sb;
        char            *p;
        char            *buf;
+       isc_result_t    isc_result;
+       off_t           size;
 
-       fd = open(path, O_RDONLY);
-       if (fd < 0) {
-               t_info("open failed, errno == %d\n", errno);
+       isc_result = isc_stdio_open(path, "rb", &fp);
+       if (isc_result != ISC_R_SUCCESS) {
+               t_info("open failed, result: %s\n",
+                      isc_result_totext(isc_result));
                return(1);
        }
 
-       rval = fstat(fd, &sb);
-       if (rval != 0) {
-               t_info("stat %s failed, errno == %d\n", path, errno);
-               close(fd);
+       isc_result = isc_file_getsizefd(fileno(fp), &size);
+       if (isc_result != ISC_R_SUCCESS) {
+               t_info("stat %s failed, result: %s\n",
+                      path, isc_result_totext(isc_result));
+               isc_stdio_close(fp);
                return(1);
        }
 
-       buf = (char *) malloc((sb.st_size + 1) * sizeof(char));
+       buf = (char *) malloc((size + 1) * sizeof(char));
        if (buf == NULL) {
                t_info("malloc failed, errno == %d\n", errno);
-               close(fd);
+               isc_stdio_close(fp);
                return(1);
        }
 
-
-       len = sb.st_size;
+       len = (size_t)size;
        p = buf;
        while (len) {
-               rval = read(fd, p, len);
-               if (rval > 0) {
+               isc_result = isc_stdio_read(p, 1, len, fp, &rval);
+               if (isc_result == ISC_R_SUCCESS) {
                        len -= rval;
                        p += rval;
                }
                else {
-                       t_info("read failed %d, errno == %d\n", rval, errno);
+                       t_info("read failed %d, result: %s\n",
+                              (int)rval, isc_result_totext(isc_result));
                        (void) free(buf);
-                       (void) close(fd);
+                       (void) isc_stdio_close(fp);
                        return(1);
                }
        }
-       close(fd);
+       isc_stdio_close(fp);
 
        p = buf;
-       len = sb.st_size;
+       len = size;
        while(len) {
-               if (*p == '\n') {
+               if ((*p == '\r') || (*p == '\n')) {
                        ++p;
                        --len;
                        continue;
@@ -637,15 +650,15 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname,
                isc_mem_t *mctx, char *expected_result,
                int *nfails, int *nprobs)
 {
-       int             rval;
-       int             len;
-       int             fd;
+       size_t          rval;
+       size_t          len;
+       FILE            *fp;
        int             exp_res;
        dst_key_t       *key = NULL;
        unsigned char   sig[T_SIGMAX];
        unsigned char   *p;
        unsigned char   *data;
-       struct stat     sb;
+       off_t           size;
        isc_result_t    isc_result;
        isc_buffer_t    databuf;
        isc_buffer_t    sigbuf;
@@ -659,39 +672,41 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname,
        /*
         * Read data from file in a form usable by dst_verify.
         */
-       fd = open(datapath, O_RDONLY);
-       if (fd < 0) {
-               t_info("t2_sigchk: open failed %d\n", errno);
+       isc_result = isc_stdio_open(datapath, "rb", &fp);
+       if (isc_result != ISC_R_SUCCESS) {
+               t_info("t2_sigchk: open failed %s\n",
+                      isc_result_totext(isc_result));
                ++*nprobs;
                return;
        }
 
-       rval = fstat(fd, &sb);
-       if (rval != 0) {
-               t_info("t2_sigchk: stat (%s) failed %d\n", datapath, errno);
+       isc_result = isc_file_getsizefd(fileno(fp), &size);
+       if (isc_result != ISC_R_SUCCESS) {
+               t_info("t2_sigchk: stat (%s) failed %s\n",
+                      datapath, isc_result_totext(isc_result));
                ++*nprobs;
-               close(fd);
+               isc_stdio_close(fp);
                return;
        }
 
-       data = (unsigned char *) malloc(sb.st_size * sizeof(unsigned char));
+       data = (unsigned char *) malloc(size * sizeof(unsigned char));
        if (data == NULL) {
                t_info("t2_sigchk: malloc failed %d\n", errno);
                ++*nprobs;
-               close(fd);
+               isc_stdio_close(fp);
                return;
        }
 
        p = data;
-       len = sb.st_size;
+       len = (size_t)size;
        do {
-               rval = read(fd, p, len);
-               if (rval > 0) {
+               isc_result = isc_stdio_read(p, 1, len, fp, &rval);
+               if (isc_result == ISC_R_SUCCESS) {
                        len -= rval;
                        p += rval;
                }
        } while (len);
-       (void) close(fd);
+       (void) isc_stdio_close(fp);
 
        /*
         * Read key from file in a form usable by dst_verify.
@@ -717,8 +732,8 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname,
                return;
        }
 
-       isc_buffer_init(&databuf, data, sb.st_size);
-       isc_buffer_add(&databuf, sb.st_size);
+       isc_buffer_init(&databuf, data, (unsigned int)size);
+       isc_buffer_add(&databuf, (unsigned int)size);
        isc_buffer_usedregion(&databuf, &datareg);
 
 #ifdef NEWSIG
@@ -945,8 +960,15 @@ t2(void) {
 }
 
 testspec_t     T_testlist[] = {
-       {       t1,     "basic dst module verification" },
-       {       t2,     "signature ineffability"        },
-       {       NULL,   NULL                            }
+       {       (PFV) t1,       "basic dst module verification" },
+       {       (PFV) t2,       "signature ineffability"        },
+       {       (PFV) 0,        NULL                            }
 };
 
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/dst/win32/REQUIRE_EXTENDED_DIR b/bin/tests/dst/win32/REQUIRE_EXTENDED_DIR
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/bin/tests/dst/win32/t_dst.dsp.in b/bin/tests/dst/win32/t_dst.dsp.in
new file mode 100644 (file)
index 0000000..da0596c
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_dst" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_dst - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_dst.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_dst.mak" CFG="t_dst - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_dst - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_dst - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_dst - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_dst.exe"
+
+!ELSEIF  "$(CFG)" == "t_dst - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_dst.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_dst - @PLATFORM@ Release"
+# Name "t_dst - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_dst.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/dst/win32/t_dst.dsw b/bin/tests/dst/win32/t_dst.dsw
new file mode 100644 (file)
index 0000000..87a4b8f
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_dst"=".\t_dst.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/dst/win32/t_dst.mak.in b/bin/tests/dst/win32/t_dst.mak.in
new file mode 100644 (file)
index 0000000..b8141c0
--- /dev/null
@@ -0,0 +1,375 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_dst.dsp
+!IF "$(CFG)" == ""
+CFG=t_dst - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_dst - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_dst - @PLATFORM@ Release" && "$(CFG)" != "t_dst - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_dst.mak" CFG="t_dst - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_dst - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_dst - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_dst - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_dst - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_dst.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_dst.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_dst.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_dst.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_dst.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_dst.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_dst.pdb" @MACHINE@ /out:"../../../../Build/Release/t_dst.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_dst.obj" \
+       "..\..\..\..\lib\dns\win32\Release\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_dst.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_dst - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_dst.exe" "$(OUTDIR)\t_dst.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_dst.exe" "$(OUTDIR)\t_dst.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_dst.obj"
+       -@erase "$(INTDIR)\t_dst.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_dst.bsc"
+       -@erase "$(OUTDIR)\t_dst.map"
+       -@erase "$(OUTDIR)\t_dst.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_dst.exe"
+       -@erase "..\..\..\..\Build\Debug\t_dst.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_dst.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_dst.sbr"
+
+"$(OUTDIR)\t_dst.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_dst.pdb" /map:"$(INTDIR)\t_dst.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_dst.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_dst.obj" \
+       "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_dst.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_dst.dep")
+!INCLUDE "t_dst.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_dst.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_dst - @PLATFORM@ Release" || "$(CFG)" == "t_dst - @PLATFORM@ Debug"
+SOURCE=..\t_dst.c
+
+!IF  "$(CFG)" == "t_dst - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_dst.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_dst - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_dst.obj"  "$(INTDIR)\t_dst.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_dst - @PLATFORM@ Release"
+
+"libdns - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\dst\win32"
+
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\dst\win32"
+
+!ELSEIF  "$(CFG)" == "t_dst - @PLATFORM@ Debug"
+
+"libdns - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\dst\win32"
+
+"libdns - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\dst\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_dst - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\dst\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\dst\win32"
+
+!ELSEIF  "$(CFG)" == "t_dst - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\dst\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\dst\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_dst - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\dst\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\dst\win32"
+
+!ELSEIF  "$(CFG)" == "t_dst - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\dst\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\t_dst\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/dst/win32/t_dst.vcxproj.filters.in b/bin/tests/dst/win32/t_dst.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..06209fd
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_dst.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/dst/win32/t_dst.vcxproj.in b/bin/tests/dst/win32/t_dst.vcxproj.in
new file mode 100644 (file)
index 0000000..509da20
--- /dev/null
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{EE9B94CF-7C33-4F3B-A674-FB756D422C54}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_dst</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\r
+copy "Kdh.+002+18602.key.in" "Kdh.+002+18602.key"\r
+copy "Kdh.+002+18602.private.in" "Kdh.+002+18602.private"\r
+copy "Kdh.+002+48957.key.in" "Kdh.+002+48957.key"\r
+copy "Kdh.+002+48957.private.in" "Kdh.+002+48957.private"\r
+copy "Ktest.+001+00002.key.in" "Ktest.+001+00002.key"\r
+copy "Ktest.+001+54622.key.in" "Ktest.+001+54622.key"\r
+copy "Ktest.+001+54622.private.in" "Ktest.+001+54622.private"\r
+copy "Ktest.+003+23616.key.in" "Ktest.+003+23616.key"\r
+copy "Ktest.+003+23616.private.in" "Ktest.+003+23616.private"\r
+copy "Ktest.+003+49667.key.in" "Ktest.+003+49667.key"\r
+copy dst_2_data.in dst_2_data\r
+copy t2_data_1.in t2_data_1\r
+copy t2_data_2.in t2_data_2\r
+copy t2_dsasig.in t2_dsasig\r
+copy t2_rsasig.in t2_rsasig\r
+</Command>\r
+    </PreBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\r
+copy "Kdh.+002+18602.key.in" "Kdh.+002+18602.key"\r
+copy "Kdh.+002+18602.private.in" "Kdh.+002+18602.private"\r
+copy "Kdh.+002+48957.key.in" "Kdh.+002+48957.key"\r
+copy "Kdh.+002+48957.private.in" "Kdh.+002+48957.private"\r
+copy "Ktest.+001+00002.key.in" "Ktest.+001+00002.key"\r
+copy "Ktest.+001+54622.key.in" "Ktest.+001+54622.key"\r
+copy "Ktest.+001+54622.private.in" "Ktest.+001+54622.private"\r
+copy "Ktest.+003+23616.key.in" "Ktest.+003+23616.key"\r
+copy "Ktest.+003+23616.private.in" "Ktest.+003+23616.private"\r
+copy "Ktest.+003+49667.key.in" "Ktest.+003+49667.key"\r
+copy dst_2_data.in dst_2_data\r
+copy t2_data_1.in t2_data_1\r
+copy t2_data_2.in t2_data_2\r
+copy t2_dsasig.in t2_dsasig\r
+copy t2_rsasig.in t2_rsasig\r
+</Command>\r
+    </PreBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_dst.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/dst/win32/t_dst.vcxproj.user b/bin/tests/dst/win32/t_dst.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 47d08c572d8693324e3bdfe56603450781f8df91..ac78c9998f6eade6b0d2841b4cbe2b5d4df1f5c8 100644 (file)
@@ -49,7 +49,7 @@ typedef struct {
     const unsigned int key_len;
     const unsigned char        *str;
     const unsigned int str_len;
-} IN;
+} IN_;
 #define STR_INIT(s)    (const unsigned char *)(s), sizeof(s)-1
 
 
@@ -67,32 +67,32 @@ union {
 typedef struct {
     const char         *str;
     const unsigned int digest_len;
-} OUT;
+} OUT_;
 
 
 /*
  * two ad hoc hash examples
  */
-static IN abc = { "\"abc\"", NULL, 0, STR_INIT("abc")};
-static OUT abc_sha1 = {
+static IN_ abc = { "\"abc\"", NULL, 0, STR_INIT("abc")};
+static OUT_ abc_sha1 = {
        "a9993e364706816aba3e25717850c26c9cd0d89d",
        ISC_SHA1_DIGESTLENGTH};
-static OUT abc_sha224 = {
+static OUT_ abc_sha224 = {
        "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7",
        ISC_SHA224_DIGESTLENGTH};
-static OUT abc_md5 = {
+static OUT_ abc_md5 = {
        "900150983cd24fb0d6963f7d28e17f72",
        16};
 
-static IN abc_blah = { "\"abcdbc...\"", NULL, 0,
+static IN_ abc_blah = { "\"abcdbc...\"", NULL, 0,
        STR_INIT("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq")};
-static OUT abc_blah_sha1 =  {
+static OUT_ abc_blah_sha1 =  {
        "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
        ISC_SHA1_DIGESTLENGTH};
-static OUT abc_blah_sha224 = {
+static OUT_ abc_blah_sha224 = {
        "75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525",
        ISC_SHA224_DIGESTLENGTH};
-static OUT abc_blah_md5 = {
+static OUT_ abc_blah_md5 = {
        "8215ef0796a20bcaaae116d3876c664a",
        16};
 
@@ -102,15 +102,15 @@ static OUT abc_blah_md5 = {
 static const unsigned char rfc2104_1_key[16] = {
        0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
        0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b};
-static IN rfc2104_1 = {"RFC 2104 #1", rfc2104_1_key, sizeof(rfc2104_1_key),
+static IN_ rfc2104_1 = {"RFC 2104 #1", rfc2104_1_key, sizeof(rfc2104_1_key),
        STR_INIT("Hi There")};
-static OUT rfc2104_1_hmac = {
+static OUT_ rfc2104_1_hmac = {
        "9294727a3638bb1c13f48ef8158bfc9d",
        16};
 
-static IN rfc2104_2 = {"RFC 2104 #2", STR_INIT("Jefe"),
+static IN_ rfc2104_2 = {"RFC 2104 #2", STR_INIT("Jefe"),
        STR_INIT("what do ya want for nothing?")};
-static OUT rfc2104_2_hmac = {
+static OUT_ rfc2104_2_hmac = {
        "750c783e6ab0b503eaa86e310a5db738",
        16};
 
@@ -125,9 +125,9 @@ static const unsigned char rfc2104_3_s[50] = {
        0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
        0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
        0xDD, 0xDD};
-static IN rfc2104_3 = {"RFC 2104 #3", rfc2104_3_key, sizeof(rfc2104_3_key),
+static IN_ rfc2104_3 = {"RFC 2104 #3", rfc2104_3_key, sizeof(rfc2104_3_key),
        rfc2104_3_s, sizeof(rfc2104_3_s)};
-static OUT rfc2104_3_hmac = {
+static OUT_ rfc2104_3_hmac = {
        "56be34521d144c88dbb8c733f0e8b3f6",
        16};
 
@@ -138,45 +138,45 @@ static const unsigned char rfc4634_1_key[20] = {
       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b
 };
-static IN rfc4634_1 = {"RFC 4634 #1", rfc4634_1_key, sizeof(rfc4634_1_key),
+static IN_ rfc4634_1 = {"RFC 4634 #1", rfc4634_1_key, sizeof(rfc4634_1_key),
        STR_INIT("Hi There")};
-static OUT rfc4634_1_sha1 = {
+static OUT_ rfc4634_1_sha1 = {
        "B617318655057264E28BC0B6FB378C8EF146BE00",
        ISC_SHA1_DIGESTLENGTH};
-static OUT rfc4634_1_sha224 = {
+static OUT_ rfc4634_1_sha224 = {
        "896FB1128ABBDF196832107CD49DF33F47B4B1169912BA4F53684B22",
        ISC_SHA224_DIGESTLENGTH};
-static OUT rfc4634_1_sha256 = {
+static OUT_ rfc4634_1_sha256 = {
        "B0344C61D8DB38535CA8AFCEAF0BF12B881DC200C9833DA726E9376C2E32"
        "CFF7",
        ISC_SHA256_DIGESTLENGTH};
-static OUT rfc4634_1_sha384 = {
+static OUT_ rfc4634_1_sha384 = {
        "AFD03944D84895626B0825F4AB46907F15F9DADBE4101EC682AA034C7CEB"
        "C59CFAEA9EA9076EDE7F4AF152E8B2FA9CB6",
        ISC_SHA384_DIGESTLENGTH};
-static OUT rfc4634_1_sha512 = {
+static OUT_ rfc4634_1_sha512 = {
        "87AA7CDEA5EF619D4FF0B4241A1D6CB02379F4E2CE4EC2787AD0B30545E1"
        "7CDEDAA833B7D6B8A702038B274EAEA3F4E4BE9D914EEB61F1702E696C20"
        "3A126854",
        ISC_SHA512_DIGESTLENGTH};
 
-static IN rfc4634_2 = {"RFC 4634 #2", STR_INIT("Jefe"),
+static IN_ rfc4634_2 = {"RFC 4634 #2", STR_INIT("Jefe"),
        STR_INIT("what do ya want for nothing?")};
-static OUT rfc4634_2_sha1 = {
+static OUT_ rfc4634_2_sha1 = {
        "EFFCDF6AE5EB2FA2D27416D5F184DF9C259A7C79",
        ISC_SHA1_DIGESTLENGTH};
-static OUT rfc4634_2_sha224 = {
+static OUT_ rfc4634_2_sha224 = {
        "A30E01098BC6DBBF45690F3A7E9E6D0F8BBEA2A39E6148008FD05E44",
        ISC_SHA224_DIGESTLENGTH};
-static OUT rfc4634_2_sha256 = {
+static OUT_ rfc4634_2_sha256 = {
        "5BDCC146BF60754E6A042426089575C75A003F089D2739839DEC58B964EC"
        "3843",
        ISC_SHA256_DIGESTLENGTH};
-static OUT rfc4634_2_sha384 = {
+static OUT_ rfc4634_2_sha384 = {
        "AF45D2E376484031617F78D2B58A6B1B9C7EF464F5A01B47E42EC3736322"
        "445E8E2240CA5E69E2C78B3239ECFAB21649",
        ISC_SHA384_DIGESTLENGTH};
-static OUT rfc4634_2_sha512 = {
+static OUT_ rfc4634_2_sha512 = {
        "164B7A7BFCF819E2E395FBE73B56E0A387BD64222E831FD610270CD7EA25"
        "05549758BF75C05A994A6D034F65F8F0E6FDCAEAB1A34D4A6B4B636E070A"
        "38BCE737",
@@ -193,23 +193,23 @@ static const unsigned char rfc4634_3_s[50] = {
        0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
        0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd
 };
-static IN rfc4634_3 = {"RFC 4634 #3", rfc4634_3_key, sizeof(rfc4634_3_key),
+static IN_ rfc4634_3 = {"RFC 4634 #3", rfc4634_3_key, sizeof(rfc4634_3_key),
        rfc4634_3_s, sizeof(rfc4634_3_s)};
-static OUT rfc4634_3_sha1 = {
+static OUT_ rfc4634_3_sha1 = {
        "125D7342B9AC11CD91A39AF48AA17B4F63F175D3",
        ISC_SHA1_DIGESTLENGTH};
-static OUT rfc4634_3_sha224 = {
+static OUT_ rfc4634_3_sha224 = {
        "7FB3CB3588C6C1F6FFA9694D7D6AD2649365B0C1F65D69D1EC8333EA",
        ISC_SHA224_DIGESTLENGTH};
-static OUT rfc4634_3_sha256 = {
+static OUT_ rfc4634_3_sha256 = {
        "773EA91E36800E46854DB8EBD09181A72959098B3EF8C122D9635514CED5"
        "65FE",
        ISC_SHA256_DIGESTLENGTH};
-static OUT rfc4634_3_sha384 = {
+static OUT_ rfc4634_3_sha384 = {
        "88062608D3E6AD8A0AA2ACE014C8A86F0AA635D947AC9FEBE83EF4E55966"
        "144B2A5AB39DC13814B94E3AB6E101A34F27",
        ISC_SHA384_DIGESTLENGTH};
-static OUT rfc4634_3_sha512 = {
+static OUT_ rfc4634_3_sha512 = {
        "FA73B0089D56A284EFB0F0756C890BE9B1B5DBDD8EE81A3655F83E33B227"
        "9D39BF3E848279A722C806B485A47E67C807B946A337BEE8942674278859"
        "E13292FB",
@@ -227,23 +227,23 @@ static const unsigned char rfc4634_4_s[50] = {
        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
        0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd
 };
-static IN rfc4634_4 = {"RFC 4634 #3", rfc4634_4_key, sizeof(rfc4634_4_key),
+static IN_ rfc4634_4 = {"RFC 4634 #3", rfc4634_4_key, sizeof(rfc4634_4_key),
        rfc4634_4_s, sizeof(rfc4634_4_s)};
-static OUT rfc4634_4_sha1 = {
+static OUT_ rfc4634_4_sha1 = {
        "4C9007F4026250C6BC8414F9BF50C86C2D7235DA",
        ISC_SHA1_DIGESTLENGTH};
-static OUT rfc4634_4_sha224 = {
+static OUT_ rfc4634_4_sha224 = {
        "6C11506874013CAC6A2ABC1BB382627CEC6A90D86EFC012DE7AFEC5A",
        ISC_SHA224_DIGESTLENGTH};
-static OUT rfc4634_4_sha256 = {
+static OUT_ rfc4634_4_sha256 = {
        "82558A389A443C0EA4CC819899F2083A85F0FAA3E578F8077A2E3FF46729"
        "665B",
        ISC_SHA256_DIGESTLENGTH};
-static OUT rfc4634_4_sha384 = {
+static OUT_ rfc4634_4_sha384 = {
        "3E8A69B7783C25851933AB6290AF6CA77A9981480850009CC5577C6E1F57"
        "3B4E6801DD23C4A7D679CCF8A386C674CFFB",
        ISC_SHA384_DIGESTLENGTH};
-static OUT rfc4634_4_sha512 = {
+static OUT_ rfc4634_4_sha512 = {
        "B0BA465637458C6990E5A8C5F61D4AF7E576D97FF94B872DE76F8050361E"
        "E3DBA91CA5C11AA25EB4D679275CC5788063A5F19741120C4F2DE2ADEBEB"
        "10A298DD",
@@ -274,7 +274,7 @@ d2str(char *buf, unsigned int buf_len,
  * Compare binary digest or HMAC to string of hex digits from an RFC
  */
 static void
-ck(const char *name, const IN *in, const OUT *out)
+ck(const char *name, const IN_ *in, const OUT_ *out)
 {
        char buf[sizeof(dbuf)*2+1];
        const char *str_name;
@@ -312,7 +312,7 @@ ck(const char *name, const IN *in, const OUT *out)
 
 static void
 t_hash(const char *hname, HASH_INIT init, UPDATE update, FINAL final,
-      IN *in, OUT *out)
+      IN_ *in, OUT_ *out)
 {
        union {
            unsigned char b[1024];
@@ -333,7 +333,7 @@ t_hash(const char *hname, HASH_INIT init, UPDATE update, FINAL final,
  * isc_sha224_final has a different calling sequence
  */
 static void
-t_sha224(IN *in, OUT *out)
+t_sha224(IN_ *in, OUT_ *out)
 {
        isc_sha224_t ctx;
 
@@ -348,7 +348,7 @@ t_sha224(IN *in, OUT *out)
 
 
 static void
-t_hashes(IN *in, OUT *out_sha1, OUT *out_sha224, OUT *out_md5)
+t_hashes(IN_ *in, OUT_ *out_sha1, OUT_ *out_sha224, OUT_ *out_md5)
 {
        t_hash("SHA1", (HASH_INIT)isc_sha1_init, (UPDATE)isc_sha1_update,
               (FINAL)isc_sha1_final, in, out_sha1);
@@ -363,7 +363,7 @@ t_hashes(IN *in, OUT *out_sha1, OUT *out_sha224, OUT *out_md5)
  * isc_hmacmd5_sign has a different calling sequence
  */
 static void
-t_md5hmac(IN *in, OUT *out)
+t_md5hmac(IN_ *in, OUT_ *out)
 {
        isc_hmacmd5_t ctx;
 
@@ -378,7 +378,7 @@ t_md5hmac(IN *in, OUT *out)
 
 static void
 t_hmac(const char *hname, HMAC_INIT init, UPDATE update, SIGN sign,
-      IN *in, OUT *out)
+      IN_ *in, OUT_ *out)
 {
        union {
            unsigned char b[1024];
@@ -400,8 +400,8 @@ t_hmac(const char *hname, HMAC_INIT init, UPDATE update, SIGN sign,
 
 
 static void
-t_hmacs(IN *in, OUT *out_sha1, OUT *out_sha224, OUT *out_sha256,
-       OUT *out_sha384, OUT *out_sha512)
+t_hmacs(IN_ *in, OUT_ *out_sha1, OUT_ *out_sha224, OUT_ *out_sha256,
+       OUT_ *out_sha384, OUT_ *out_sha512)
 {
        t_hmac("HMAC-SHA1", (HMAC_INIT)isc_hmacsha1_init,
               (UPDATE)isc_hmacsha1_update, (SIGN)isc_hmacsha1_sign,
@@ -462,6 +462,14 @@ t1(void)
 
 
 testspec_t     T_testlist[] = {
-       {       t1,             "hashes"                },
-       {       NULL,           NULL                    }
+       {       (PFV) t1,               "hashes"                },
+       {       (PFV) 0,                NULL                    }
 };
+
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/hashes/win32/t_hashes.dsp.in b/bin/tests/hashes/win32/t_hashes.dsp.in
new file mode 100644 (file)
index 0000000..587699e
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_hashes" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_hashes - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_hashes.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_hashes.mak" CFG="t_hashes - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_hashes - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_hashes - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_hashes.exe"
+
+!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_hashes.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_hashes - @PLATFORM@ Release"
+# Name "t_hashes - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_hashes.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/hashes/win32/t_hashes.dsw b/bin/tests/hashes/win32/t_hashes.dsw
new file mode 100644 (file)
index 0000000..95347f1
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_hashes"=".\t_hashes.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/hashes/win32/t_hashes.mak.in b/bin/tests/hashes/win32/t_hashes.mak.in
new file mode 100644 (file)
index 0000000..10ebf3c
--- /dev/null
@@ -0,0 +1,347 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_hashes.dsp
+!IF "$(CFG)" == ""
+CFG=t_hashes - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_hashes - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_hashes - @PLATFORM@ Release" && "$(CFG)" != "t_hashes - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_hashes.mak" CFG="t_hashes - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_hashes - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_hashes - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_hashes.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_hashes.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_hashes.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_hashes.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_hashes.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_hashes.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_hashes.pdb" @MACHINE@ /out:"../../../../Build/Release/t_hashes.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_hashes.obj" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_hashes.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_hashes.exe" "$(OUTDIR)\t_hashes.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_hashes.exe" "$(OUTDIR)\t_hashes.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_hashes.obj"
+       -@erase "$(INTDIR)\t_hashes.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_hashes.bsc"
+       -@erase "$(OUTDIR)\t_hashes.map"
+       -@erase "$(OUTDIR)\t_hashes.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_hashes.exe"
+       -@erase "..\..\..\..\Build\Debug\t_hashes.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_hashes.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_hashes.sbr"
+
+"$(OUTDIR)\t_hashes.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_hashes.pdb" /map:"$(INTDIR)\t_hashes.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_hashes.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_hashes.obj" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_hashes.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_hashes.dep")
+!INCLUDE "t_hashes.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_hashes.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_hashes - @PLATFORM@ Release" || "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
+SOURCE=..\t_hashes.c
+
+!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_hashes.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_hashes.obj"       "$(INTDIR)\t_hashes.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\hashes\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\hashes\win32"
+
+!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\hashes\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\hashes\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\hashes\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\hashes\win32"
+
+!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\hashes\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\hashes\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/hashes/win32/t_hashes.vcxproj.filters.in b/bin/tests/hashes/win32/t_hashes.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..0229fcc
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_hashes.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/hashes/win32/t_hashes.vcxproj.in b/bin/tests/hashes/win32/t_hashes.vcxproj.in
new file mode 100644 (file)
index 0000000..c97925a
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{14071120-84F6-4A6F-BF23-90EC5D0372CE}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_hashes</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_hashes.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/hashes/win32/t_hashes.vcxproj.user b/bin/tests/hashes/win32/t_hashes.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index bfa4bd673273c193f2f7537dde26952927e62625..1c1f679a92c133364b93784b2bcde5464400fa31 100644 (file)
@@ -319,17 +319,24 @@ t11() {
 
 
 testspec_t     T_testlist[] = {
-       {       t1,     "ISC_R_SUCCESS"         },
-       {       t2,     "ISC_R_UNEXPECTEDEND"   },
-       {       t3,     "DNS_NOOWNER"           },
-       {       t4,     "DNS_NOTTL"             },
-       {       t5,     "DNS_BADCLASS"          },
-       {       t6,     "DNSKEY RR 1"           },
-       {       t7,     "DNSKEY RR 2"           },
-       {       t8,     "$INCLUDE"              },
-       {       t9,     "$INCLUDE w/ DNS_BADCLASS"      },
-       {       t10,    "non empty blank lines" },
-       {       t11,    "leading zeros in serial"       },
-       {       NULL,   NULL                    }
+       {       (PFV) t1,       "ISC_R_SUCCESS"                 },
+       {       (PFV) t2,       "ISC_R_UNEXPECTEDEND"           },
+       {       (PFV) t3,       "DNS_NOOWNER"                   },
+       {       (PFV) t4,       "DNS_NOTTL"                     },
+       {       (PFV) t5,       "DNS_BADCLASS"                  },
+       {       (PFV) t6,       "DNSKEY RR 1"                   },
+       {       (PFV) t7,       "DNSKEY RR 2"                   },
+       {       (PFV) t8,       "$INCLUDE"                      },
+       {       (PFV) t9,       "$INCLUDE w/ DNS_BADCLASS"      },
+       {       (PFV) t10,      "non empty blank lines"         },
+       {       (PFV) t11,      "leading zeros in serial"       },
+       {       (PFV) 0,        NULL                            }
 };
 
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/master/win32/t_master.dsp.in b/bin/tests/master/win32/t_master.dsp.in
new file mode 100644 (file)
index 0000000..792941f
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_master" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_master - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_master.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_master.mak" CFG="t_master - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_master - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_master - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_master - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_master.exe"
+
+!ELSEIF  "$(CFG)" == "t_master - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_master.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_master - @PLATFORM@ Release"
+# Name "t_master - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_master.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/master/win32/t_master.dsw b/bin/tests/master/win32/t_master.dsw
new file mode 100644 (file)
index 0000000..1d7ef5b
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_master"=".\t_master.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/master/win32/t_master.mak.in b/bin/tests/master/win32/t_master.mak.in
new file mode 100644 (file)
index 0000000..c04d56d
--- /dev/null
@@ -0,0 +1,375 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_master.dsp
+!IF "$(CFG)" == ""
+CFG=t_master - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_master - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_master - @PLATFORM@ Release" && "$(CFG)" != "t_master - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_master.mak" CFG="t_master - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_master - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_master - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_master - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_master - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_master.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_master.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_master.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_master.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_master.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_master.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_master.pdb" @MACHINE@ /out:"../../../../Build/Release/t_master.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_master.obj" \
+       "..\..\..\..\lib\dns\win32\Release\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_master.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_master - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_master.exe" "$(OUTDIR)\t_master.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_master.exe" "$(OUTDIR)\t_master.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_master.obj"
+       -@erase "$(INTDIR)\t_master.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_master.bsc"
+       -@erase "$(OUTDIR)\t_master.map"
+       -@erase "$(OUTDIR)\t_master.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_master.exe"
+       -@erase "..\..\..\..\Build\Debug\t_master.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_master.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_master.sbr"
+
+"$(OUTDIR)\t_master.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_master.pdb" /map:"$(INTDIR)\t_master.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_master.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_master.obj" \
+       "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_master.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_master.dep")
+!INCLUDE "t_master.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_master.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_master - @PLATFORM@ Release" || "$(CFG)" == "t_master - @PLATFORM@ Debug"
+SOURCE=..\t_master.c
+
+!IF  "$(CFG)" == "t_master - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_master.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_master - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_master.obj"       "$(INTDIR)\t_master.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_master - @PLATFORM@ Release"
+
+"libdns - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\master\win32"
+
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\master\win32"
+
+!ELSEIF  "$(CFG)" == "t_master - @PLATFORM@ Debug"
+
+"libdns - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\master\win32"
+
+"libdns - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\master\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_master - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\master\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\master\win32"
+
+!ELSEIF  "$(CFG)" == "t_master - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\master\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\master\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_master - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\master\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\master\win32"
+
+!ELSEIF  "$(CFG)" == "t_master - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\master\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\master\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/master/win32/t_master.vcxproj.filters.in b/bin/tests/master/win32/t_master.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..58b31ff
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_master.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/master/win32/t_master.vcxproj.in b/bin/tests/master/win32/t_master.vcxproj.in
new file mode 100644 (file)
index 0000000..4819381
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_master</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_master.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/master/win32/t_master.vcxproj.user b/bin/tests/master/win32/t_master.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index c99ddd9b69bcb73fcb629e90a4b259d00345a8f1..20509af0d2abe6affbc83513dae4465120086010 100644 (file)
@@ -202,7 +202,14 @@ t1(void) {
 }
 
 testspec_t     T_testlist[] = {
-       {       t1,     "basic memory subsystem"        },
-       {       NULL,   NULL                            }
+       {       (PFV) t1,       "basic memory subsystem"        },
+       {       (PFV) 0,        NULL                            }
 };
 
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/mem/win32/t_mem.dsp.in b/bin/tests/mem/win32/t_mem.dsp.in
new file mode 100644 (file)
index 0000000..1707b18
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_mem" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_mem - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_mem.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_mem.mak" CFG="t_mem - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_mem - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_mem - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_mem - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_mem.exe"
+
+!ELSEIF  "$(CFG)" == "t_mem - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_mem.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_mem - @PLATFORM@ Release"
+# Name "t_mem - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_mem.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/mem/win32/t_mem.dsw b/bin/tests/mem/win32/t_mem.dsw
new file mode 100644 (file)
index 0000000..d653068
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_mem"=".\t_mem.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/mem/win32/t_mem.mak.in b/bin/tests/mem/win32/t_mem.mak.in
new file mode 100644 (file)
index 0000000..e93a6af
--- /dev/null
@@ -0,0 +1,347 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_mem.dsp
+!IF "$(CFG)" == ""
+CFG=t_mem - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_mem - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_mem - @PLATFORM@ Release" && "$(CFG)" != "t_mem - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_mem.mak" CFG="t_mem - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_mem - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_mem - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_mem - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_mem - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_mem.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_mem.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_mem.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_mem.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_mem.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_mem.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_mem.pdb" @MACHINE@ /out:"../../../../Build/Release/t_mem.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_mem.obj" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_mem.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_mem - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_mem.exe" "$(OUTDIR)\t_mem.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_mem.exe" "$(OUTDIR)\t_mem.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_mem.obj"
+       -@erase "$(INTDIR)\t_mem.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_mem.bsc"
+       -@erase "$(OUTDIR)\t_mem.map"
+       -@erase "$(OUTDIR)\t_mem.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_mem.exe"
+       -@erase "..\..\..\..\Build\Debug\t_mem.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_mem.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_mem.sbr"
+
+"$(OUTDIR)\t_mem.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_mem.pdb" /map:"$(INTDIR)\t_mem.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_mem.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_mem.obj" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_mem.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_mem.dep")
+!INCLUDE "t_mem.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_mem.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_mem - @PLATFORM@ Release" || "$(CFG)" == "t_mem - @PLATFORM@ Debug"
+SOURCE=..\t_mem.c
+
+!IF  "$(CFG)" == "t_mem - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_mem.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_mem - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_mem.obj"  "$(INTDIR)\t_mem.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_mem - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\mem\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\mem\win32"
+
+!ELSEIF  "$(CFG)" == "t_mem - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\mem\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\mem\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_mem - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\mem\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\mem\win32"
+
+!ELSEIF  "$(CFG)" == "t_mem - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\mem\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\mem\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/mem/win32/t_mem.vcxproj.filters.in b/bin/tests/mem/win32/t_mem.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..663d257
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_mem.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/mem/win32/t_mem.vcxproj.in b/bin/tests/mem/win32/t_mem.vcxproj.in
new file mode 100644 (file)
index 0000000..a21277a
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{627F32A9-267F-41CA-827C-1FD04DE20A56}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_mem</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_mem.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/mem/win32/t_mem.vcxproj.user b/bin/tests/mem/win32/t_mem.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 61ae9065322d707b12ba8546467265827ea3839c..ebfdb0e7d95acdfeb7cf47f33ef793eab726c55c 100644 (file)
@@ -168,13 +168,13 @@ chkdata(unsigned char *buf, size_t buflen, char *exp_data,
                        t_info("bad data at position %lu, "
                               "got 0x%.2x, expected 0x%.2x\n",
                               (unsigned long)cnt, *p, *v);
-                       result = cnt + 1;
+                       result = (int)cnt + 1;
                }
                (void)free(data);
        } else {
                t_info("data length error, expected %lu, got %lu\n",
                        (unsigned long)exp_data_len, (unsigned long)buflen);
-               result = exp_data_len - buflen;
+               result = (int)(exp_data_len - buflen);
        }
        return (result);
 }
@@ -2023,7 +2023,7 @@ test_dns_name_fromwire(char *datafile_name, int testname_offset, int downcase,
        isc_buffer_setactive(&iscbuf1, len);
        iscbuf1.current = testname_offset;
 
-       isc_buffer_init(&iscbuf2, buf2, buflen);
+       isc_buffer_init(&iscbuf2, buf2, (unsigned int)buflen);
        dns_name_init(&dns_name1, NULL);
        dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_STRICT);
        dns_decompress_setmethods(&dctx, dc_method);
@@ -2230,7 +2230,7 @@ test_dns_name_towire(char *testname, unsigned int dc_method, char *exp_data,
        isc_buffer_init(&iscbuf2, buf2, BUFLEN);
        dns_result = dns_name_fromtext(&dns_name, &iscbuf1, NULL, 0, &iscbuf2);
        if (dns_result == ISC_R_SUCCESS) {
-               isc_buffer_init(&iscbuf3, buf3, buflen);
+         isc_buffer_init(&iscbuf3, buf3, (unsigned int)buflen);
                dns_result = dns_name_towire(&dns_name, &cctx, &iscbuf3);
                if (dns_result == exp_result) {
                        if (exp_result == ISC_R_SUCCESS) {
@@ -2351,29 +2351,35 @@ t_dns_name_concatenate(void) {
 #endif
 
 testspec_t T_testlist[] = {
-       {       t_dns_name_init,                "dns_name_init"         },
-       {       t_dns_name_invalidate,          "dns_name_invalidate"   },
-       {       t_dns_name_setbuffer,           "dns_name_setbuffer"    },
-       {       t_dns_name_hasbuffer,           "dns_name_hasbuffer"    },
-       {       t_dns_name_isabsolute,          "dns_name_isabsolute"   },
-       {       t_dns_name_hash,                "dns_name_hash"         },
-       {       t_dns_name_fullcompare,         "dns_name_fullcompare"  },
-       {       t_dns_name_compare,             "dns_name_compare"      },
-       {       t_dns_name_rdatacompare,        "dns_name_rdatacompare" },
-       {       t_dns_name_issubdomain,         "dns_name_issubdomain"  },
-       {       t_dns_name_countlabels,         "dns_name_countlabels"  },
-       {       t_dns_name_getlabel,            "dns_name_getlabel"     },
-       {       t_dns_name_getlabelsequence,    "dns_name_getlabelsequence" },
-       {       t_dns_name_fromregion,          "dns_name_fromregion"   },
-       {       t_dns_name_toregion,            "dns_name_toregion"     },
-       {       t_dns_name_fromwire,            "dns_name_fromwire"     },
-       {       t_dns_name_towire,              "dns_name_towire"       },
-       {       t_dns_name_fromtext,            "dns_name_fromtext"     },
-       {       t_dns_name_totext,              "dns_name_totext"       },
+       {       (PFV) t_dns_name_init,          "dns_name_init"         },
+       {       (PFV) t_dns_name_invalidate,    "dns_name_invalidate"   },
+       {       (PFV) t_dns_name_setbuffer,     "dns_name_setbuffer"    },
+       {       (PFV) t_dns_name_hasbuffer,     "dns_name_hasbuffer"    },
+       {       (PFV) t_dns_name_isabsolute,    "dns_name_isabsolute"   },
+       {       (PFV) t_dns_name_hash,          "dns_name_hash"         },
+       {       (PFV) t_dns_name_fullcompare,   "dns_name_fullcompare"  },
+       {       (PFV) t_dns_name_compare,       "dns_name_compare"      },
+       {       (PFV) t_dns_name_rdatacompare,  "dns_name_rdatacompare" },
+       {       (PFV) t_dns_name_issubdomain,   "dns_name_issubdomain"  },
+       {       (PFV) t_dns_name_countlabels,   "dns_name_countlabels"  },
+       {       (PFV) t_dns_name_getlabel,      "dns_name_getlabel"     },
+       {       (PFV) t_dns_name_getlabelsequence, "dns_name_getlabelsequence" },
+       {       (PFV) t_dns_name_fromregion,    "dns_name_fromregion"   },
+       {       (PFV) t_dns_name_toregion,      "dns_name_toregion"     },
+       {       (PFV) t_dns_name_fromwire,      "dns_name_fromwire"     },
+       {       (PFV) t_dns_name_towire,        "dns_name_towire"       },
+       {       (PFV) t_dns_name_fromtext,      "dns_name_fromtext"     },
+       {       (PFV) t_dns_name_totext,        "dns_name_totext"       },
 #if 0
-       {       t_dns_name_concatenate,         "dns_name_concatenate"  },
+       {       (PFV) t_dns_name_concatenate,   "dns_name_concatenate"  },
 #endif
-       {       NULL,                           NULL                    }
-
+       {       (PFV) 0,                        NULL                    }
 };
 
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/names/win32/t_names.dsp.in b/bin/tests/names/win32/t_names.dsp.in
new file mode 100644 (file)
index 0000000..9aa407c
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_names" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_names - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_names.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_names.mak" CFG="t_names - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_names - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_names - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_names - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_names.exe"
+
+!ELSEIF  "$(CFG)" == "t_names - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_names.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_names - @PLATFORM@ Release"
+# Name "t_names - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_names.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/names/win32/t_names.dsw b/bin/tests/names/win32/t_names.dsw
new file mode 100644 (file)
index 0000000..a0636f3
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_names"=".\t_names.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/names/win32/t_names.mak.in b/bin/tests/names/win32/t_names.mak.in
new file mode 100644 (file)
index 0000000..b50a85d
--- /dev/null
@@ -0,0 +1,375 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_names.dsp
+!IF "$(CFG)" == ""
+CFG=t_names - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_names - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_names - @PLATFORM@ Release" && "$(CFG)" != "t_names - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_names.mak" CFG="t_names - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_names - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_names - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_names - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_names - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_names.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_names.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_names.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_names.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_names.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_names.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_names.pdb" @MACHINE@ /out:"../../../../Build/Release/t_names.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_names.obj" \
+       "..\..\..\..\lib\dns\win32\Release\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_names.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_names - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_names.exe" "$(OUTDIR)\t_names.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_names.exe" "$(OUTDIR)\t_names.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_names.obj"
+       -@erase "$(INTDIR)\t_names.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_names.bsc"
+       -@erase "$(OUTDIR)\t_names.map"
+       -@erase "$(OUTDIR)\t_names.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_names.exe"
+       -@erase "..\..\..\..\Build\Debug\t_names.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_names.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_names.sbr"
+
+"$(OUTDIR)\t_names.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_names.pdb" /map:"$(INTDIR)\t_names.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_names.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_names.obj" \
+       "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_names.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_names.dep")
+!INCLUDE "t_names.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_names.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_names - @PLATFORM@ Release" || "$(CFG)" == "t_names - @PLATFORM@ Debug"
+SOURCE=..\t_names.c
+
+!IF  "$(CFG)" == "t_names - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_names.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_names - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_names.obj"        "$(INTDIR)\t_names.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_names - @PLATFORM@ Release"
+
+"libdns - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\names\win32"
+
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\names\win32"
+
+!ELSEIF  "$(CFG)" == "t_names - @PLATFORM@ Debug"
+
+"libdns - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\names\win32"
+
+"libdns - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\names\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_names - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\names\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\names\win32"
+
+!ELSEIF  "$(CFG)" == "t_names - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\names\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\names\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_names - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\names\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\names\win32"
+
+!ELSEIF  "$(CFG)" == "t_names - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\names\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\names\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/names/win32/t_names.vcxproj.filters.in b/bin/tests/names/win32/t_names.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..89180a2
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_names.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/names/win32/t_names.vcxproj.in b/bin/tests/names/win32/t_names.vcxproj.in
new file mode 100644 (file)
index 0000000..6f66dfd
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{124DC0D3-3096-41D2-B490-CE85E890FF33}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_names</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_names.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/names/win32/t_names.vcxproj.user b/bin/tests/names/win32/t_names.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index afa3803cecf61a3f9ea6aa39497855fa31f26244..86058b81de7932aa7c277403ef900a8f64384903 100644 (file)
@@ -1847,22 +1847,27 @@ t13() {
        t_result(result);
 }
 
-
-
 testspec_t     T_testlist[] = {
-       {       t1,     "dns_rbt_create"                },
-       {       t2,     "dns_rbt_addname 1"             },
-       {       t3,     "dns_rbt_addname 2"             },
-       {       t4,     "dns_rbt_deletename 1"          },
-       {       t5,     "dns_rbt_deletename 2"          },
-       {       t6,     "dns_rbt_findname 1"            },
-       {       t7,     "dns_rbt_findname 2"            },
-       {       t8,     "dns_rbt_findname 3"            },
-       {       t9,     "dns_rbtnodechain_init"         },
-       {       t10,    "dns_rbtnodechain_first"        },
-       {       t11,    "dns_rbtnodechain_last"         },
-       {       t12,    "dns_rbtnodechain_next"         },
-       {       t13,    "dns_rbtnodechain_prev"         },
-       {       NULL,   NULL                            }
+       {       (PFV) t1,       "dns_rbt_create"                },
+       {       (PFV) t2,       "dns_rbt_addname 1"             },
+       {       (PFV) t3,       "dns_rbt_addname 2"             },
+       {       (PFV) t4,       "dns_rbt_deletename 1"          },
+       {       (PFV) t5,       "dns_rbt_deletename 2"          },
+       {       (PFV) t6,       "dns_rbt_findname 1"            },
+       {       (PFV) t7,       "dns_rbt_findname 2"            },
+       {       (PFV) t8,       "dns_rbt_findname 3"            },
+       {       (PFV) t9,       "dns_rbtnodechain_init"         },
+       {       (PFV) t10,      "dns_rbtnodechain_first"        },
+       {       (PFV) t11,      "dns_rbtnodechain_last"         },
+       {       (PFV) t12,      "dns_rbtnodechain_next"         },
+       {       (PFV) t13,      "dns_rbtnodechain_prev"         },
+       {       (PFV) 0,        NULL                            }
 };
 
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/rbt/win32/t_rbt.dsp.in b/bin/tests/rbt/win32/t_rbt.dsp.in
new file mode 100644 (file)
index 0000000..4d25a42
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_rbt" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_rbt - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_rbt.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_rbt.mak" CFG="t_rbt - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_rbt - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_rbt - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_rbt - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_rbt.exe"
+
+!ELSEIF  "$(CFG)" == "t_rbt - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_rbt.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_rbt - @PLATFORM@ Release"
+# Name "t_rbt - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_rbt.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/rbt/win32/t_rbt.dsw b/bin/tests/rbt/win32/t_rbt.dsw
new file mode 100644 (file)
index 0000000..9d658b2
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_rbt"=".\t_rbt.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/rbt/win32/t_rbt.mak.in b/bin/tests/rbt/win32/t_rbt.mak.in
new file mode 100644 (file)
index 0000000..5f61e01
--- /dev/null
@@ -0,0 +1,375 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_rbt.dsp
+!IF "$(CFG)" == ""
+CFG=t_rbt - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_rbt - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_rbt - @PLATFORM@ Release" && "$(CFG)" != "t_rbt - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_rbt.mak" CFG="t_rbt - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_rbt - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_rbt - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_rbt - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_rbt - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_rbt.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_rbt.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_rbt.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_rbt.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_rbt.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_rbt.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_rbt.pdb" @MACHINE@ /out:"../../../../Build/Release/t_rbt.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_rbt.obj" \
+       "..\..\..\..\lib\dns\win32\Release\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_rbt.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_rbt - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_rbt.exe" "$(OUTDIR)\t_rbt.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_rbt.exe" "$(OUTDIR)\t_rbt.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_rbt.obj"
+       -@erase "$(INTDIR)\t_rbt.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_rbt.bsc"
+       -@erase "$(OUTDIR)\t_rbt.map"
+       -@erase "$(OUTDIR)\t_rbt.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_rbt.exe"
+       -@erase "..\..\..\..\Build\Debug\t_rbt.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_rbt.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_rbt.sbr"
+
+"$(OUTDIR)\t_rbt.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_rbt.pdb" /map:"$(INTDIR)\t_rbt.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_rbt.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_rbt.obj" \
+       "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_rbt.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_rbt.dep")
+!INCLUDE "t_rbt.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_rbt.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_rbt - @PLATFORM@ Release" || "$(CFG)" == "t_rbt - @PLATFORM@ Debug"
+SOURCE=..\t_rbt.c
+
+!IF  "$(CFG)" == "t_rbt - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_rbt.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_rbt - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_rbt.obj"  "$(INTDIR)\t_rbt.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_rbt - @PLATFORM@ Release"
+
+"libdns - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+!ELSEIF  "$(CFG)" == "t_rbt - @PLATFORM@ Debug"
+
+"libdns - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+"libdns - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_rbt - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+!ELSEIF  "$(CFG)" == "t_rbt - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_rbt - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+!ELSEIF  "$(CFG)" == "t_rbt - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\rbt\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/rbt/win32/t_rbt.vcxproj.filters.in b/bin/tests/rbt/win32/t_rbt.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..0994397
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_rbt.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/rbt/win32/t_rbt.vcxproj.in b/bin/tests/rbt/win32/t_rbt.vcxproj.in
new file mode 100644 (file)
index 0000000..f76591e
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{39F714D4-FEFB-4E23-91DB-1F6FC80A98B5}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_rbt</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_rbt.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/rbt/win32/t_rbt.vcxproj.user b/bin/tests/rbt/win32/t_rbt.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index c5726f93c6a819919a9a120c6473311a9e4501c1..d2cc1bbc755d29c053e4b330d37aa84267e2f94a 100644 (file)
@@ -223,11 +223,18 @@ test_dns_resolver_settimeout_over_maximum(void) {
 
 
 testspec_t T_testlist[] = {
-       { test_dns_resolver_create,     "dns_resolver_create"           },
-       { test_dns_resolver_settimeout, "dns_resolver_settimeout"       },
-       { test_dns_resolver_gettimeout, "dns_resolver_gettimeout"       },
-       { test_dns_resolver_settimeout_to_default, "test_dns_resolver_settimeout_to_default" },
-       { test_dns_resolver_settimeout_over_maximum, "test_dns_resolver_settimeout_over_maximum" },
-       { NULL, NULL }
+       { (PFV) test_dns_resolver_create,       "dns_resolver_create"           },
+       { (PFV) test_dns_resolver_settimeout,   "dns_resolver_settimeout"       },
+       { (PFV) test_dns_resolver_gettimeout,   "dns_resolver_gettimeout"       },
+       { (PFV) test_dns_resolver_settimeout_to_default, "test_dns_resolver_settimeout_to_default" },
+       { (PFV) test_dns_resolver_settimeout_over_maximum, "test_dns_resolver_settimeout_over_maximum" },
+       { (PFV) 0,      NULL }
 };
 
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/resolver/win32/t_resolver.dsp.in b/bin/tests/resolver/win32/t_resolver.dsp.in
new file mode 100644 (file)
index 0000000..b98c5c0
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_resolver" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_resolver - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_resolver.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_resolver.mak" CFG="t_resolver - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_resolver - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_resolver - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_resolver - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @GEOIP_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_resolver.exe"
+
+!ELSEIF  "$(CFG)" == "t_resolver - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @GEOIP_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_resolver.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_resolver - @PLATFORM@ Release"
+# Name "t_resolver - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_resolver.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/resolver/win32/t_resolver.dsw b/bin/tests/resolver/win32/t_resolver.dsw
new file mode 100644 (file)
index 0000000..e796af0
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_resolver"=".\t_resolver.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/resolver/win32/t_resolver.mak.in b/bin/tests/resolver/win32/t_resolver.mak.in
new file mode 100644 (file)
index 0000000..770951c
--- /dev/null
@@ -0,0 +1,375 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_resolver.dsp
+!IF "$(CFG)" == ""
+CFG=t_resolver - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_resolver - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_resolver - @PLATFORM@ Release" && "$(CFG)" != "t_resolver - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_resolver.mak" CFG="t_resolver - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_resolver - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_resolver - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_resolver - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_resolver - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_resolver.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_resolver.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_resolver.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_resolver.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @GEOIP_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_resolver.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_resolver.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_resolver.pdb" @MACHINE@ /out:"../../../../Build/Release/t_resolver.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_resolver.obj" \
+       "..\..\..\..\lib\dns\win32\Release\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_resolver.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_resolver - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_resolver.exe" "$(OUTDIR)\t_resolver.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_resolver.exe" "$(OUTDIR)\t_resolver.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_resolver.obj"
+       -@erase "$(INTDIR)\t_resolver.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_resolver.bsc"
+       -@erase "$(OUTDIR)\t_resolver.map"
+       -@erase "$(OUTDIR)\t_resolver.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_resolver.exe"
+       -@erase "..\..\..\..\Build\Debug\t_resolver.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @GEOIP_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_resolver.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_resolver.sbr"
+
+"$(OUTDIR)\t_resolver.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_resolver.pdb" /map:"$(INTDIR)\t_resolver.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_resolver.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_resolver.obj" \
+       "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_resolver.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_resolver.dep")
+!INCLUDE "t_resolver.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_resolver.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_resolver - @PLATFORM@ Release" || "$(CFG)" == "t_resolver - @PLATFORM@ Debug"
+SOURCE=..\t_resolver.c
+
+!IF  "$(CFG)" == "t_resolver - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_resolver.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_resolver - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_resolver.obj"     "$(INTDIR)\t_resolver.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_resolver - @PLATFORM@ Release"
+
+"libdns - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+!ELSEIF  "$(CFG)" == "t_resolver - @PLATFORM@ Debug"
+
+"libdns - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+"libdns - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_resolver - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+!ELSEIF  "$(CFG)" == "t_resolver - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_resolver - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+!ELSEIF  "$(CFG)" == "t_resolver - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\resolver\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/resolver/win32/t_resolver.vcxproj.filters.in b/bin/tests/resolver/win32/t_resolver.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..08c5f6c
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_resolver.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/resolver/win32/t_resolver.vcxproj.in b/bin/tests/resolver/win32/t_resolver.vcxproj.in
new file mode 100644 (file)
index 0000000..f759cdd
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{66E58849-A764-44E4-8D32-7C1107246A26}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_resolver</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@@GEOIP_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@@GEOIP_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_resolver.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/resolver/win32/t_resolver.vcxproj.user b/bin/tests/resolver/win32/t_resolver.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 9aa05b59aedcaa3f8ffe4b965677204eba21bc0e..05d279f1bc09d01686520d5789267bdd5dd82f07 100644 (file)
 #include <isc/string.h>
 #include <isc/util.h>
 
+#ifdef WIN32
+#define sleep(x)       Sleep(1000 * x)
+#endif
+
 #ifdef ISC_PLATFORM_USETHREADS
 
 isc_rwlock_t lock;
 
-static void *
+static isc_threadresult_t
+#ifdef WIN32
+WINAPI
+#endif
 run1(void *arg) {
        char *message = arg;
 
@@ -58,10 +65,13 @@ run1(void *arg) {
        printf("%s giving up WRITE lock\n", message);
        RUNTIME_CHECK(isc_rwlock_unlock(&lock, isc_rwlocktype_write) ==
               ISC_R_SUCCESS);
-       return (NULL);
+       return ((isc_threadresult_t)0);
 }
 
-static void *
+static isc_threadresult_t
+#ifdef WIN32
+WINAPI
+#endif
 run2(void *arg) {
        char *message = arg;
 
@@ -86,7 +96,7 @@ run2(void *arg) {
        printf("%s giving up READ lock\n", message);
        RUNTIME_CHECK(isc_rwlock_unlock(&lock, isc_rwlocktype_read) ==
               ISC_R_SUCCESS);
-       return (NULL);
+       return ((isc_threadresult_t)0);
 }
 
 int
index 82a7e77555d5e571cbf8c0359686dc20b8c69956..02406b18acb8cae04bdc133e40a762adbd88f095 100644 (file)
@@ -369,7 +369,11 @@ main(int argc, char *argv[]) {
        /*
         * Wait a short while.
         */
+#ifndef WIN32
        sleep(10);
+#else
+       Sleep(10000);
+#endif
 
        fprintf(stderr, "Destroying socket manager\n");
        isc_socketmgr_destroy(&socketmgr);
index 46003f1f1766eebdbd8889b3135b24413a789416..b1e05a4816bf4984bcb46ad9687e598e7e1102cf 100644 (file)
@@ -130,8 +130,15 @@ t2(void) {
 }
 
 testspec_t     T_testlist[] = {
-       {       t1,     "isc_sockaddr_eqaddrprefix"     },
-       {       t2,     "isc_netaddr_masktoprefixlen"   },
-       {       NULL,   NULL                            }
+       {       (PFV) t1,       "isc_sockaddr_eqaddrprefix"     },
+       {       (PFV) t2,       "isc_netaddr_masktoprefixlen"   },
+       {       (PFV) 0,        NULL                            }
 };
 
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/sockaddr/win32/t_sockaddr.dsp.in b/bin/tests/sockaddr/win32/t_sockaddr.dsp.in
new file mode 100644 (file)
index 0000000..d0f7921
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_sockaddr" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_sockaddr - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_sockaddr.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_sockaddr.mak" CFG="t_sockaddr - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_sockaddr - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_sockaddr - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_sockaddr.exe"
+
+!ELSEIF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_sockaddr.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_sockaddr - @PLATFORM@ Release"
+# Name "t_sockaddr - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_sockaddr.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/sockaddr/win32/t_sockaddr.dsw b/bin/tests/sockaddr/win32/t_sockaddr.dsw
new file mode 100644 (file)
index 0000000..c3f454f
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_sockaddr"=".\t_sockaddr.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/sockaddr/win32/t_sockaddr.mak.in b/bin/tests/sockaddr/win32/t_sockaddr.mak.in
new file mode 100644 (file)
index 0000000..9ffc0ba
--- /dev/null
@@ -0,0 +1,347 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_sockaddr.dsp
+!IF "$(CFG)" == ""
+CFG=t_sockaddr - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_sockaddr - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_sockaddr - @PLATFORM@ Release" && "$(CFG)" != "t_sockaddr - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_sockaddr.mak" CFG="t_sockaddr - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_sockaddr - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_sockaddr - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_sockaddr.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_sockaddr.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_sockaddr.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_sockaddr.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_sockaddr.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_sockaddr.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_sockaddr.pdb" @MACHINE@ /out:"../../../../Build/Release/t_sockaddr.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_sockaddr.obj" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_sockaddr.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_sockaddr.exe" "$(OUTDIR)\t_sockaddr.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_sockaddr.exe" "$(OUTDIR)\t_sockaddr.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_sockaddr.obj"
+       -@erase "$(INTDIR)\t_sockaddr.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_sockaddr.bsc"
+       -@erase "$(OUTDIR)\t_sockaddr.map"
+       -@erase "$(OUTDIR)\t_sockaddr.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_sockaddr.exe"
+       -@erase "..\..\..\..\Build\Debug\t_sockaddr.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_sockaddr.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_sockaddr.sbr"
+
+"$(OUTDIR)\t_sockaddr.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_sockaddr.pdb" /map:"$(INTDIR)\t_sockaddr.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_sockaddr.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_sockaddr.obj" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_sockaddr.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_sockaddr.dep")
+!INCLUDE "t_sockaddr.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_sockaddr.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_sockaddr - @PLATFORM@ Release" || "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug"
+SOURCE=..\t_sockaddr.c
+
+!IF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_sockaddr.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_sockaddr.obj"     "$(INTDIR)\t_sockaddr.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\sockaddr\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\sockaddr\win32"
+
+!ELSEIF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\sockaddr\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\sockaddr\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\sockaddr\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\sockaddr\win32"
+
+!ELSEIF  "$(CFG)" == "t_sockaddr - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\sockaddr\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\sockaddr\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in b/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..593f93e
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_sockaddr.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in b/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in
new file mode 100644 (file)
index 0000000..713afa7
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{351D3872-707B-46AD-8BC0-5A668B8C745B}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_sockaddr</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_sockaddr.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user b/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 4a22ca4850a75f1c2d669c2b6f82f008a50ae040..49ccd9de36918b907c5272f51b125914d9df1280 100644 (file)
@@ -115,7 +115,11 @@ main(int argc, char *argv[]) {
 
        printf("task 1 = %p\n", t1);
        printf("task 2 = %p\n", t2);
+#ifndef WIN32
        sleep(2);
+#else
+       Sleep(2000);
+#endif
 
        /*
         * Note:  (void *)1 is used as a sender here, since some compilers
@@ -180,7 +184,11 @@ main(int argc, char *argv[]) {
        isc_task_detach(&t3);
        isc_task_detach(&t4);
 
+#ifndef WIN32
        sleep(10);
+#else
+       Sleep(10000);
+#endif
        printf("destroy\n");
        isc_timer_detach(&ti1);
        isc_timer_detach(&ti2);
index 3fb5d7516366aae0d862cf3562bb12b355d5a9c7..301d81c90794946aaaa0697cdd74f409757ce669 100644 (file)
@@ -103,8 +103,8 @@ t_tasks1(void) {
        isc_timer_t             *ti1;
        isc_timer_t             *ti2;
        isc_result_t            isc_result;
-       struct isc_time         absolute;
-       struct isc_interval     interval;
+       isc_time_t              absolute;
+       isc_interval_t          interval;
 
        manager = NULL;
        task1 = NULL;
@@ -212,7 +212,11 @@ t_tasks1(void) {
        }
 
 
+#ifndef WIN32
        sleep(2);
+#else
+       Sleep(2000);
+#endif
 
        /*
         * Note:  (void *)1 is used as a sender here, since some compilers
@@ -364,7 +368,11 @@ t_tasks1(void) {
        isc_task_detach(&task3);
        isc_task_detach(&task4);
 
+#ifndef WIN32
        sleep(10);
+#else
+       Sleep(10000);
+#endif
        isc_timer_detach(&ti1);
        isc_timer_detach(&ti2);
        isc_timermgr_destroy(&timgr);
@@ -1212,8 +1220,7 @@ t_tasks7(void) {
 
        isc_task_shutdown(task);
 
-       interval.seconds = 5;
-       interval.nanoseconds = 0;
+       isc_interval_set(&interval, 5, 0);
 
        while (T7_sdflag == 0) {
                isc_result = isc_time_nowplusinterval(&now, &interval);
@@ -1646,8 +1653,7 @@ t_taskpurge_x(int sender, int type, int tag, void *purge_sender,
 
        isc_task_shutdown(task);
 
-       interval.seconds = 5;
-       interval.nanoseconds = 0;
+       isc_interval_set(&interval, 5, 0);
 
        /*
         * Wait for shutdown processing to complete.
@@ -1999,8 +2005,7 @@ t_tasks11(int purgable) {
 
        isc_task_shutdown(task);
 
-       interval.seconds = 5;
-       interval.nanoseconds = 0;
+       isc_interval_set(&interval, 5, 0);
 
        /*
         * Wait for shutdown processing to complete.
@@ -2347,15 +2352,23 @@ t14(void) {
 }
 
 testspec_t     T_testlist[] = {
-       {       t1,     "basic task subsystem"  },
-       {       t2,     "maxtasks"              },
-       {       t3,     "isc_task_shutdown"     },
-       {       t4,     "isc_task_shutdown"     },
-       {       t7,     "isc_task_create"       },
-       {       t10,    "isc_task_purge"        },
-       {       t11,    "isc_task_purgeevent"   },
-       {       t12,    "isc_task_purgeevent"   },
-       {       t13,    "isc_task_purgerange"   },
-       {       t14,    "isc_task_beginexclusive" },
-       {       NULL,   NULL                    }
+       {       (PFV) t1,       "basic task subsystem"  },
+       {       (PFV) t2,       "maxtasks"              },
+       {       (PFV) t3,       "isc_task_shutdown"     },
+       {       (PFV) t4,       "isc_task_shutdown"     },
+       {       (PFV) t7,       "isc_task_create"       },
+       {       (PFV) t10,      "isc_task_purge"        },
+       {       (PFV) t11,      "isc_task_purgeevent"   },
+       {       (PFV) t12,      "isc_task_purgeevent"   },
+       {       (PFV) t13,      "isc_task_purgerange"   },
+       {       (PFV) t14,      "isc_task_beginexclusive" },
+       {       (PFV) 0,        NULL                    }
 };
+
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/tasks/win32/t_tasks.dsp.in b/bin/tests/tasks/win32/t_tasks.dsp.in
new file mode 100644 (file)
index 0000000..9800ac2
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_tasks" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_tasks - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_tasks.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_tasks.mak" CFG="t_tasks - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_tasks - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_tasks - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_tasks - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_tasks.exe"
+
+!ELSEIF  "$(CFG)" == "t_tasks - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_tasks.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_tasks - @PLATFORM@ Release"
+# Name "t_tasks - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_tasks.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/tasks/win32/t_tasks.dsw b/bin/tests/tasks/win32/t_tasks.dsw
new file mode 100644 (file)
index 0000000..af48cf7
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_tasks"=".\t_tasks.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/tasks/win32/t_tasks.mak.in b/bin/tests/tasks/win32/t_tasks.mak.in
new file mode 100644 (file)
index 0000000..2de167e
--- /dev/null
@@ -0,0 +1,347 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_tasks.dsp
+!IF "$(CFG)" == ""
+CFG=t_tasks - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_tasks - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_tasks - @PLATFORM@ Release" && "$(CFG)" != "t_tasks - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_tasks.mak" CFG="t_tasks - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_tasks - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_tasks - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_tasks - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_tasks - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_tasks.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_tasks.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_tasks.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_tasks.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_tasks.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_tasks.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_tasks.pdb" @MACHINE@ /out:"../../../../Build/Release/t_tasks.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_tasks.obj" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_tasks.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_tasks - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_tasks.exe" "$(OUTDIR)\t_tasks.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_tasks.exe" "$(OUTDIR)\t_tasks.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_tasks.obj"
+       -@erase "$(INTDIR)\t_tasks.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_tasks.bsc"
+       -@erase "$(OUTDIR)\t_tasks.map"
+       -@erase "$(OUTDIR)\t_tasks.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_tasks.exe"
+       -@erase "..\..\..\..\Build\Debug\t_tasks.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_tasks.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_tasks.sbr"
+
+"$(OUTDIR)\t_tasks.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_tasks.pdb" /map:"$(INTDIR)\t_tasks.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_tasks.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_tasks.obj" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_tasks.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_tasks.dep")
+!INCLUDE "t_tasks.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_tasks.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_tasks - @PLATFORM@ Release" || "$(CFG)" == "t_tasks - @PLATFORM@ Debug"
+SOURCE=..\t_tasks.c
+
+!IF  "$(CFG)" == "t_tasks - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_tasks.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_tasks - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_tasks.obj"        "$(INTDIR)\t_tasks.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_tasks - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\tasks\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\tasks\win32"
+
+!ELSEIF  "$(CFG)" == "t_tasks - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\tasks\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\tasks\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_tasks - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\tasks\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\tasks\win32"
+
+!ELSEIF  "$(CFG)" == "t_tasks - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\tasks\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\tasks\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/tasks/win32/t_tasks.vcxproj.filters.in b/bin/tests/tasks/win32/t_tasks.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..2f0f947
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_tasks.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/tasks/win32/t_tasks.vcxproj.in b/bin/tests/tasks/win32/t_tasks.vcxproj.in
new file mode 100644 (file)
index 0000000..f15bc18
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{2CB7B128-5954-4FAF-B5EA-501B23BB8054}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_tasks</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_tasks.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/tasks/win32/t_tasks.vcxproj.user b/bin/tests/tasks/win32/t_tasks.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 06205b7db619d80d9dbb8fb1d732637d60523ce2..c0269236bc9800a3a1b82b832af146aa6ce09f8a 100644 (file)
@@ -158,12 +158,20 @@ main(int argc, char *argv[]) {
        isc_task_detach(&t2);
        isc_task_detach(&t3);
 
+#ifndef WIN32
        sleep(15);
+#else
+       Sleep(15000);
+#endif
        printf("destroy\n");
        isc_timer_detach(&ti1);
        isc_timer_detach(&ti2);
        isc_timer_detach(&ti3);
+#ifndef WIN32
        sleep(2);
+#else
+       Sleep(2000);
+#endif
        isc_timermgr_destroy(&timgr);
        isc_taskmgr_destroy(&manager);
        printf("destroyed\n");
index 92815dc87b1eef982f4e7c24143f6a68e2d3b2ee..f2e44666e0681c41fa2214c5b802e295ab27f7ce 100644 (file)
@@ -119,8 +119,7 @@ tx_te(isc_task_t *task, isc_event_t *event) {
 
        isc_result = isc_time_now(&now);
        if (isc_result == ISC_R_SUCCESS) {
-               interval.seconds = Tx_seconds;
-               interval.nanoseconds = Tx_nanoseconds;
+               isc_interval_set(&interval, Tx_seconds, Tx_nanoseconds);
                isc_result = isc_time_add(&Tx_lasttime, &interval, &base);
                if (isc_result != ISC_R_SUCCESS) {
                        t_info("isc_time_add failed %s\n",
@@ -134,8 +133,8 @@ tx_te(isc_task_t *task, isc_event_t *event) {
        }
 
        if (isc_result == ISC_R_SUCCESS) {
-               interval.seconds = Tx_FUDGE_SECONDS;
-               interval.nanoseconds = Tx_FUDGE_NANOSECONDS;
+               isc_interval_set(&interval,
+                                Tx_FUDGE_SECONDS, Tx_FUDGE_NANOSECONDS);
                isc_result = isc_time_add(&base, &interval, &ulim);
                if (isc_result != ISC_R_SUCCESS) {
                        t_info("isc_time_add failed %s\n",
@@ -463,8 +462,7 @@ t3_te(isc_task_t *task, isc_event_t *event) {
        }
 
        if (isc_result == ISC_R_SUCCESS) {
-               interval.seconds = Tx_seconds;
-               interval.nanoseconds = Tx_nanoseconds;
+               isc_interval_set(&interval, Tx_seconds, Tx_nanoseconds);
                isc_result = isc_time_add(&Tx_lasttime, &interval, &base);
                if (isc_result != ISC_R_SUCCESS) {
                        t_info("isc_time_add failed %s\n",
@@ -474,8 +472,8 @@ t3_te(isc_task_t *task, isc_event_t *event) {
        }
 
        if (isc_result == ISC_R_SUCCESS) {
-               interval.seconds = Tx_FUDGE_SECONDS;
-               interval.nanoseconds = Tx_FUDGE_NANOSECONDS;
+               isc_interval_set(&interval,
+                                Tx_FUDGE_SECONDS, Tx_FUDGE_NANOSECONDS);
                isc_result = isc_time_add(&base, &interval, &ulim);
                if (isc_result != ISC_R_SUCCESS) {
                        t_info("isc_time_add failed %s\n",
@@ -599,8 +597,7 @@ t4_te(isc_task_t *task, isc_event_t *event) {
        }
 
        if (isc_result == ISC_R_SUCCESS) {
-               interval.seconds = Tx_seconds;
-               interval.nanoseconds = Tx_nanoseconds;
+               isc_interval_set(&interval, Tx_seconds, Tx_nanoseconds);
                isc_result = isc_time_add(&Tx_lasttime, &interval, &base);
                if (isc_result != ISC_R_SUCCESS) {
                        t_info("isc_time_add failed %s\n",
@@ -610,8 +607,8 @@ t4_te(isc_task_t *task, isc_event_t *event) {
        }
 
        if (isc_result == ISC_R_SUCCESS) {
-               interval.seconds = Tx_FUDGE_SECONDS;
-               interval.nanoseconds = Tx_FUDGE_NANOSECONDS;
+               isc_interval_set(&interval,
+                                Tx_FUDGE_SECONDS, Tx_FUDGE_NANOSECONDS);
                isc_result = isc_time_add(&base, &interval, &ulim);
                if (isc_result != ISC_R_SUCCESS) {
                        t_info("isc_time_add failed %s\n",
@@ -1119,10 +1116,18 @@ t5(void) {
 }
 
 testspec_t     T_testlist[] = {
-       {       t1,             "timer_create"          },
-       {       t2,             "timer_create"          },
-       {       t3,             "timer_create"          },
-       {       t4,             "timer_reset"           },
-       {       t5,             "timer_reset"           },
-       {       NULL,           NULL                    }
+       {       (PFV) t1,               "timer_create"          },
+       {       (PFV) t2,               "timer_create"          },
+       {       (PFV) t3,               "timer_create"          },
+       {       (PFV) t4,               "timer_reset"           },
+       {       (PFV) t5,               "timer_reset"           },
+       {       (PFV) NULL,             NULL                    }
 };
+
+#ifdef WIN32
+int
+main(int argc, char **argv) {
+       t_settests(T_testlist);
+       return (t_main(argc, argv));
+}
+#endif
diff --git a/bin/tests/timers/win32/t_timers.dsp.in b/bin/tests/timers/win32/t_timers.dsp.in
new file mode 100644 (file)
index 0000000..aadadb8
--- /dev/null
@@ -0,0 +1,95 @@
+# Microsoft Developer Studio Project File - Name="t_timers" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=t_timers - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "t_timers.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_timers.mak" CFG="t_timers - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_timers - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_timers - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "t_timers - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_timers.exe"
+
+!ELSEIF  "$(CFG)" == "t_timers - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_timers.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "t_timers - @PLATFORM@ Release"
+# Name "t_timers - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_timers.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/timers/win32/t_timers.dsw b/bin/tests/timers/win32/t_timers.dsw
new file mode 100644 (file)
index 0000000..8f39dd5
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "t_timers"=".\t_timers.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/timers/win32/t_timers.mak.in b/bin/tests/timers/win32/t_timers.mak.in
new file mode 100644 (file)
index 0000000..b804e0d
--- /dev/null
@@ -0,0 +1,347 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on t_timers.dsp
+!IF "$(CFG)" == ""
+CFG=t_timers - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to t_timers - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "t_timers - @PLATFORM@ Release" && "$(CFG)" != "t_timers - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "t_timers.mak" CFG="t_timers - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "t_timers - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "t_timers - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+RSC=rc.exe
+LIBXML=@LIBXML2_LIB@
+
+!IF  "$(CFG)" == "t_timers - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "t_timers - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Release\t_timers.exe"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_timers.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_timers.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\..\Build\Release\t_timers.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_timers.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_timers.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_timers.pdb" @MACHINE@ /out:"../../../../Build/Release/t_timers.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\t_timers.obj" \
+       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
+
+"..\..\..\..\Build\Release\t_timers.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "t_timers - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\..\Build\Debug\t_timers.exe" "$(OUTDIR)\t_timers.bsc"
+
+!ELSE 
+
+ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_timers.exe" "$(OUTDIR)\t_timers.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_timers.obj"
+       -@erase "$(INTDIR)\t_timers.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\t_timers.bsc"
+       -@erase "$(OUTDIR)\t_timers.map"
+       -@erase "$(OUTDIR)\t_timers.pdb"
+       -@erase "..\..\..\..\Build\Debug\t_timers.exe"
+       -@erase "..\..\..\..\Build\Debug\t_timers.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_timers.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_timers.sbr"
+
+"$(OUTDIR)\t_timers.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_timers.pdb" /map:"$(INTDIR)\t_timers.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_timers.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\t_timers.obj" \
+       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
+       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
+
+"..\..\..\..\Build\Debug\t_timers.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("t_timers.dep")
+!INCLUDE "t_timers.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "t_timers.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "t_timers - @PLATFORM@ Release" || "$(CFG)" == "t_timers - @PLATFORM@ Debug"
+SOURCE=..\t_timers.c
+
+!IF  "$(CFG)" == "t_timers - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_timers.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "t_timers - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_timers.obj"       "$(INTDIR)\t_timers.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_timers - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\timers\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\timers\win32"
+
+!ELSEIF  "$(CFG)" == "t_timers - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\timers\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\timers\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "t_timers - @PLATFORM@ Release"
+
+"libtests - @PLATFORM@ Release" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
+   cd "..\..\..\bin\tests\timers\win32"
+
+"libtests - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\timers\win32"
+
+!ELSEIF  "$(CFG)" == "t_timers - @PLATFORM@ Debug"
+
+"libtests - @PLATFORM@ Debug" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
+   cd "..\..\..\bin\tests\timers\win32"
+
+"libtests - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\..\..\lib\tests\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\..\bin\tests\timers\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/timers/win32/t_timers.vcxproj.filters.in b/bin/tests/timers/win32/t_timers.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..f91b151
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_timers.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/timers/win32/t_timers.vcxproj.in b/bin/tests/timers/win32/t_timers.vcxproj.in
new file mode 100644 (file)
index 0000000..a53a1b3
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{207225E0-9CBF-41a8-9422-0C9B1A2F64E9}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>t_timers</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_timers.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>\r
diff --git a/bin/tests/timers/win32/t_timers.vcxproj.user b/bin/tests/timers/win32/t_timers.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/backtrace_test.dsp.in b/bin/tests/win32/backtrace_test.dsp.in
new file mode 100644 (file)
index 0000000..732cba5
--- /dev/null
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="backtrace_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=backtrace_test - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "backtrace_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "backtrace_test.mak" CFG="backtrace_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "backtrace_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "backtrace_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "backtrace_test - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/backtrace_test.exe"
+
+!ELSEIF  "$(CFG)" == "backtrace_test - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/backtrace_test.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "backtrace_test - @PLATFORM@ Release"
+# Name "backtrace_test - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\backtrace_test.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
similarity index 87%
rename from bin/check/win32/namedcheckzone.dsw
rename to bin/tests/win32/backtrace_test.dsw
index 68cb1ac1304ff67416e84b1239eba9d309eede6b..e97246aefadd767a413ef387d50a496f28d310c1 100644 (file)
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "namedcheckzone"=".\namedcheckzone.dsp" - Package Owner=<4>
+Project: "backtrace_test"=".\backtrace_test.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/bin/tests/win32/backtrace_test.mak.in b/bin/tests/win32/backtrace_test.mak.in
new file mode 100644 (file)
index 0000000..23348eb
--- /dev/null
@@ -0,0 +1,299 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on backtrace_test.dsp
+!IF "$(CFG)" == ""
+CFG=backtrace_test - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to backtrace_test - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "backtrace_test - @PLATFORM@ Release" && "$(CFG)" != "backtrace_test - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "backtrace_test.mak" CFG="backtrace_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "backtrace_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "backtrace_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "backtrace_test - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "backtrace_test - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\backtrace_test.exe"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\backtrace_test.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\Build\Release\backtrace_test.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\backtrace_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\backtrace_test.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\backtrace_test.pdb" @MACHINE@ /out:"../../../Build/Release/backtrace_test.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\backtrace_test.obj"
+
+"..\..\..\Build\Release\backtrace_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "backtrace_test - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\backtrace_test.exe" "$(OUTDIR)\backtrace_test.bsc"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\backtrace_test.obj"
+       -@erase "$(INTDIR)\backtrace_test.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\backtrace_test.pdb"
+       -@erase "$(OUTDIR)\backtrace_test.bsc"
+       -@erase "..\..\..\Build\Debug\backtrace_test.exe"
+       -@erase "..\..\..\Build\Debug\backtrace_test.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\backtrace_test.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\backtrace_test.sbr"
+
+"$(OUTDIR)\backtrace_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\backtrace_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/backtrace_test.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\backtrace_test.obj"
+
+"..\..\..\Build\Debug\backtrace_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("backtrace_test.dep")
+!INCLUDE "backtrace_test.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "backtrace_test.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "backtrace_test - @PLATFORM@ Release" || "$(CFG)" == "backtrace_test - @PLATFORM@ Debug"
+SOURCE="..\backtrace_test.c"
+
+!IF  "$(CFG)" == "backtrace_test - @PLATFORM@ Release"
+
+
+"$(INTDIR)\backtrace_test.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "backtrace_test - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\backtrace_test.obj" "$(INTDIR)\backtrace_test.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/win32/backtrace_test.vcxproj.filters.in b/bin/tests/win32/backtrace_test.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..0a66403
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\backtrace_test.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/backtrace_test.vcxproj.in b/bin/tests/win32/backtrace_test.vcxproj.in
new file mode 100644 (file)
index 0000000..73acebf
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{14751171-C40E-40EE-A2F0-37FFC3CCD4A2}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>backtrace_test</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\backtrace_test.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/backtrace_test.vcxproj.user b/bin/tests/win32/backtrace_test.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/inter_test.dsp.in b/bin/tests/win32/inter_test.dsp.in
new file mode 100644 (file)
index 0000000..afdb63e
--- /dev/null
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="inter_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=inter_test - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "inter_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "inter_test.mak" CFG="inter_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "inter_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "inter_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "inter_test - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/inter_test.exe"
+
+!ELSEIF  "$(CFG)" == "inter_test - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/inter_test.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "inter_test - @PLATFORM@ Release"
+# Name "inter_test - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\inter_test.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/win32/inter_test.dsw b/bin/tests/win32/inter_test.dsw
new file mode 100644 (file)
index 0000000..a67da2e
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "inter_test"=".\inter_test.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/win32/inter_test.mak.in b/bin/tests/win32/inter_test.mak.in
new file mode 100644 (file)
index 0000000..b13e31b
--- /dev/null
@@ -0,0 +1,299 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on inter_test.dsp
+!IF "$(CFG)" == ""
+CFG=inter_test - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to inter_test - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "inter_test - @PLATFORM@ Release" && "$(CFG)" != "inter_test - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "inter_test.mak" CFG="inter_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "inter_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "inter_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "inter_test - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "inter_test - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\inter_test.exe"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\inter_test.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\Build\Release\inter_test.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\inter_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\inter_test.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\inter_test.pdb" @MACHINE@ /out:"../../../Build/Release/inter_test.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\inter_test.obj"
+
+"..\..\..\Build\Release\inter_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "inter_test - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\inter_test.exe" "$(OUTDIR)\inter_test.bsc"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\inter_test.obj"
+       -@erase "$(INTDIR)\inter_test.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\inter_test.pdb"
+       -@erase "$(OUTDIR)\inter_test.bsc"
+       -@erase "..\..\..\Build\Debug\inter_test.exe"
+       -@erase "..\..\..\Build\Debug\inter_test.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\inter_test.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\inter_test.sbr"
+
+"$(OUTDIR)\inter_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\inter_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/inter_test.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\inter_test.obj"
+
+"..\..\..\Build\Debug\inter_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("inter_test.dep")
+!INCLUDE "inter_test.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "inter_test.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "inter_test - @PLATFORM@ Release" || "$(CFG)" == "inter_test - @PLATFORM@ Debug"
+SOURCE="..\inter_test.c"
+
+!IF  "$(CFG)" == "inter_test - @PLATFORM@ Release"
+
+
+"$(INTDIR)\inter_test.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "inter_test - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\inter_test.obj"     "$(INTDIR)\inter_test.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/win32/inter_test.vcxproj.filters.in b/bin/tests/win32/inter_test.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..3098a41
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\inter_test.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/inter_test.vcxproj.in b/bin/tests/win32/inter_test.vcxproj.in
new file mode 100644 (file)
index 0000000..76c5a94
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>inter_test</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\inter_test.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/inter_test.vcxproj.user b/bin/tests/win32/inter_test.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/rwlock_test.dsp.in b/bin/tests/win32/rwlock_test.dsp.in
new file mode 100644 (file)
index 0000000..e852c6f
--- /dev/null
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="rwlock_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=rwlock_test - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "rwlock_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "rwlock_test.mak" CFG="rwlock_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "rwlock_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "rwlock_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "rwlock_test - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/rwlock_test.exe"
+
+!ELSEIF  "$(CFG)" == "rwlock_test - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/rwlock_test.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "rwlock_test - @PLATFORM@ Release"
+# Name "rwlock_test - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\rwlock_test.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/win32/rwlock_test.dsw b/bin/tests/win32/rwlock_test.dsw
new file mode 100644 (file)
index 0000000..6c200a2
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "rwlock_test"=".\rwlock_test.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/win32/rwlock_test.mak.in b/bin/tests/win32/rwlock_test.mak.in
new file mode 100644 (file)
index 0000000..bed1f31
--- /dev/null
@@ -0,0 +1,299 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on rwlock_test.dsp
+!IF "$(CFG)" == ""
+CFG=rwlock_test - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to rwlock_test - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "rwlock_test - @PLATFORM@ Release" && "$(CFG)" != "rwlock_test - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "rwlock_test.mak" CFG="rwlock_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "rwlock_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "rwlock_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "rwlock_test - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "rwlock_test - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\rwlock_test.exe"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\rwlock_test.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\Build\Release\rwlock_test.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\rwlock_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\rwlock_test.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rwlock_test.pdb" @MACHINE@ /out:"../../../Build/Release/rwlock_test.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\rwlock_test.obj"
+
+"..\..\..\Build\Release\rwlock_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "rwlock_test - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\rwlock_test.exe" "$(OUTDIR)\rwlock_test.bsc"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\rwlock_test.obj"
+       -@erase "$(INTDIR)\rwlock_test.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\rwlock_test.pdb"
+       -@erase "$(OUTDIR)\rwlock_test.bsc"
+       -@erase "..\..\..\Build\Debug\rwlock_test.exe"
+       -@erase "..\..\..\Build\Debug\rwlock_test.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\rwlock_test.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\rwlock_test.sbr"
+
+"$(OUTDIR)\rwlock_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rwlock_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/rwlock_test.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\rwlock_test.obj"
+
+"..\..\..\Build\Debug\rwlock_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("rwlock_test.dep")
+!INCLUDE "rwlock_test.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "rwlock_test.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "rwlock_test - @PLATFORM@ Release" || "$(CFG)" == "rwlock_test - @PLATFORM@ Debug"
+SOURCE="..\rwlock_test.c"
+
+!IF  "$(CFG)" == "rwlock_test - @PLATFORM@ Release"
+
+
+"$(INTDIR)\rwlock_test.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "rwlock_test - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\rwlock_test.obj"    "$(INTDIR)\rwlock_test.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/win32/rwlock_test.vcxproj.filters.in b/bin/tests/win32/rwlock_test.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..792a4ac
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\rwlock_test.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/rwlock_test.vcxproj.in b/bin/tests/win32/rwlock_test.vcxproj.in
new file mode 100644 (file)
index 0000000..2f05cf5
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{7705EEF6-6980-48F9-A045-699DAFE860C9}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>rwlock_test</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\rwlock_test.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/rwlock_test.vcxproj.user b/bin/tests/win32/rwlock_test.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/shutdown_test.dsp.in b/bin/tests/win32/shutdown_test.dsp.in
new file mode 100644 (file)
index 0000000..c304d24
--- /dev/null
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="shutdown_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=shutdown_test - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "shutdown_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "shutdown_test.mak" CFG="shutdown_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "shutdown_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "shutdown_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "shutdown_test - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/shutdown_test.exe"
+
+!ELSEIF  "$(CFG)" == "shutdown_test - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/shutdown_test.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "shutdown_test - @PLATFORM@ Release"
+# Name "shutdown_test - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\shutdown_test.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/win32/shutdown_test.dsw b/bin/tests/win32/shutdown_test.dsw
new file mode 100644 (file)
index 0000000..6dedad4
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "shutdown_test"=".\shutdown_test.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/win32/shutdown_test.mak.in b/bin/tests/win32/shutdown_test.mak.in
new file mode 100644 (file)
index 0000000..c5d9efc
--- /dev/null
@@ -0,0 +1,299 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on shutdown_test.dsp
+!IF "$(CFG)" == ""
+CFG=shutdown_test - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to shutdown_test - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "shutdown_test - @PLATFORM@ Release" && "$(CFG)" != "shutdown_test - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "shutdown_test.mak" CFG="shutdown_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "shutdown_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "shutdown_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "shutdown_test - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "shutdown_test - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\shutdown_test.exe"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\shutdown_test.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\Build\Release\shutdown_test.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\shutdown_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\shutdown_test.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\shutdown_test.pdb" @MACHINE@ /out:"../../../Build/Release/shutdown_test.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\shutdown_test.obj"
+
+"..\..\..\Build\Release\shutdown_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "shutdown_test - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\shutdown_test.exe" "$(OUTDIR)\shutdown_test.bsc"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\shutdown_test.obj"
+       -@erase "$(INTDIR)\shutdown_test.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\shutdown_test.pdb"
+       -@erase "$(OUTDIR)\shutdown_test.bsc"
+       -@erase "..\..\..\Build\Debug\shutdown_test.exe"
+       -@erase "..\..\..\Build\Debug\shutdown_test.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\shutdown_test.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\shutdown_test.sbr"
+
+"$(OUTDIR)\shutdown_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\shutdown_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/shutdown_test.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\shutdown_test.obj"
+
+"..\..\..\Build\Debug\shutdown_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("shutdown_test.dep")
+!INCLUDE "shutdown_test.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "shutdown_test.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "shutdown_test - @PLATFORM@ Release" || "$(CFG)" == "shutdown_test - @PLATFORM@ Debug"
+SOURCE="..\shutdown_test.c"
+
+!IF  "$(CFG)" == "shutdown_test - @PLATFORM@ Release"
+
+
+"$(INTDIR)\shutdown_test.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "shutdown_test - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\shutdown_test.obj"  "$(INTDIR)\shutdown_test.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/win32/shutdown_test.vcxproj.filters.in b/bin/tests/win32/shutdown_test.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..dcfe16a
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\shutdown_test.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/shutdown_test.vcxproj.in b/bin/tests/win32/shutdown_test.vcxproj.in
new file mode 100644 (file)
index 0000000..c3ae656
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{551561F6-4A2A-4824-8A34-A4AF0EB7C179}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>shutdown_test</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\shutdown_test.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/shutdown_test.vcxproj.user b/bin/tests/win32/shutdown_test.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/sock_test.dsp.in b/bin/tests/win32/sock_test.dsp.in
new file mode 100644 (file)
index 0000000..713aff0
--- /dev/null
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="sock_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=sock_test - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "sock_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sock_test.mak" CFG="sock_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sock_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "sock_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sock_test - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/sock_test.exe"
+
+!ELSEIF  "$(CFG)" == "sock_test - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/sock_test.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sock_test - @PLATFORM@ Release"
+# Name "sock_test - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\sock_test.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/win32/sock_test.dsw b/bin/tests/win32/sock_test.dsw
new file mode 100644 (file)
index 0000000..5241c6e
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "sock_test"=".\sock_test.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/win32/sock_test.mak.in b/bin/tests/win32/sock_test.mak.in
new file mode 100644 (file)
index 0000000..d92c0e8
--- /dev/null
@@ -0,0 +1,299 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on sock_test.dsp
+!IF "$(CFG)" == ""
+CFG=sock_test - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to sock_test - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "sock_test - @PLATFORM@ Release" && "$(CFG)" != "sock_test - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sock_test.mak" CFG="sock_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sock_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "sock_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "sock_test - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "sock_test - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\sock_test.exe"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\sock_test.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\Build\Release\sock_test.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\sock_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sock_test.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sock_test.pdb" @MACHINE@ /out:"../../../Build/Release/sock_test.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\sock_test.obj"
+
+"..\..\..\Build\Release\sock_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "sock_test - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\sock_test.exe" "$(OUTDIR)\sock_test.bsc"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\sock_test.obj"
+       -@erase "$(INTDIR)\sock_test.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\sock_test.pdb"
+       -@erase "$(OUTDIR)\sock_test.bsc"
+       -@erase "..\..\..\Build\Debug\sock_test.exe"
+       -@erase "..\..\..\Build\Debug\sock_test.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sock_test.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\sock_test.sbr"
+
+"$(OUTDIR)\sock_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\sock_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/sock_test.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\sock_test.obj"
+
+"..\..\..\Build\Debug\sock_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("sock_test.dep")
+!INCLUDE "sock_test.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "sock_test.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "sock_test - @PLATFORM@ Release" || "$(CFG)" == "sock_test - @PLATFORM@ Debug"
+SOURCE="..\sock_test.c"
+
+!IF  "$(CFG)" == "sock_test - @PLATFORM@ Release"
+
+
+"$(INTDIR)\sock_test.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "sock_test - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\sock_test.obj"      "$(INTDIR)\sock_test.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/win32/sock_test.vcxproj.filters.in b/bin/tests/win32/sock_test.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..1b9d82b
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\sock_test.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/sock_test.vcxproj.in b/bin/tests/win32/sock_test.vcxproj.in
new file mode 100644 (file)
index 0000000..93c2646
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{6200ED9D-CAB1-4C00-8D79-478F64A19B8F}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>sock_test</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\sock_test.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/sock_test.vcxproj.user b/bin/tests/win32/sock_test.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/task_test.dsp.in b/bin/tests/win32/task_test.dsp.in
new file mode 100644 (file)
index 0000000..9e5f9f8
--- /dev/null
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="task_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=task_test - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "task_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "task_test.mak" CFG="task_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "task_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "task_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "task_test - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/task_test.exe"
+
+!ELSEIF  "$(CFG)" == "task_test - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/task_test.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "task_test - @PLATFORM@ Release"
+# Name "task_test - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\task_test.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/win32/task_test.dsw b/bin/tests/win32/task_test.dsw
new file mode 100644 (file)
index 0000000..af453dc
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "task_test"=".\task_test.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/win32/task_test.mak.in b/bin/tests/win32/task_test.mak.in
new file mode 100644 (file)
index 0000000..3ac4bb5
--- /dev/null
@@ -0,0 +1,299 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on task_test.dsp
+!IF "$(CFG)" == ""
+CFG=task_test - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to task_test - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "task_test - @PLATFORM@ Release" && "$(CFG)" != "task_test - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "task_test.mak" CFG="task_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "task_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "task_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "task_test - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "task_test - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\task_test.exe"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\task_test.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\Build\Release\task_test.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\task_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\task_test.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\task_test.pdb" @MACHINE@ /out:"../../../Build/Release/task_test.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\task_test.obj"
+
+"..\..\..\Build\Release\task_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "task_test - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\task_test.exe" "$(OUTDIR)\task_test.bsc"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\task_test.obj"
+       -@erase "$(INTDIR)\task_test.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\task_test.pdb"
+       -@erase "$(OUTDIR)\task_test.bsc"
+       -@erase "..\..\..\Build\Debug\task_test.exe"
+       -@erase "..\..\..\Build\Debug\task_test.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\task_test.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\task_test.sbr"
+
+"$(OUTDIR)\task_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\task_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/task_test.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\task_test.obj"
+
+"..\..\..\Build\Debug\task_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("task_test.dep")
+!INCLUDE "task_test.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "task_test.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "task_test - @PLATFORM@ Release" || "$(CFG)" == "task_test - @PLATFORM@ Debug"
+SOURCE="..\task_test.c"
+
+!IF  "$(CFG)" == "task_test - @PLATFORM@ Release"
+
+
+"$(INTDIR)\task_test.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "task_test - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\task_test.obj"      "$(INTDIR)\task_test.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/win32/task_test.vcxproj.filters.in b/bin/tests/win32/task_test.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..5faf0f9
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\task_test.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/task_test.vcxproj.in b/bin/tests/win32/task_test.vcxproj.in
new file mode 100644 (file)
index 0000000..28bf7b4
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{CC7340C1-CBAF-4145-969A-73AE960401D6}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>task_test</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\task_test.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/task_test.vcxproj.user b/bin/tests/win32/task_test.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/timer_test.dsp.in b/bin/tests/win32/timer_test.dsp.in
new file mode 100644 (file)
index 0000000..8614893
--- /dev/null
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="timer_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
+
+CFG=timer_test - @PLATFORM@ Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "timer_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "timer_test.mak" CFG="timer_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "timer_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "timer_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "timer_test - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/timer_test.exe"
+
+!ELSEIF  "$(CFG)" == "timer_test - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/timer_test.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "timer_test - @PLATFORM@ Release"
+# Name "timer_test - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\timer_test.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/bin/tests/win32/timer_test.dsw b/bin/tests/win32/timer_test.dsw
new file mode 100644 (file)
index 0000000..8db7e2a
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "timer_test"=".\timer_test.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/bin/tests/win32/timer_test.mak.in b/bin/tests/win32/timer_test.mak.in
new file mode 100644 (file)
index 0000000..c11438b
--- /dev/null
@@ -0,0 +1,299 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on timer_test.dsp
+!IF "$(CFG)" == ""
+CFG=timer_test - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to timer_test - @PLATFORM@ Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "timer_test - @PLATFORM@ Release" && "$(CFG)" != "timer_test - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "timer_test.mak" CFG="timer_test - @PLATFORM@ Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "timer_test - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "timer_test - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "timer_test - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "timer_test - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\timer_test.exe"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\timer_test.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\Build\Release\timer_test.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\timer_test.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\timer_test.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\timer_test.pdb" @MACHINE@ /out:"../../../Build/Release/timer_test.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\timer_test.obj"
+
+"..\..\..\Build\Release\timer_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "timer_test - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\timer_test.exe" "$(OUTDIR)\timer_test.bsc"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\timer_test.obj"
+       -@erase "$(INTDIR)\timer_test.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\timer_test.pdb"
+       -@erase "$(OUTDIR)\timer_test.bsc"
+       -@erase "..\..\..\Build\Debug\timer_test.exe"
+       -@erase "..\..\..\Build\Debug\timer_test.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\timer_test.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\timer_test.sbr"
+
+"$(OUTDIR)\timer_test.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\timer_test.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/timer_test.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\timer_test.obj"
+
+"..\..\..\Build\Debug\timer_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("timer_test.dep")
+!INCLUDE "timer_test.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "timer_test.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "timer_test - @PLATFORM@ Release" || "$(CFG)" == "timer_test - @PLATFORM@ Debug"
+SOURCE="..\timer_test.c"
+
+!IF  "$(CFG)" == "timer_test - @PLATFORM@ Release"
+
+
+"$(INTDIR)\timer_test.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "timer_test - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\timer_test.obj"     "$(INTDIR)\timer_test.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/bin/tests/win32/timer_test.vcxproj.filters.in b/bin/tests/win32/timer_test.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..e69d475
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\timer_test.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/timer_test.vcxproj.in b/bin/tests/win32/timer_test.vcxproj.in
new file mode 100644 (file)
index 0000000..b22fec4
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{E55653C8-5501-4871-A97C-C926631F40F9}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>timer_test</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\timer_test.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tests/win32/timer_test.vcxproj.user b/bin/tests/win32/timer_test.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 63%
rename from bin/tools/win32/arpaname.dsp
rename to bin/tools/win32/arpaname.dsp.in
index 2a7fb82079aca9adf152862746e0397eda3c9f7f..1871a32fb78a8491398ab5bbd60f5632171fc173 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=arpaname - Win32 Debug
+CFG=arpaname - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=arpaname - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "arpaname.mak" CFG="arpaname - Win32 Debug"
+!MESSAGE NMAKE /f "arpaname.mak" CFG="arpaname - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "arpaname - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "arpaname - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "arpaname - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "arpaname - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=arpaname - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "arpaname - Win32 Release"
+!IF  "$(CFG)" == "arpaname - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/arpaname.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/arpaname.exe"
 
-!ELSEIF  "$(CFG)" == "arpaname - Win32 Debug"
+!ELSEIF  "$(CFG)" == "arpaname - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/arpaname.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/arpaname.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "arpaname - Win32 Release"
-# Name "arpaname - Win32 Debug"
+# Name "arpaname - @PLATFORM@ Release"
+# Name "arpaname - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 78%
rename from bin/tools/win32/arpaname.mak
rename to bin/tools/win32/arpaname.mak.in
index c156b4aa8dd9adb225af64e9a9476513d86a733f..7de36d80578996f86ea066086a94eb8e1dedc8c9 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on arpaname.dsp
 !IF "$(CFG)" == ""
-CFG=arpaname - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to arpaname - Win32 Debug.
+CFG=arpaname - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to arpaname - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "arpaname - Win32 Release" && "$(CFG)" != "arpaname - Win32 Debug"
+!IF "$(CFG)" != "arpaname - @PLATFORM@ Release" && "$(CFG)" != "arpaname - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "arpaname.mak" CFG="arpaname - Win32 Debug"
+!MESSAGE NMAKE /f "arpaname.mak" CFG="arpaname - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "arpaname - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "arpaname - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "arpaname - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "arpaname - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "arpaname - Win32 Release"
+!IF  "$(CFG)" == "arpaname - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "arpaname - Win32 Release"
+!IF  "$(CFG)" == "arpaname - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\arpaname.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\arpaname.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\arpaname.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\arpaname.pdb" /machine:I386 /out:"../../../Build/Release/arpaname.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\arpaname.pdb" @MACHINE@ /out:"../../../Build/Release/arpaname.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\arpaname.obj"
 
@@ -166,7 +166,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "arpaname - Win32 Debug"
+!ELSEIF  "$(CFG)" == "arpaname - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -192,7 +192,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -236,7 +236,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\arpaname.pdb" /debug /machine:I386 /out:"../../../Build/Debug/arpaname.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\arpaname.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/arpaname.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\arpaname.obj"
 
@@ -258,17 +258,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "arpaname - Win32 Release" || "$(CFG)" == "arpaname - Win32 Debug"
+!IF "$(CFG)" == "arpaname - @PLATFORM@ Release" || "$(CFG)" == "arpaname - @PLATFORM@ Debug"
 SOURCE="..\arpaname.c"
 
-!IF  "$(CFG)" == "arpaname - Win32 Release"
+!IF  "$(CFG)" == "arpaname - @PLATFORM@ Release"
 
 
 "$(INTDIR)\arpaname.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "arpaname - Win32 Debug"
+!ELSEIF  "$(CFG)" == "arpaname - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\arpaname.obj"       "$(INTDIR)\arpaname.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/tools/win32/arpaname.vcxproj.filters.in b/bin/tools/win32/arpaname.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..5f68b2b
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\arpaname.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/arpaname.vcxproj.in b/bin/tools/win32/arpaname.vcxproj.in
new file mode 100644 (file)
index 0000000..9efd952
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{91E60FDA-E48C-4DA0-92A2-97F963348E00}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>arpaname</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\arpaname.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/arpaname.vcxproj.user b/bin/tools/win32/arpaname.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 63%
rename from bin/tools/win32/genrandom.dsp
rename to bin/tools/win32/genrandom.dsp.in
index e7ae13fb42e4f36120ecbc156f5572041ed00eab..6358eb3ddc3b220731d3036876b991d7ddfec920 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=genrandom - Win32 Debug
+CFG=genrandom - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=genrandom - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "genrandom.mak" CFG="genrandom - Win32 Debug"
+!MESSAGE NMAKE /f "genrandom.mak" CFG="genrandom - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "genrandom - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "genrandom - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "genrandom - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "genrandom - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=genrandom - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "genrandom - Win32 Release"
+!IF  "$(CFG)" == "genrandom - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/genrandom.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/genrandom.exe"
 
-!ELSEIF  "$(CFG)" == "genrandom - Win32 Debug"
+!ELSEIF  "$(CFG)" == "genrandom - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/genrandom.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/genrandom.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "genrandom - Win32 Release"
-# Name "genrandom - Win32 Debug"
+# Name "genrandom - @PLATFORM@ Release"
+# Name "genrandom - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 78%
rename from bin/tools/win32/genrandom.mak
rename to bin/tools/win32/genrandom.mak.in
index 92e338e7106a6f498f4be73d929100eb49414b7b..a5d951a053af31746e2868c4df156926d6843e7f 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on genrandom.dsp
 !IF "$(CFG)" == ""
-CFG=genrandom - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to genrandom - Win32 Debug.
+CFG=genrandom - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to genrandom - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "genrandom - Win32 Release" && "$(CFG)" != "genrandom - Win32 Debug"
+!IF "$(CFG)" != "genrandom - @PLATFORM@ Release" && "$(CFG)" != "genrandom - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "genrandom.mak" CFG="genrandom - Win32 Debug"
+!MESSAGE NMAKE /f "genrandom.mak" CFG="genrandom - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "genrandom - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "genrandom - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "genrandom - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "genrandom - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "genrandom - Win32 Release"
+!IF  "$(CFG)" == "genrandom - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "genrandom - Win32 Release"
+!IF  "$(CFG)" == "genrandom - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\genrandom.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\genrandom.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\genrandom.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\genrandom.pdb" /machine:I386 /out:"../../../Build/Release/genrandom.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\genrandom.pdb" @MACHINE@ /out:"../../../Build/Release/genrandom.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\genrandom.obj" \
 
@@ -166,7 +166,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "genrandom - Win32 Debug"
+!ELSEIF  "$(CFG)" == "genrandom - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -192,7 +192,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -236,7 +236,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\genrandom.pdb" /debug /machine:I386 /out:"../../../Build/Debug/genrandom.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\genrandom.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/genrandom.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\genrandom.obj"
 
@@ -258,17 +258,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "genrandom - Win32 Release" || "$(CFG)" == "genrandom - Win32 Debug"
+!IF "$(CFG)" == "genrandom - @PLATFORM@ Release" || "$(CFG)" == "genrandom - @PLATFORM@ Debug"
 SOURCE="..\genrandom.c"
 
-!IF  "$(CFG)" == "genrandom - Win32 Release"
+!IF  "$(CFG)" == "genrandom - @PLATFORM@ Release"
 
 
 "$(INTDIR)\genrandom.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "genrandom - Win32 Debug"
+!ELSEIF  "$(CFG)" == "genrandom - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\genrandom.obj"      "$(INTDIR)\genrandom.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/tools/win32/genrandom.vcxproj.filters.in b/bin/tools/win32/genrandom.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..1281ca4
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\genrandom.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/genrandom.vcxproj.in b/bin/tools/win32/genrandom.vcxproj.in
new file mode 100644 (file)
index 0000000..6315551
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>genrandom</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\genrandom.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/genrandom.vcxproj.user b/bin/tools/win32/genrandom.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 63%
rename from bin/tools/win32/ischmacfixup.dsp
rename to bin/tools/win32/ischmacfixup.dsp.in
index b4ff3f550d8f80645c1faaad6515575059dd28cb..326226b688611466c6667ed37d0e99c350ac8ddc 100755 (executable)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=ischmacfixup - Win32 Debug
+CFG=ischmacfixup - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=ischmacfixup - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "ischmacfixup.mak" CFG="ischmacfixup - Win32 Debug"
+!MESSAGE NMAKE /f "ischmacfixup.mak" CFG="ischmacfixup - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ischmacfixup - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ischmacfixup - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "ischmacfixup - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "ischmacfixup - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=ischmacfixup - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "ischmacfixup - Win32 Release"
+!IF  "$(CFG)" == "ischmacfixup - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/isc-hmac-fixup.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/isc-hmac-fixup.exe"
 
-!ELSEIF  "$(CFG)" == "ischmacfixup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ischmacfixup - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/isc-hmac-fixup.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/isc-hmac-fixup.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "ischmacfixup - Win32 Release"
-# Name "ischmacfixup - Win32 Debug"
+# Name "ischmacfixup - @PLATFORM@ Release"
+# Name "ischmacfixup - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 79%
rename from bin/tools/win32/ischmacfixup.mak
rename to bin/tools/win32/ischmacfixup.mak.in
index df494952ead1a3457e7b814e2259b7a7bc1b519e..bb993b71aad0774b7c0d7fd752d6b59307749b1c 100755 (executable)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on ischmacfixup.dsp
 !IF "$(CFG)" == ""
-CFG=ischmacfixup - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to ischmacfixup - Win32 Debug.
+CFG=ischmacfixup - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to ischmacfixup - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "ischmacfixup - Win32 Release" && "$(CFG)" != "ischmacfixup - Win32 Debug"
+!IF "$(CFG)" != "ischmacfixup - @PLATFORM@ Release" && "$(CFG)" != "ischmacfixup - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "ischmacfixup.mak" CFG="ischmacfixup - Win32 Debug"
+!MESSAGE NMAKE /f "ischmacfixup.mak" CFG="ischmacfixup - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ischmacfixup - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ischmacfixup - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "ischmacfixup - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "ischmacfixup - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "ischmacfixup - Win32 Release"
+!IF  "$(CFG)" == "ischmacfixup - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "ischmacfixup - Win32 Release"
+!IF  "$(CFG)" == "ischmacfixup - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\isc-hmac-fixup.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\isc-hmac-fixup.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\isc-hmac-fixup.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\isc-hmac-fixup.pdb" /machine:I386 /out:"../../../Build/Release/isc-hmac-fixup.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\isc-hmac-fixup.pdb" @MACHINE@ /out:"../../../Build/Release/isc-hmac-fixup.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\isc-hmac-fixup.obj"
 
@@ -166,7 +166,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "ischmacfixup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ischmacfixup - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -192,7 +192,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -236,7 +236,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\isc-hmac-fixup.pdb" /debug /machine:I386 /out:"../../../Build/Debug/isc-hmac-fixup.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\isc-hmac-fixup.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/isc-hmac-fixup.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\isc-hmac-fixup.obj"
 
@@ -258,17 +258,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "ischmacfixup - Win32 Release" || "$(CFG)" == "ischmacfixup - Win32 Debug"
+!IF "$(CFG)" == "ischmacfixup - @PLATFORM@ Release" || "$(CFG)" == "ischmacfixup - @PLATFORM@ Debug"
 SOURCE="..\isc-hmac-fixup.c"
 
-!IF  "$(CFG)" == "ischmacfixup - Win32 Release"
+!IF  "$(CFG)" == "ischmacfixup - @PLATFORM@ Release"
 
 
 "$(INTDIR)\isc-hmac-fixup.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "ischmacfixup - Win32 Debug"
+!ELSEIF  "$(CFG)" == "ischmacfixup - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\isc-hmac-fixup.obj" "$(INTDIR)\isc-hmac-fixup.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/tools/win32/ischmacfixup.vcxproj.filters.in b/bin/tools/win32/ischmacfixup.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..92ff232
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\isc-hmac-fixup.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/ischmacfixup.vcxproj.in b/bin/tools/win32/ischmacfixup.vcxproj.in
new file mode 100644 (file)
index 0000000..56567a9
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{70F2F0DF-665D-4444-A982-AEA31A861A22}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>ischmacfixup</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>isc-hmac-fixup</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>isc-hmac-fixup</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\isc-hmac-fixup.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/ischmacfixup.vcxproj.user b/bin/tools/win32/ischmacfixup.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 64%
rename from bin/tools/win32/journalprint.dsp
rename to bin/tools/win32/journalprint.dsp.in
index ced19b2201ac602a7ecdba6d6e47f83069b502b7..268737bf06abd2dc877a844d94a6592a04b128cb 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=journalprint - Win32 Debug
+CFG=journalprint - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=journalprint - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "journalprint.mak" CFG="journalprint - Win32 Debug"
+!MESSAGE NMAKE /f "journalprint.mak" CFG="journalprint - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "journalprint - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "journalprint - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "journalprint - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "journalprint - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=journalprint - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "journalprint - Win32 Release"
+!IF  "$(CFG)" == "journalprint - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/named-journalprint.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/named-journalprint.exe"
 
-!ELSEIF  "$(CFG)" == "journalprint - Win32 Debug"
+!ELSEIF  "$(CFG)" == "journalprint - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/named-journalprint.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/named-journalprint.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "journalprint - Win32 Release"
-# Name "journalprint - Win32 Debug"
+# Name "journalprint - @PLATFORM@ Release"
+# Name "journalprint - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 79%
rename from bin/tools/win32/journalprint.mak
rename to bin/tools/win32/journalprint.mak.in
index 98ad8e90c559c621983efa98df9c271eb3369828..d21aca1e64dc2a3d8467c14bd8567bcddc6974c8 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on journalprint.dsp
 !IF "$(CFG)" == ""
-CFG=journalprint - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to journalprint - Win32 Debug.
+CFG=journalprint - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to journalprint - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "journalprint - Win32 Release" && "$(CFG)" != "journalprint - Win32 Debug"
+!IF "$(CFG)" != "journalprint - @PLATFORM@ Release" && "$(CFG)" != "journalprint - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "journalprint.mak" CFG="journalprint - Win32 Debug"
+!MESSAGE NMAKE /f "journalprint.mak" CFG="journalprint - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "journalprint - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "journalprint - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "journalprint - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "journalprint - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "journalprint - Win32 Release"
+!IF  "$(CFG)" == "journalprint - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "journalprint - Win32 Release"
+!IF  "$(CFG)" == "journalprint - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\journalprint.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\journalprint.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\journalprint.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-journalprint.pdb" /machine:I386 /out:"../../../Build/Release/named-journalprint.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-journalprint.pdb" @MACHINE@ /out:"../../../Build/Release/named-journalprint.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\named-journalprint.obj"
 
@@ -166,7 +166,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "journalprint - Win32 Debug"
+!ELSEIF  "$(CFG)" == "journalprint - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -192,7 +192,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -236,7 +236,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-journalprint.pdb" /debug /machine:I386 /out:"../../../Build/Debug/named-journalprint.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-journalprint.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/named-journalprint.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\named-journalprint.obj" 
 
@@ -258,17 +258,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "journalprint - Win32 Release" || "$(CFG)" == "journalprint - Win32 Debug"
+!IF "$(CFG)" == "journalprint - @PLATFORM@ Release" || "$(CFG)" == "journalprint - @PLATFORM@ Debug"
 SOURCE="..\named-journalprint.c"
 
-!IF  "$(CFG)" == "journalprint - Win32 Release"
+!IF  "$(CFG)" == "journalprint - @PLATFORM@ Release"
 
 
 "$(INTDIR)\named-journalprint.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "journalprint - Win32 Debug"
+!ELSEIF  "$(CFG)" == "journalprint - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\named-journalprint.obj" "$(INTDIR)\named-journalprint.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/tools/win32/journalprint.vcxproj.filters.in b/bin/tools/win32/journalprint.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..3248275
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\named-journalprint.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/journalprint.vcxproj.in b/bin/tools/win32/journalprint.vcxproj.in
new file mode 100644 (file)
index 0000000..0192105
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{B19042CE-D3D9-469B-BCD2-C3140150939A}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>journalprint</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>named-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <TargetName>named-$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\named-journalprint.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/journalprint.vcxproj.user b/bin/tools/win32/journalprint.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 64%
rename from bin/tools/win32/nsec3hash.dsp
rename to bin/tools/win32/nsec3hash.dsp.in
index 3970066653514dfb164d9e5735cf88ba87d917f8..b1fedf70591391b8032a7f5367ff0da29a7dcade 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=nsec3hash - Win32 Debug
+CFG=nsec3hash - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=nsec3hash - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "nsec3hash.mak" CFG="nsec3hash - Win32 Debug"
+!MESSAGE NMAKE /f "nsec3hash.mak" CFG="nsec3hash - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "nsec3hash - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "nsec3hash - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "nsec3hash - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "nsec3hash - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=nsec3hash - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "nsec3hash - Win32 Release"
+!IF  "$(CFG)" == "nsec3hash - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/nsec3hash.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/nsec3hash.exe"
 
-!ELSEIF  "$(CFG)" == "nsec3hash - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nsec3hash - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/nsec3hash.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/nsec3hash.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "nsec3hash - Win32 Release"
-# Name "nsec3hash - Win32 Debug"
+# Name "nsec3hash - @PLATFORM@ Release"
+# Name "nsec3hash - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 79%
rename from bin/tools/win32/nsec3hash.mak
rename to bin/tools/win32/nsec3hash.mak.in
index 8eea4bee782b488ab711baabfd85901b346ef60d..531662fd82af38520681c947b4308b936addb00a 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on nsec3hash.dsp
 !IF "$(CFG)" == ""
-CFG=nsec3hash - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to nsec3hash - Win32 Debug.
+CFG=nsec3hash - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to nsec3hash - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "nsec3hash - Win32 Release" && "$(CFG)" != "nsec3hash - Win32 Debug"
+!IF "$(CFG)" != "nsec3hash - @PLATFORM@ Release" && "$(CFG)" != "nsec3hash - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "nsec3hash.mak" CFG="nsec3hash - Win32 Debug"
+!MESSAGE NMAKE /f "nsec3hash.mak" CFG="nsec3hash - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "nsec3hash - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "nsec3hash - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "nsec3hash - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
+!MESSAGE "nsec3hash - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "nsec3hash - Win32 Release"
+!IF  "$(CFG)" == "nsec3hash - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "nsec3hash - Win32 Release"
+!IF  "$(CFG)" == "nsec3hash - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nsec3hash.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\nsec3hash.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -156,7 +156,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\nsec3hash.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nsec3hash.pdb" /machine:I386 /out:"../../../Build/Release/nsec3hash.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\nsec3hash.pdb" @MACHINE@ /out:"../../../Build/Release/nsec3hash.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\nsec3hash.obj"
 
@@ -166,7 +166,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "nsec3hash - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nsec3hash - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -192,7 +192,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -236,7 +236,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nsec3hash.pdb" /debug /machine:I386 /out:"../../../Build/Debug/nsec3hash.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\nsec3hash.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/nsec3hash.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\nsec3hash.obj"
 
@@ -258,17 +258,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "nsec3hash - Win32 Release" || "$(CFG)" == "nsec3hash - Win32 Debug"
+!IF "$(CFG)" == "nsec3hash - @PLATFORM@ Release" || "$(CFG)" == "nsec3hash - @PLATFORM@ Debug"
 SOURCE="..\nsec3hash.c"
 
-!IF  "$(CFG)" == "nsec3hash - Win32 Release"
+!IF  "$(CFG)" == "nsec3hash - @PLATFORM@ Release"
 
 
 "$(INTDIR)\nsec3hash.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "nsec3hash - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nsec3hash - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\nsec3hash.obj"      "$(INTDIR)\nsec3hash.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/bin/tools/win32/nsec3hash.vcxproj.filters.in b/bin/tools/win32/nsec3hash.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..4c9764f
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\nsec3hash.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/nsec3hash.vcxproj.in b/bin/tools/win32/nsec3hash.vcxproj.in
new file mode 100644 (file)
index 0000000..12b8727
--- /dev/null
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{4EE91023-94C3-48C0-B71C-5333B726C2EE}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>nsec3hash</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <AdditionalLibraryDirectories>..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;libdns.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\nsec3hash.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/nsec3hash.vcxproj.user b/bin/tools/win32/nsec3hash.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/bin/tools/win32/rrchecker.vcxproj.user b/bin/tools/win32/rrchecker.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index ec3e106fa48b62167cbcfc64bf3819b13de9927b..c3d8fc06e50665128594daab67c62e30a2f6570e 100644 (file)
@@ -17,9 +17,7 @@
 
 /* $Id: AccountInfo.cpp,v 1.10 2009/09/29 23:48:04 tbox Exp $ */
 
-#ifndef UNICODE
-#define UNICODE
-#endif /* UNICODE */
+/* Compiled with UNICODE */
 
 #include "stdafx.h"
 
similarity index 67%
rename from bin/win32/BINDInstall/BINDInstall.dsp
rename to bin/win32/BINDInstall/BINDInstall.dsp.in
index 641b1351d73d60be962df991908d3604fef40ce5..52f8d34224ee3323327850b3cd5569c12987fda2 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Application" 0x0101
+# TARGTYPE "@PLATFORM@ (x86) Application" 0x0101
 
-CFG=BINDInstall - Win32 Debug
+CFG=BINDInstall - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=BINDInstall - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - Win32 Debug"
+!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "BINDInstall - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "BINDInstall - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "BINDInstall - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Application")
+!MESSAGE "BINDInstall - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 5
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /TP /c
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" @USE_OPENSSL@ @USE_GSSAPI@ @USE_PYTHON@ /Yu"stdafx.h" /FD /TP /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,10 +52,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /machine:I386 /out:"..\..\..\Build\Release\BINDInstall.exe"
+# ADD BASE LINK32 /nologo /subsystem:windows @MACHINE@
+# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none @MACHINE@ /out:"..\..\..\Build\Release\BINDInstall.exe"
 
-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+!ELSEIF  "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 5
 # PROP BASE Use_Debug_Libraries 1
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /Yu"stdafx.h" /FD /TP /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @USE_OPENSSL@ @USE_GSSAPI@ @USE_PYTHON@ /FR /Yu"stdafx.h" /FD /TP /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -78,15 +78,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\BINDInstall.exe"
+# ADD BASE LINK32 /nologo /subsystem:windows /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug @MACHINE@ /out:"..\..\..\Build\Debug\BINDInstall.exe"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "BINDInstall - Win32 Release"
-# Name "BINDInstall - Win32 Debug"
+# Name "BINDInstall - @PLATFORM@ Release"
+# Name "BINDInstall - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -109,7 +109,7 @@ SOURCE=.\DirBrowse.cpp
 # Begin Source File
 
 SOURCE=..\..\..\lib\isc\win32\ntgroups.c
-# SUBTRACT CPP /YX /Yc /Yu
+# SUBTRACT CPP @COPTY@ /Yc /Yu
 # End Source File
 # Begin Source File
 
similarity index 70%
rename from bin/win32/BINDInstall/BINDInstall.mak
rename to bin/win32/BINDInstall/BINDInstall.mak.in
index 36924a853d8016cceaa1d4e2741d4337ff3189df..e73637ccda9db44a71784e769c3f2b86f75034c7 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on BINDInstall.dsp
 !IF "$(CFG)" == ""
-CFG=BINDInstall - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to BINDInstall - Win32 Debug.
+CFG=BINDInstall - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to BINDInstall - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "BINDInstall - Win32 Release" && "$(CFG)" != "BINDInstall - Win32 Debug"
+!IF "$(CFG)" != "BINDInstall - @PLATFORM@ Release" && "$(CFG)" != "BINDInstall - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - Win32 Debug"
+!MESSAGE NMAKE /f "BINDInstall.mak" CFG="BINDInstall - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "BINDInstall - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "BINDInstall - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "BINDInstall - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Application")
+!MESSAGE "BINDInstall - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -104,7 +104,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -129,7 +129,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 
+CPP_PROJ=/nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" @USE_OPENSSL@ @USE_GSSAPI@ @USE_PYTHON@ /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "NDEBUG"
 BSC32=bscmake.exe
@@ -137,7 +137,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\BINDInstall.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /machine:I386 /out:"..\..\..\Build\Release\BINDInstall.exe" 
+LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none @MACHINE@ /out:"..\..\..\Build\Release\BINDInstall.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\AccountInfo.obj" \
        "$(INTDIR)\BINDInstall.obj" \
@@ -154,7 +154,7 @@ LINK32_OBJS= \
 <<
     $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+!ELSEIF  "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -191,7 +191,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 
+CPP_PROJ=/nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\..\.." /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @USE_OPENSSL@ @USE_GSSAPI@ @USE_PYTHON@ /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "_DEBUG"
 BSC32=bscmake.exe
@@ -211,7 +211,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\BINDInstall.exe" 
+LINK32_FLAGS=version.lib netapi32.lib /nologo /subsystem:windows /pdb:none /debug @MACHINE@ /out:"..\..\..\Build\Debug\BINDInstall.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\AccountInfo.obj" \
        "$(INTDIR)\BINDInstall.obj" \
@@ -270,16 +270,16 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "BINDInstall - Win32 Release" || "$(CFG)" == "BINDInstall - Win32 Debug"
+!IF "$(CFG)" == "BINDInstall - @PLATFORM@ Release" || "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 SOURCE=.\AccountInfo.cpp
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 
 
 "$(INTDIR)\AccountInfo.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
 
 
-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+!ELSEIF  "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\AccountInfo.obj"    "$(INTDIR)\AccountInfo.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
@@ -289,13 +289,13 @@ SOURCE=.\AccountInfo.cpp
 
 SOURCE=.\BINDInstall.cpp
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 
 
 "$(INTDIR)\BINDInstall.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
 
 
-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+!ELSEIF  "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\BINDInstall.obj"    "$(INTDIR)\BINDInstall.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
@@ -305,13 +305,13 @@ SOURCE=.\BINDInstall.cpp
 
 SOURCE=.\BINDInstallDlg.cpp
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 
 
 "$(INTDIR)\BINDInstallDlg.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
 
 
-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+!ELSEIF  "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\BINDInstallDlg.obj" "$(INTDIR)\BINDInstallDlg.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
@@ -321,13 +321,13 @@ SOURCE=.\BINDInstallDlg.cpp
 
 SOURCE=.\DirBrowse.cpp
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 
 
 "$(INTDIR)\DirBrowse.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
 
 
-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+!ELSEIF  "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\DirBrowse.obj"      "$(INTDIR)\DirBrowse.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
@@ -337,9 +337,9 @@ SOURCE=.\DirBrowse.cpp
 
 SOURCE=..\..\..\lib\isc\win32\ntgroups.c
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 
-CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 
+CPP_SWITCHES=/nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" @USE_OPENSSL@ @USE_GSSAPI@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 
 
 "$(INTDIR)\ntgroups.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) @<<
@@ -347,9 +347,9 @@ CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I ".
 <<
 
 
-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+!ELSEIF  "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 
-CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 
+CPP_SWITCHES=/nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @USE_OPENSSL@ @USE_GSSAPI@ /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 
 
 "$(INTDIR)\ntgroups.obj"       "$(INTDIR)\ntgroups.sbr" : $(SOURCE) "$(INTDIR)"
        $(CPP) @<<
@@ -361,9 +361,9 @@ CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\inclu
 
 SOURCE=.\StdAfx.cpp
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 
-CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 
+CPP_SWITCHES=/nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" @USE_OPENSSL@ @USE_GSSAPI@ /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c 
 
 "$(INTDIR)\StdAfx.obj" "$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)"
        $(CPP) @<<
@@ -371,9 +371,9 @@ CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I ".
 <<
 
 
-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+!ELSEIF  "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 
-CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 
+CPP_SWITCHES=/nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" @USE_OPENSSL@ @USE_GSSAPI@ /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c 
 
 "$(INTDIR)\StdAfx.obj" "$(INTDIR)\StdAfx.sbr"  "$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)"
        $(CPP) @<<
@@ -385,13 +385,13 @@ CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\inclu
 
 SOURCE=.\VersionInfo.cpp
 
-!IF  "$(CFG)" == "BINDInstall - Win32 Release"
+!IF  "$(CFG)" == "BINDInstall - @PLATFORM@ Release"
 
 
 "$(INTDIR)\VersionInfo.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
 
 
-!ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"
+!ELSEIF  "$(CFG)" == "BINDInstall - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\VersionInfo.obj"    "$(INTDIR)\VersionInfo.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\BINDInstall.pch"
diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.filters.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..c6079b4
--- /dev/null
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\..\lib\isc\win32\include\isc\ntgroups.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="AccountInfo.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="BINDInstall.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="BINDInstallDlg.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirBrowse.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="resource.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="StdAfx.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="VersionInfo.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="AccountInfo.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="BINDInstall.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="BINDInstallDlg.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirBrowse.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="StdAfx.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="VersionInfo.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\lib\isc\win32\ntgroups.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="res\BINDInstall.ico">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+    <None Include="res\BINDInstall.rc2">\r
+      <Filter>Resource Files</Filter>\r
+    </None>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="BINDInstall.rc">\r
+      <Filter>Resource Files</Filter>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.in b/bin/win32/BINDInstall/BINDInstall.vcxproj.in
new file mode 100644 (file)
index 0000000..8e5ed00
--- /dev/null
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{190CC424-E8CC-46F2-9013-3152D6905118}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>BINDInstall</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;@USE_OPENSSL@@USE_GSSAPI@@USE_PYTHON@_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\..;..\include;..\..\..\include;..\..\named\win32\include;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <StringPooling>\r
+      </StringPooling>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <CompileAs>CompileAsCpp</CompileAs>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalDependencies>nafxcwd.lib;version.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <EnableUAC>false</EnableUAC>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>false</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;@USE_OPENSSL@@USE_GSSAPI@@USE_PYTHON@NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\..;..\include;..\..\..\include;..\..\named\win32\include;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <CompileAs>CompileAsCpp</CompileAs>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalDependencies>nafxcw.lib;version.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <EnableUAC>false</EnableUAC>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\..\lib\isc\win32\include\isc\ntgroups.h" />\r
+    <ClInclude Include="AccountInfo.h" />\r
+    <ClInclude Include="BINDInstall.h" />\r
+    <ClInclude Include="BINDInstallDlg.h" />\r
+    <ClInclude Include="DirBrowse.h" />\r
+    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="StdAfx.h" />\r
+    <ClInclude Include="VersionInfo.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\..\lib\isc\win32\ntgroups.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="AccountInfo.cpp">\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UNICODE;WIN32;@USE_OPENSSL@@USE_GSSAPI@@USE_PYTHON@NDEBUG;_WINDOWS;_MBCS</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UNICODE;WIN32;@USE_OPENSSL@@USE_GSSAPI@@USE_PYTHON@_DEBUG;_WINDOWS;_MBCS</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <ClCompile Include="BINDInstall.cpp" />\r
+    <ClCompile Include="BINDInstallDlg.cpp" />\r
+    <ClCompile Include="DirBrowse.cpp" />\r
+    <ClCompile Include="StdAfx.cpp">\r
+      <PrecompiledHeader>Create</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <ClCompile Include="VersionInfo.cpp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="res\BINDInstall.ico" />\r
+    <None Include="res\BINDInstall.rc2" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="BINDInstall.rc" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/bin/win32/BINDInstall/BINDInstall.vcxproj.user b/bin/win32/BINDInstall/BINDInstall.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index f2941f2f4e32e851b197184c431606349434a03c..208fef12f197ad90504848ffab3215fcd0994baf 100644 (file)
@@ -133,9 +133,27 @@ const FileData installFiles[] =
        {"libisccc.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
        {"libdns.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
        {"liblwres.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
+#ifdef OPENSSL
        {"libeay32.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
+#endif
 #ifdef HAVE_LIBXML2
        {"libxml2.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
+#endif
+#ifdef USE_GSSAPI
+#ifndef _WIN64
+       {"gssapi32.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
+       {"krb5_32.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
+#else
+       {"gssapi64.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
+       {"krb5_64.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
+#endif
+#endif
+#ifdef HAVE_GEOIP
+       {"libgeoip.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
+#endif
+#ifdef WITH_IDN
+       {"idnkit.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
+       {"iconv.dll", FileData::BinDir, FileData::Critical, FALSE, TRUE},
 #endif
        {"named.exe", FileData::BinDir, FileData::Critical, FALSE, FALSE},
        {"nsupdate.exe", FileData::BinDir, FileData::Normal, FALSE, TRUE},
@@ -163,6 +181,10 @@ const FileData installFiles[] =
        {"pkcs11-destroy.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},
        {"pkcs11-keygen.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},
        {"pkcs11-list.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},
+#ifdef USE_PYTHON
+       {"dnssec-checkds.py", FileData::BinDir, FileData::Normal, FALSE, FALSE},
+       {"dnssec-coverage.py", FileData::BinDir, FileData::Normal, FALSE, FALSE},
+#endif
        {"readme1st.txt", FileData::BinDir, FileData::Trivial, FALSE, TRUE},
        {NULL, -1, -1}
 };
index 9ed780d86231a4c3dabff476318976a870a411fc..099ecb2c9e3d25cb23ba3868cab7b46b4eac948b 100644 (file)
@@ -4,9 +4,10 @@
 //
 
 /*
- * Minimum version is Windows XP
+ * Minimum version is Windows XP SP1
  */
 #define _WIN32_WINNT 0x0501
+#define NTDDI_VERSION 0x05010100
 
 #ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE 1
index 2b0a21594ae767c8897e80305181e702529ec8f0..8315dcece838e40c7db8e3044ac01714605eee80 100644 (file)
@@ -30,7 +30,7 @@
 /* Define as __inline if that's what the C compiler calls it.  */
 #define inline __inline
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+/* Define to `unsigned int/__int64' if <sys/types.h> doesn't define.  */
 /* #undef size_t */
 
 /*
 /*
  * Use 32 bit time.
  */
+#ifndef _WIN64
 #define _USE_32BIT_TIME_T 1
+#endif
 
 /*
  * Minimum version is Windows XP
  */
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
+#endif
+#if _WIN32_WINNT < 0x0501
+#error Minimum Target environment is Windows XP and Windows Server 2003
+#endif
+#ifndef NTDDI_VERSION
+#define NTDDI_VERSION 0x05010100
+#endif
+#if NTDDI_VERSION < 0x05010100
+#error Minimum Target environment is Windows XP SP1 and Windows Server 2003
+#endif
 
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 #define strdup _strdup
 #define sopen _sopen
 #define isascii __isascii
+#ifndef _WIN64
 #define stat _stat
 #define fstat _fstat
+#else
+#define stat _stat64
+#define fstat _fstat64
+#endif
 #define fileno _fileno
 #define unlink _unlink
 #define chdir _chdir
 #define mkdir _mkdir
+#define rmdir _rmdir
 #define getcwd _getcwd
 #define utime _utime
 #define utimbuf _utimbuf
+#ifndef _WIN64
+#define lseek _lseek
+#else
+#define lseek _lseeki64
+#endif
 
 /* #define EAFNOSUPPORT EINVAL */
 #define chmod _chmod
 typedef unsigned int    uid_t;          /* user id */
 typedef unsigned int    gid_t;          /* group id */
 typedef long pid_t;                    /* PID */
+#ifndef _WIN64
 typedef int ssize_t;
 typedef long off_t;
+#else
+typedef __int64 ssize_t;
+#ifndef _AFX
+/* BINDInstall defines it with another type but doesn't use it */
+typedef __int64 off_t;
+#endif
+#endif
 
 /*
  * Set up the Version Information
@@ -230,18 +262,25 @@ typedef long off_t;
  * macro is used there.
  */
 
+#ifndef FD_SETSIZE
 #define FD_SETSIZE 16384
+#endif
 #include <windows.h>
 
 /*
- * Windows doesn't use configure so just set "default" here.
+ * main() is hooked
+ */
+#define ISC_MAIN_HOOK 1
+
+/*
+ * Configure sensible arguments
  */
-#define CONFIGARGS "default"
+@CONFIGARGS@
 
 /*
  * Define if libxml2 is present
  */
-#define HAVE_LIBXML2 1
+@HAVE_LIBXML2@
 
 /*
  * Define when building BIND9.  When building exportable versions
@@ -249,11 +288,6 @@ typedef long off_t;
  */
 #define BIND9 1
 
-/*
- * Define if PKCS11 is to be used.
- */
-/* #undef USE_PKCS11 */
-
 /** define if struct addrinfo exists */
 #define HAVE_ADDRINFO
 
@@ -263,14 +297,59 @@ typedef long off_t;
 /** define if gai_strerror() exists */
 #define HAVE_GAISTRERROR
 
+/* Define to enable the "filter-aaaa-on-v4" and "filter-aaaa-on-v6" options.
+   */
+@ALLOW_FILTER_AAAA@
+
+/* Define to enable "rrset-order fixed" syntax. */
+@DNS_RDATASET_FIXED@
+
+/* Define to 1 if you have the `EVP_sha256' function. */
+@HAVE_EVP_SHA256@
+
+/* Define to 1 if you have the `EVP_sha384' function. */
+@HAVE_EVP_SHA384@
+
+/* Define to 1 if you have the `EVP_sha512' function. */
+@HAVE_EVP_SHA512@
+
+/* Define if OpenSSL includes DSA support */
+@HAVE_OPENSSL_DSA@
+
+/* Define if OpenSSL includes ECDSA support */
+@HAVE_OPENSSL_ECDSA@
+
 /* Define if your OpenSSL version supports GOST. */
-#define HAVE_OPENSSL_GOST
+@HAVE_OPENSSL_GOST@
+
+/* Define to 1 if you have the `readline' function. */
+@HAVE_READLINE@
+
+/* Build with GeoIP support */
+@HAVE_GEOIP@
+
+/* define if idnkit support is to be included. */
+@WITH_IDN@
+
+/* Build with GeoIP City IPv6 support */
+@HAVE_GEOIP_CITY_V6@
+
+/* Build with GeoIP Country IPv6 support */
+@HAVE_GEOIP_V6@
 
 /* Define to enable rpz-nsdname rules. */
-#define ENABLE_RPZ_NSDNAME
+@ENABLE_RPZ_NSDNAME@
 
 /* Define to enable rpz-nsip rules. */
-#define ENABLE_RPZ_NSIP
+@ENABLE_RPZ_NSIP@
+
+/* From enable developer */
+@ISC_LIST_CHECKINIT@
+
+/* Avoid warnings with strlen() */
+#ifdef _WIN64
+#define strlen(x)      (unsigned int) strlen(x)
+#endif
 
 /* Get SRCID */
 #include "srcid.h"
similarity index 59%
rename from lib/bind9/win32/libbind9.dsp
rename to lib/bind9/win32/libbind9.dsp.in
index 4cf1eead3a7b1248c1dde6802a0d0362bc64e68d..890b161c1b0502e8c3264605a03df5e39669a0ad 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
 
-CFG=libbind9 - Win32 Release
+CFG=libbind9 - @PLATFORM@ Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=libbind9 - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libbind9.mak" CFG="libbind9 - Win32 Release"
+!MESSAGE NMAKE /f "libbind9.mak" CFG="libbind9 - @PLATFORM@ Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libbind9 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libbind9 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libbind9 - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libbind9 - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libbind9_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../libxml2-2.7.3/include" /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libbind9_EXPORTS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 @LIBXML2_INC@ @GEOIP_INC@ /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" @COPTY@ /FD /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libbind9.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libbind9.dll"
 
-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libbind9_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isccfg/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libbind9_EXPORTS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @LIBXML2_INC@ @GEOIP_INC@ /I "../../../lib/isccfg/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /FR @COPTY@ /FD /GZ /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib ../../isccfg/win32/debug/libisccfg.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libbind9.dll" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib ../../isccfg/win32/debug/libisccfg.lib /nologo /dll /debug @MACHINE@ /out:"../../../Build/Debug/libbind9.dll" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "libbind9 - Win32 Release"
-# Name "libbind9 - Win32 Debug"
+# Name "libbind9 - @PLATFORM@ Release"
+# Name "libbind9 - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 63%
rename from lib/bind9/win32/libbind9.mak
rename to lib/bind9/win32/libbind9.mak.in
index f9cf65097bdaf523012e08dc666fa7fbcb46df2e..ec4d780add96b0943daa6cb3eaab6f7bbcc6021a 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on libbind9.dsp
 !IF "$(CFG)" == ""
-CFG=libbind9 - Win32 Release
-!MESSAGE No configuration specified. Defaulting to libbind9 - Win32 Release.
+CFG=libbind9 - @PLATFORM@ Release
+!MESSAGE No configuration specified. Defaulting to libbind9 - @PLATFORM@ Release.
 !ENDIF 
 
-!IF "$(CFG)" != "libbind9 - Win32 Release" && "$(CFG)" != "libbind9 - Win32 Debug"
+!IF "$(CFG)" != "libbind9 - @PLATFORM@ Release" && "$(CFG)" != "libbind9 - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libbind9.mak" CFG="libbind9 - Win32 Release"
+!MESSAGE NMAKE /f "libbind9.mak" CFG="libbind9 - @PLATFORM@ Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libbind9 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libbind9 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libbind9 - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libbind9 - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -104,7 +104,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -115,12 +115,12 @@ ALL : "..\..\..\Build\Release\libbind9.dll"
 
 !ELSE 
 
-ALL : "libisccfg - Win32 Release" "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\libbind9.dll"
+ALL : "libisccfg - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\libbind9.dll"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" "libisccfg - Win32 ReleaseCLEAN" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libisccfg - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -137,14 +137,14 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../../libxml2-2.7.3/include" /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /Fp"$(INTDIR)\libbind9.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 @LIBXML2_INC@ @GEOIP_INC@ /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /Fp"$(INTDIR)\libbind9.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libbind9.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libbind9.pdb" /machine:I386 /def:".\libbind9.def" /out:"../../../Build/Release/libbind9.dll" /implib:"$(OUTDIR)\libbind9.lib" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib ../../isccfg/win32/Release/libisccfg.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libbind9.pdb" @MACHINE@ /def:".\libbind9.def" /out:"../../../Build/Release/libbind9.dll" /implib:"$(OUTDIR)\libbind9.lib" 
 DEF_FILE= \
        ".\libbind9.def"
 LINK32_OBJS= \
@@ -162,7 +162,7 @@ LINK32_OBJS= \
 <<
   $(_VC_MANIFEST_EMBED_DLL)
 
-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -176,12 +176,12 @@ ALL : "..\..\..\Build\Debug\libbind9.dll" "$(OUTDIR)\libbind9.bsc"
 
 !ELSE 
 
-ALL : "libisccfg - Win32 Debug" "libisc - Win32 Debug" "libdns - Win32 Debug" "..\..\..\Build\Debug\libbind9.dll" "$(OUTDIR)\libbind9.bsc"
+ALL : "libisccfg - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\libbind9.dll" "$(OUTDIR)\libbind9.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 DebugCLEAN" "libisc - Win32 DebugCLEAN" "libisccfg - Win32 DebugCLEAN" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libisccfg - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -206,7 +206,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isccfg/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libbind9.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @LIBXML2_INC@ @GEOIP_INC@ /I "../../../lib/isccfg/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBBIND9_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libbind9.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libbind9.bsc" 
@@ -222,7 +222,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib ../../isccfg/win32/debug/libisccfg.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libbind9.pdb" /debug /machine:I386 /def:".\libbind9.def" /out:"../../../Build/Debug/libbind9.dll" /implib:"$(OUTDIR)\libbind9.lib" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib ../../isccfg/win32/debug/libisccfg.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libbind9.pdb" /debug @MACHINE@ /def:".\libbind9.def" /out:"../../../Build/Debug/libbind9.dll" /implib:"$(OUTDIR)\libbind9.lib" /pdbtype:sept 
 DEF_FILE= \
        ".\libbind9.def"
 LINK32_OBJS= \
@@ -282,17 +282,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "libbind9 - Win32 Release" || "$(CFG)" == "libbind9 - Win32 Debug"
+!IF "$(CFG)" == "libbind9 - @PLATFORM@ Release" || "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 SOURCE=..\check.c
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 
 
 "$(INTDIR)\check.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\check.obj"  "$(INTDIR)\check.sbr" : $(SOURCE) "$(INTDIR)"
@@ -303,13 +303,13 @@ SOURCE=..\check.c
 
 SOURCE=.\DLLMain.c
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 
 
 "$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\DLLMain.obj"        "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
@@ -319,14 +319,14 @@ SOURCE=.\DLLMain.c
 
 SOURCE=..\getaddresses.c
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 
 
 "$(INTDIR)\getaddresses.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\getaddresses.obj"   "$(INTDIR)\getaddresses.sbr" : $(SOURCE) "$(INTDIR)"
@@ -337,13 +337,13 @@ SOURCE=..\getaddresses.c
 
 SOURCE=.\version.c
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 
 
 "$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\version.obj"        "$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
@@ -351,80 +351,80 @@ SOURCE=.\version.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 
-"libdns - Win32 Release" : 
+"libdns - @PLATFORM@ Release" : 
    cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
    cd "..\..\bind9\win32"
 
-"libdns - Win32 ReleaseCLEAN" : 
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 
-"libdns - Win32 Debug" : 
+"libdns - @PLATFORM@ Debug" : 
    cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
    cd "..\..\bind9\win32"
 
-"libdns - Win32 DebugCLEAN" : 
+"libdns - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\bind9\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\bind9\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
 !ENDIF 
 
-!IF  "$(CFG)" == "libbind9 - Win32 Release"
+!IF  "$(CFG)" == "libbind9 - @PLATFORM@ Release"
 
-"libisccfg - Win32 Release" : 
+"libisccfg - @PLATFORM@ Release" : 
    cd "..\..\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" 
    cd "..\..\bind9\win32"
 
-"libisccfg - Win32 ReleaseCLEAN" : 
+"libisccfg - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
-!ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libbind9 - @PLATFORM@ Debug"
 
-"libisccfg - Win32 Debug" : 
+"libisccfg - @PLATFORM@ Debug" : 
    cd "..\..\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" 
    cd "..\..\bind9\win32"
 
-"libisccfg - Win32 DebugCLEAN" : 
+"libisccfg - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\isccfg\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
 !ENDIF 
diff --git a/lib/bind9/win32/libbind9.vcxproj.filters.in b/lib/bind9/win32/libbind9.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..c640e8a
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="libbind9.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="DLLMain.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="version.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\check.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\getaddresses.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\bind9\check.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\bind9\getaddresses.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/bind9/win32/libbind9.vcxproj.in b/lib/bind9/win32/libbind9.vcxproj.in
new file mode 100644 (file)
index 0000000..ad5f96c
--- /dev/null
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{E741C10B-B075-4206-9596-46765B665E03}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>libbind9</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;USE_MD5;@USE_OPENSSL@_DEBUG;_WINDOWS;_USRDLL;LIBBIND9_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../isccfg/include;../../dns/include;@LIBXML2_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalLibraryDirectories>../../isc/win32/$(Configuration);../../dns/win32/$(Configuration);../../isccfg/win32/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>.\libbind9.def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;USE_MD5;@USE_OPENSSL@NDEBUG;_WINDOWS;_USRDLL;LIBBIND9_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../isccfg/include;../../dns/include;@LIBXML2_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalLibraryDirectories>../../isc/win32/$(Configuration);../../dns/win32/$(Configuration);../../isccfg/win32/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>.\libbind9.def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <None Include="libbind9.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\check.c" />\r
+    <ClCompile Include="..\getaddresses.c" />\r
+    <ClCompile Include="DLLMain.c" />\r
+    <ClCompile Include="version.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\bind9\check.h" />\r
+    <ClInclude Include="..\include\bind9\getaddresses.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/bind9/win32/libbind9.vcxproj.user b/lib/bind9/win32/libbind9.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index ba1379499ae62e89089513014ea55ed929e3b053..b934c9990fb3f55674a37b6d683518def256401c 100644 (file)
@@ -309,7 +309,8 @@ find_typename(int type) {
 static void
 insert_into_typenames(int type, const char *typename, const char *attr) {
        struct ttnam *ttn = NULL;
-       int c, i, n;
+       size_t c;
+       int i, n;
        char tmp[256];
 
        INSIST(strlen(typename) < TYPECLASSBUF);
@@ -485,7 +486,7 @@ sd(int rdclass, const char *classname, const char *dirname, char filetype) {
 
 static unsigned int
 HASH(char *string) {
-       unsigned int n;
+       size_t n;
        unsigned char a, b;
 
        n = strlen(string);
index a992a8953f20305d75c1289551ae62f7fd9002e6..ebe793e68cfa96312c5b17ecb47f1eade808df06 100644 (file)
@@ -47,7 +47,7 @@
 
 #define GBUFFER_TO_REGION(gb, r) \
        do { \
-               (r).length = (gb).length; \
+         (r).length = (unsigned int)(gb).length; \
                (r).base = (gb).value; \
        } while (0)
 
@@ -180,7 +180,7 @@ gssapi_sign(dst_context_t *dctx, isc_buffer_t *sig) {
         * Copy the output into our buffer space, and release the gssapi
         * allocated space.
         */
-       isc_buffer_putmem(sig, gsig.value, gsig.length);
+       isc_buffer_putmem(sig, gsig.value, (unsigned int)gsig.length);
        if (gsig.length != 0U)
                gss_release_buffer(&minor, &gsig);
 
@@ -286,7 +286,7 @@ gssapi_destroy(dst_key_t *key) {
 static isc_result_t
 gssapi_restore(dst_key_t *key, const char *keystr) {
        OM_uint32 major, minor;
-       size_t len;
+       unsigned int len;
        isc_buffer_t *b = NULL;
        isc_region_t r;
        gss_buffer_desc gssbuffer;
@@ -346,13 +346,13 @@ gssapi_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length) {
                gss_release_buffer(&minor, &gssbuffer);
                return (ISC_R_NOMEMORY);
        }
-       isc_buffer_init(&b, buf, len);
+       isc_buffer_init(&b, buf, (unsigned int)len);
        GBUFFER_TO_REGION(gssbuffer, r);
        result = isc_base64_totext(&r, 0, "", &b);
        RUNTIME_CHECK(result == ISC_R_SUCCESS);
        gss_release_buffer(&minor, &gssbuffer);
        *buffer = buf;
-       *length = len;
+       *length = (int)len;
        return (ISC_R_SUCCESS);
 }
 
index 28329c3a1ba71380855a218951d0ca6946551aba..c69534e51da77d6cedc58e0eb6d4fb860ad8a971 100644 (file)
  * always use one.  If we're not using our own SPNEGO implementation,
  * we include SPNEGO's OID.
  */
-#if defined(GSSAPI)
+#ifdef GSSAPI
+#ifdef WIN32
+#include <krb5/krb5.h>
+#else
 #include ISC_PLATFORM_KRB5HEADER
+#endif
 
 static unsigned char krb5_mech_oid_bytes[] = {
        0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x01, 0x02, 0x02
@@ -103,7 +107,7 @@ static gss_OID_set_desc mech_oid_set = {
 
 #define GBUFFER_TO_REGION(gb, r) \
        do { \
-               (r).length = (gb).length; \
+         (r).length = (unsigned int)(gb).length; \
                (r).base = (gb).value; \
        } while (0)
 
@@ -680,7 +684,7 @@ dst_gssapi_acceptctx(gss_cred_id_t cred,
                context = *ctxout;
 
        if (gssapi_keytab != NULL) {
-#ifdef ISC_PLATFORM_GSSAPI_KRB5_HEADER
+#if defined(ISC_PLATFORM_GSSAPI_KRB5_HEADER) || defined(WIN32)
                gret = gsskrb5_register_acceptor_identity(gssapi_keytab);
                if (gret != GSS_S_COMPLETE) {
                        gss_log(3, "failed "
@@ -741,7 +745,8 @@ dst_gssapi_acceptctx(gss_cred_id_t cred,
        }
 
        if (gouttoken.length > 0U) {
-               RETERR(isc_buffer_allocate(mctx, outtoken, gouttoken.length));
+               RETERR(isc_buffer_allocate(mctx, outtoken,
+                                          (unsigned int)gouttoken.length));
                GBUFFER_TO_REGION(gouttoken, r);
                RETERR(isc_buffer_copyregion(*outtoken, &r));
                (void)gss_release_buffer(&minor, &gouttoken);
index 1e81a55b97180ef7a7c90e2cb3dfedf4345c93be..44358813661eb02976775e4070bb6f6d79328979 100644 (file)
@@ -29,7 +29,7 @@
 #include <dns/types.h>
 
 #ifdef GSSAPI
-#ifdef _WINDOWS
+#ifdef WIN32
 /*
  * MSVC does not like macros in #include lines.
  */
index 9ed5fcd8a0d90e2015b12a4d84cedc1582b662d1..987d24fcbb73bebd3308b85285735881aa64159f 100644 (file)
@@ -395,7 +395,7 @@ journal_read(dns_journal_t *j, void *mem, size_t nbytes) {
                              j->filename, isc_result_totext(result));
                return (ISC_R_UNEXPECTED);
        }
-       j->offset += nbytes;
+       j->offset += (isc_offset_t)nbytes;
        return (ISC_R_SUCCESS);
 }
 
@@ -410,7 +410,7 @@ journal_write(dns_journal_t *j, void *mem, size_t nbytes) {
                              j->filename, isc_result_totext(result));
                return (ISC_R_UNEXPECTED);
        }
-       j->offset += nbytes;
+       j->offset += (isc_offset_t)nbytes;
        return (ISC_R_SUCCESS);
 }
 
@@ -675,7 +675,7 @@ isc_result_t
 dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
                 dns_journal_t **journalp) {
        isc_result_t result;
-       int namelen;
+       size_t namelen;
        char backup[1024];
 
        result = journal_open(mctx, filename, write, write, journalp);
@@ -685,7 +685,7 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
                        namelen -= 4;
 
                result = isc_string_printf(backup, sizeof(backup), "%.*s.jbk",
-                                          namelen, filename);
+                                          (int)namelen, filename);
                if (result != ISC_R_SUCCESS)
                        return (result);
                result = journal_open(mctx, backup, write, write, journalp);
@@ -2014,7 +2014,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial,
        dns_journal_t *new = NULL;
        journal_rawheader_t rawheader;
        unsigned int copy_length;
-       int namelen;
+       size_t namelen;
        char *buf = NULL;
        unsigned int size = 0;
        isc_result_t result;
@@ -2028,12 +2028,12 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial,
                namelen -= 4;
 
        result = isc_string_printf(newname, sizeof(newname), "%.*s.jnw",
-                                  namelen, filename);
+                                  (int)namelen, filename);
        if (result != ISC_R_SUCCESS)
                return (result);
 
        result = isc_string_printf(backup, sizeof(backup), "%.*s.jbk",
-                                  namelen, filename);
+                                  (int)namelen, filename);
        if (result != ISC_R_SUCCESS)
                return (result);
 
index 1b7460c45673cf4698d039f15b29f7415f56c478..5d9c13b5da36f7eee16e181d587d421aa59a0269 100644 (file)
@@ -684,7 +684,7 @@ genname(char *name, int it, char *buffer, size_t length) {
        isc_boolean_t nibblemode;
 
        r.base = buffer;
-       r.length = length;
+       r.length = (unsigned int)length;
 
        while (*name != '\0') {
                if (*name == '$') {
@@ -2081,7 +2081,7 @@ read_and_check(isc_boolean_t do_read, isc_buffer_t *buffer,
                                        f, NULL);
                if (result != ISC_R_SUCCESS)
                        return (result);
-               isc_buffer_add(buffer, len);
+               isc_buffer_add(buffer, (unsigned int)len);
        } else if (isc_buffer_remaininglength(buffer) < len)
                return (ISC_R_RANGE);
 
@@ -2241,7 +2241,7 @@ load_raw(dns_loadctx_t *lctx) {
                                        lctx->f, NULL);
                if (result != ISC_R_SUCCESS)
                        goto cleanup;
-               isc_buffer_add(&target, readlen);
+               isc_buffer_add(&target, (unsigned int)readlen);
 
                /* Construct RRset headers */
                rdatalist.rdclass = isc_buffer_getuint16(&target);
index d36edbae3b1471a3c497fdfc8bc32ddcdc4a78b0..7e6a2de7c68a76c99f741ba6567e289d405bed16 100644 (file)
@@ -3466,7 +3466,7 @@ dns_message_buildopt(dns_message_t *message, dns_rdataset_t **rdatasetp,
        dns_rdatalist_t *rdatalist = NULL;
        dns_rdata_t *rdata = NULL;
        isc_result_t result;
-       size_t len = 0, i;
+       unsigned int len = 0, i;
 
        REQUIRE(DNS_MESSAGE_VALID(message));
        REQUIRE(rdatasetp != NULL && *rdatasetp == NULL);
index 41b5dc3293eaa66fb4e3e1ddaae1abee4ed151d3..3275e7a590c7edf7d8b59a118f05ef8c50610c55 100644 (file)
@@ -63,7 +63,7 @@ bit_isset(unsigned char *array, unsigned int index) {
        shift = 7 - (index % 8);
        mask = 1 << shift;
 
-       return ((byte & mask) != 0);
+       return (ISC_TF(byte & mask));
 }
 
 isc_result_t
@@ -146,7 +146,7 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version,
                memmove(&nsec_bits[2], &bm[window * 32], octet + 1);
                nsec_bits += 3 + octet;
        }
-       r.length = nsec_bits - r.base;
+       r.length = (unsigned int)(nsec_bits - r.base);
        INSIST(r.length <= DNS_NSEC_BUFFERSIZE);
        dns_rdata_fromregion(rdata,
                             dns_db_class(db),
index 8832244097169f1011396575ce0239219eeebc31..81a7c2810cb89fc4f885dd3f83474b45b0e91d7a 100644 (file)
@@ -120,15 +120,15 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version,
        *p++ = iterations >> 8;
        *p++ = iterations;
 
-       *p++ = salt_length;
+       *p++ = (unsigned char)salt_length;
        memcpy(p, salt, salt_length);
        p += salt_length;
 
-       *p++ = hash_length;
+       *p++ = (unsigned char)hash_length;
        memcpy(p, nexthash, hash_length);
        p += hash_length;
 
-       r.length = p - buffer;
+       r.length = (unsigned int)(p - buffer);
        r.base = buffer;
 
        /*
@@ -215,7 +215,7 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version,
                memmove(&nsec_bits[2], &bm[window * 32], octet + 1);
                nsec_bits += 3 + octet;
        }
-       r.length = nsec_bits - r.base;
+       r.length = (unsigned int)(nsec_bits - r.base);
        INSIST(r.length <= DNS_NSEC3_BUFFERSIZE);
        dns_rdata_fromregion(rdata, dns_db_class(db), dns_rdatatype_nsec3, &r);
 
@@ -282,7 +282,8 @@ dns_nsec3_hashname(dns_fixedname_t *result,
        dns_name_downcase(name, downcased, NULL);
 
        /* hash the node name */
-       len = isc_iterated_hash(rethash, hashalg, iterations, salt, saltlength,
+       len = isc_iterated_hash(rethash, hashalg, iterations,
+                               salt, (int)saltlength,
                                downcased->ndata, downcased->length);
        if (len == 0U)
                return (DNS_R_BADALG);
@@ -292,7 +293,7 @@ dns_nsec3_hashname(dns_fixedname_t *result,
 
        /* convert the hash to base32hex */
        region.base = rethash;
-       region.length = len;
+       region.length = (unsigned int)len;
        isc_buffer_init(&namebuffer, nametext, sizeof nametext);
        isc_base32hex_totext(&region, 1, "", &namebuffer);
 
@@ -716,7 +717,7 @@ dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version,
                 * Fixup the previous NSEC3.
                 */
                nsec3.next = nexthash;
-               nsec3.next_length = next_length;
+               nsec3.next_length = (unsigned char)next_length;
                isc_buffer_init(&buffer, nsec3buf, sizeof(nsec3buf));
                CHECK(dns_rdata_fromstruct(&rdata, rdataset.rdclass,
                                           dns_rdatatype_nsec3, &nsec3,
@@ -835,7 +836,7 @@ dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version,
                         * Fixup the previous NSEC3.
                         */
                        nsec3.next = nexthash;
-                       nsec3.next_length = next_length;
+                       nsec3.next_length = (unsigned char)next_length;
                        isc_buffer_init(&buffer, nsec3buf,
                                        sizeof(nsec3buf));
                        CHECK(dns_rdata_fromstruct(&rdata, rdataset.rdclass,
@@ -976,7 +977,7 @@ dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target,
        isc_buffer_init(&buf1, src->data + 1, src->length - 1);
        isc_buffer_add(&buf1, src->length - 1);
        isc_buffer_setactive(&buf1, src->length - 1);
-       isc_buffer_init(&buf2, buf, buflen);
+       isc_buffer_init(&buf2, buf, (unsigned int)buflen);
        dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE);
        result = dns_rdata_fromwire(target, src->rdclass,
                                    dns_rdatatype_nsec3param,
@@ -1438,7 +1439,7 @@ dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
                 * Fixup the previous NSEC3.
                 */
                nsec3.next = nexthash;
-               nsec3.next_length = next_length;
+               nsec3.next_length = (unsigned char)next_length;
                if (CREATE(nsec3param->flags))
                        nsec3.flags = nsec3param->flags & DNS_NSEC3FLAG_OPTOUT;
                isc_buffer_init(&buffer, nsec3buf, sizeof(nsec3buf));
@@ -1538,7 +1539,7 @@ dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
                         * Fixup the previous NSEC3.
                         */
                        nsec3.next = nexthash;
-                       nsec3.next_length = next_length;
+                       nsec3.next_length = (unsigned char)next_length;
                        isc_buffer_init(&buffer, nsec3buf,
                                        sizeof(nsec3buf));
                        CHECK(dns_rdata_fromstruct(&rdata, rdataset.rdclass,
index 9fe9bb52524fafd78c0b74356c8b0efd562c163b..518736c39a18221b3a0688546cfcf6eb15cf195e 100644 (file)
@@ -608,11 +608,11 @@ BN_fromhex(BIGNUM *b, const char *str) {
 
                s = strchr(hexdigits, tolower((unsigned char)str[i]));
                RUNTIME_CHECK(s != NULL);
-               high = s - hexdigits;
+               high = (unsigned int)(s - hexdigits);
 
                s = strchr(hexdigits, tolower((unsigned char)str[i + 1]));
                RUNTIME_CHECK(s != NULL);
-               low = s - hexdigits;
+               low = (unsigned int)(s - hexdigits);
 
                data[i/2] = (unsigned char)((high << 4) + low);
        }
index 0b7fe8c28051d42a4ad821bb73d5a52332f4cc9a..2e25bf2db4c0c74f92bab76ce733ce114a38a3b6 100644 (file)
@@ -381,9 +381,9 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source)
                unsigned int len;
                char *delim = memchr(text, '|', end - text);
                if (delim != NULL)
-                       len = delim - text;
+                       len = (unsigned int)(delim - text);
                else
-                       len = end - text;
+                       len = (unsigned int)(end - text);
                for (p = keyflags; p->name != NULL; p++) {
                        if (strncasecmp(p->name, text, len) == 0)
                                break;
index 3865f42fe086e98ab74f948b725d3e39a9c226b9..8b432e698bf3531a9cabe2b4c81a01fb74af3a5e 100644 (file)
@@ -500,7 +500,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
        isc_buffer_t st;
        isc_boolean_t use_default = ISC_FALSE;
        isc_uint32_t activelength;
-       size_t length;
+       unsigned int length;
 
        REQUIRE(dctx != NULL);
        if (rdata != NULL) {
@@ -681,7 +681,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
        unsigned long line;
        void (*callback)(dns_rdatacallbacks_t *, const char *, ...);
        isc_result_t tresult;
-       size_t length;
+       unsigned int length;
        isc_boolean_t unknown;
 
        REQUIRE(origin == NULL || dns_name_isabsolute(origin) == ISC_TRUE);
@@ -908,7 +908,7 @@ dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
        isc_buffer_t st;
        isc_region_t region;
        isc_boolean_t use_default = ISC_FALSE;
-       size_t length;
+       unsigned int length;
 
        REQUIRE(source != NULL);
        if (rdata != NULL) {
@@ -1171,7 +1171,7 @@ txt_totext(isc_region_t *source, isc_buffer_t *target) {
                return (ISC_R_NOSPACE);
        *tp++ = '"';
        tl--;
-       isc_buffer_add(target, tp - (char *)region.base);
+       isc_buffer_add(target, (unsigned int)(tp - (char *)region.base));
        isc_region_consume(source, *source->base + 1);
        return (ISC_R_SUCCESS);
 }
@@ -1237,7 +1237,7 @@ txt_fromtext(isc_textregion_t *source, isc_buffer_t *target) {
        }
        if (escape)
                return (DNS_R_SYNTAX);
-       *tregion.base = t - tregion.base - 1;
+       *tregion.base = (unsigned char)(t - tregion.base - 1);
        isc_buffer_add(target, *tregion.base + 1);
        return (ISC_R_SUCCESS);
 }
@@ -1318,7 +1318,7 @@ multitxt_totext(isc_region_t *source, isc_buffer_t *target) {
                return (ISC_R_NOSPACE);
        *tp++ = '"';
        tl--;
-       isc_buffer_add(target, tp - (char *)region.base);
+       isc_buffer_add(target, (unsigned int)(tp - (char *)region.base));
        return (ISC_R_SUCCESS);
 }
 
@@ -1382,7 +1382,7 @@ multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) {
                }
                if (escape)
                        return (DNS_R_SYNTAX);
-               *t0 = t - t0 - 1;
+               *t0 = (unsigned char)(t - t0 - 1);
                isc_buffer_add(target, *t0 + 1);
        } while (n != 0);
        return (ISC_R_SUCCESS);
@@ -1604,7 +1604,7 @@ hexvalue(char value) {
                c = tolower(c);
        if ((s = strchr(hexdigits, c)) == NULL)
                return (-1);
-       return (s - hexdigits);
+       return (int)(s - hexdigits);
 }
 
 static int
@@ -1619,7 +1619,7 @@ decvalue(char value) {
                return (-1);
        if ((s = strchr(decdigits, value)) == NULL)
                return (-1);
-       return (s - decdigits);
+       return (int)(s - decdigits);
 }
 
 static const char atob_digits[86] =
@@ -1679,15 +1679,15 @@ byte_atob(int c, isc_buffer_t *target, struct state *state) {
                }
        } else if ((s = strchr(atob_digits, c)) != NULL) {
                if (bcount == 0) {
-                       word = s - atob_digits;
+                       word = (isc_int32_t)(s - atob_digits);
                        ++bcount;
                } else if (bcount < 4) {
                        word = times85(word);
-                       word += s - atob_digits;
+                       word += (isc_int32_t)(s - atob_digits);
                        ++bcount;
                } else {
                        word = times85(word);
-                       word += s - atob_digits;
+                       word += (isc_int32_t)(s - atob_digits);
                        RETERR(putbyte((word >> 24) & 0xff, target, state));
                        RETERR(putbyte((word >> 16) & 0xff, target, state));
                        RETERR(putbyte((word >> 8) & 0xff, target, state));
index 5a5140f8ddd6f9e4654dd4532f960d9727dc8321..4b6b595b62a1338a461253e279013b6cd84b1dc3 100644 (file)
@@ -76,7 +76,7 @@ fromtext_hip(ARGS_FROMTEXT) {
        len = (unsigned char *)isc_buffer_used(target) - start;
        if (len > 0xffU)
                RETTOK(ISC_R_RANGE);
-       RETERR(uint8_tobuffer(len, &hit_len));
+       RETERR(uint8_tobuffer((isc_uint32_t)len, &hit_len));
 
        /*
         * Public key (base64).
@@ -92,7 +92,7 @@ fromtext_hip(ARGS_FROMTEXT) {
        len = (unsigned char *)isc_buffer_used(target) - start;
        if (len > 0xffffU)
                RETTOK(ISC_R_RANGE);
-       RETERR(uint16_tobuffer(len, &key_len));
+       RETERR(uint16_tobuffer((isc_uint32_t)len, &key_len));
 
        /*
         * Rendezvous Servers.
@@ -122,7 +122,7 @@ static inline isc_result_t
 totext_hip(ARGS_TOTEXT) {
        isc_region_t region;
        dns_name_t name;
-       size_t length, key_len, hit_len;
+       unsigned int length, key_len, hit_len;
        unsigned char algorithm;
        char buf[sizeof("225 ")];
 
index cb9ae5425ef9c704ef5d471c166dddac63598eaf..7f5b45eaa01c4e26991f4e89fda9b6687e0f0c99 100644 (file)
@@ -913,7 +913,7 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
                         * This rdata isn't in the sslab, and thus isn't
                         * being subtracted.
                         */
-                       tlength += mcurrent - mrdatabegin;
+                       tlength += (unsigned int)(mcurrent - mrdatabegin);
                        tcount++;
                } else
                        rcount++;
@@ -1000,7 +1000,8 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
                         * This rdata isn't in the sslab, and thus should be
                         * copied to the tslab.
                         */
-                       unsigned int length = mcurrent - mrdatabegin;
+                       unsigned int length;
+                       length = (unsigned int)(mcurrent - mrdatabegin);
 #if DNS_RDATASET_FIXED
                        offsettable[order] = tcurrent - offsetbase;
 #endif
index 87c946034cfddcb46dde55e2d38d71838bc6b6ba..917777f842ddda34f7b43b4f5bb858af73919ebd 100644 (file)
@@ -6654,7 +6654,7 @@ log_nsid(isc_buffer_t *opt, size_t nsid_len, resquery_t *query,
        unsigned char *p, *buf, *nsid;
 
        /* Allocate buffer for storing hex version of the NSID */
-       buflen = nsid_len * 2 + 1;
+       buflen = (isc_uint16_t)nsid_len * 2 + 1;
        buf = isc_mem_get(mctx, buflen);
        if (buf == NULL)
                return;
index 3502022c2ae172972b9c511ecf6d399cc39c62d4..34971788dd89e4fd4d214845fbfc6541ce051ce0 100644 (file)
@@ -201,7 +201,7 @@ dns_rootns_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
 {
        isc_result_t result, eresult;
        isc_buffer_t source;
-       size_t len;
+       unsigned int len;
        dns_rdatacallbacks_t callbacks;
        dns_db_t *db = NULL;
 
index 0c1c8583650df10ebd8634a092ba739f50653c3f..77a8c31e917a5de9b7a2eccbd7fcfb289d612c98 100644 (file)
@@ -1107,7 +1107,7 @@ length_len(size_t len)
        if (len < 128U)
                return (1);
        else
-               return (len_unsigned(len) + 1);
+               return (len_unsigned((unsigned int)len) + 1);
 }
 
 
@@ -1191,18 +1191,18 @@ der_put_length(unsigned char *p, size_t len, size_t val, size_t *size)
        if (len < 1U)
                return (ASN1_OVERFLOW);
        if (val < 128U) {
-               *p = val;
+               *p = (unsigned char)val;
                *size = 1;
                return (0);
        } else {
                size_t l;
                int e;
 
-               e = der_put_unsigned(p, len - 1, val, &l);
+               e = der_put_unsigned(p, len - 1, (unsigned int)val, &l);
                if (e)
                        return (e);
                p -= l;
-               *p = 0x80 | l;
+               *p = 0x80 | (unsigned char)l;
                *size = l + 1;
                return (0);
        }
@@ -1227,7 +1227,7 @@ der_put_oid(unsigned char *p, size_t len,
            const oid *data, size_t *size)
 {
        unsigned char *base = p;
-       int n;
+       size_t n;
 
        for (n = data->length - 1; n >= 2; --n) {
                unsigned        u = data->components[n];
index b5060545669359935fc680120ced7e0cf6bb2d3b..a90f1be63c2cb40332e184d098bc750b0b2b4cdf 100644 (file)
@@ -229,7 +229,7 @@ encode_MechTypeList(unsigned char *p, size_t len, const MechTypeList * data, siz
        int i, e;
 
        for (i = (data)->len - 1; i >= 0; --i) {
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                e = encode_MechType(p, len, &(data)->val[i], &l);
                BACK;
@@ -257,7 +257,7 @@ decode_MechTypeList(const unsigned char *p, size_t len, MechTypeList * data, siz
        len = reallen;
        {
                size_t origlen = len;
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                (data)->len = 0;
                (data)->val = NULL;
@@ -418,7 +418,7 @@ encode_NegTokenInit(unsigned char *p, size_t len, const NegTokenInit * data, siz
        int e;
 
        if ((data)->mechListMIC) {
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                e = encode_octet_string(p, len, (data)->mechListMIC, &l);
                BACK;
@@ -427,7 +427,7 @@ encode_NegTokenInit(unsigned char *p, size_t len, const NegTokenInit * data, siz
                ret += oldret;
        }
        if ((data)->mechToken) {
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                e = encode_octet_string(p, len, (data)->mechToken, &l);
                BACK;
@@ -436,7 +436,7 @@ encode_NegTokenInit(unsigned char *p, size_t len, const NegTokenInit * data, siz
                ret += oldret;
        }
        if ((data)->reqFlags) {
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                e = encode_ContextFlags(p, len, (data)->reqFlags, &l);
                BACK;
@@ -444,7 +444,7 @@ encode_NegTokenInit(unsigned char *p, size_t len, const NegTokenInit * data, siz
                BACK;
                ret += oldret;
        } {
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                e = encode_MechTypeList(p, len, &(data)->mechTypes, &l);
                BACK;
@@ -641,7 +641,7 @@ encode_NegTokenResp(unsigned char *p, size_t len, const NegTokenResp * data, siz
        int e;
 
        if ((data)->mechListMIC) {
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                e = encode_octet_string(p, len, (data)->mechListMIC, &l);
                BACK;
@@ -650,7 +650,7 @@ encode_NegTokenResp(unsigned char *p, size_t len, const NegTokenResp * data, siz
                ret += oldret;
        }
        if ((data)->responseToken) {
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                e = encode_octet_string(p, len, (data)->responseToken, &l);
                BACK;
@@ -659,7 +659,7 @@ encode_NegTokenResp(unsigned char *p, size_t len, const NegTokenResp * data, siz
                ret += oldret;
        }
        if ((data)->supportedMech) {
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                e = encode_MechType(p, len, (data)->supportedMech, &l);
                BACK;
@@ -668,7 +668,7 @@ encode_NegTokenResp(unsigned char *p, size_t len, const NegTokenResp * data, siz
                ret += oldret;
        }
        if ((data)->negState) {
-               int oldret = ret;
+               size_t oldret = ret;
                ret = 0;
                e = encode_enumerated(p, len, (data)->negState, &l);
                BACK;
index 43d231d63eb095d876a6e40978d1216ec89ce334..3ded9985b9d1584a5e9fecb458c99852c6a8227e 100644 (file)
@@ -131,7 +131,7 @@ dns_ssu_external_match(dns_name_t *identity,
        isc_buffer_t *tkey_token = NULL;
        int fd;
        const char *sock_path;
-       size_t req_len;
+       unsigned int req_len;
        isc_region_t token_region;
        unsigned char *data;
        isc_buffer_t buf;
index d3cf024138db1316613ad31b4183bdb8c033810f..606834f42684f6d1e7138062e488d9665451f9b0 100644 (file)
@@ -53,7 +53,7 @@ ttlfmt(unsigned int t, const char *s, isc_boolean_t verbose,
        isc_boolean_t space, isc_buffer_t *target)
 {
        char tmp[60];
-       size_t len;
+       unsigned int len;
        isc_region_t region;
 
        if (verbose)
similarity index 66%
rename from lib/dns/win32/gen.dsp
rename to lib/dns/win32/gen.dsp.in
index a176787ab0ac335bff6bd5d91ed6d804598e2fca..fe172aad5b1c9e30b3968bfcf1123192aad4d1ce 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "@BUILD_PLATFORM@ (x86) Console Application" 0x0103
 
-CFG=gen - Win32 Debug
+CFG=gen - @BUILD_PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=gen - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "gen.mak" CFG="gen - Win32 Debug"
+!MESSAGE NMAKE /f "gen.mak" CFG="gen - @BUILD_PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "gen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "gen - @BUILD_PLATFORM@ Release" (based on "@BUILD_PLATFORM@ (x86) Console Application")
+!MESSAGE "gen - @BUILD_PLATFORM@ Debug" (based on "@BUILD_PLATFORM@ (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=gen - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "gen - Win32 Release"
+!IF  "$(CFG)" == "gen - @BUILD_PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -41,18 +41,18 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
+# ADD CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /out:"../gen.exe"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @BUILD_MACHINE@
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console @BUILD_MACHINE@ /out:"../gen.exe"
 
-!ELSEIF  "$(CFG)" == "gen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "gen - @BUILD_PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,24 +65,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
+# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /FR /FD /GZ /c
+# SUBTRACT CPP /X @COPTY@
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../gen.exe" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @BUILD_MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:console /debug @BUILD_MACHINE@ /out:"../gen.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "gen - Win32 Release"
-# Name "gen - Win32 Debug"
+# Name "gen - @BUILD_PLATFORM@ Release"
+# Name "gen - @BUILD_PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 76%
rename from lib/dns/win32/gen.mak
rename to lib/dns/win32/gen.mak.in
index 607338d40b47dcdc5bc4153efba9fe8ed8f39961..57533efc2235041b928ca629ee4398547dbc5201 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on gen.dsp
 !IF "$(CFG)" == ""
-CFG=gen - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to gen - Win32 Debug.
+CFG=gen - @BUILD_PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to gen - @BUILD_PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "gen - Win32 Release" && "$(CFG)" != "gen - Win32 Debug"
+!IF "$(CFG)" != "gen - @BUILD_PLATFORM@ Release" && "$(CFG)" != "gen - @BUILD_PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "gen.mak" CFG="gen - Win32 Debug"
+!MESSAGE NMAKE /f "gen.mak" CFG="gen - @BUILD_PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "gen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "gen - @BUILD_PLATFORM@ Release" (based on "@BUILD_PLATFORM@ (x86) Console Application")
+!MESSAGE "gen - @BUILD_PLATFORM@ Debug" (based on "@BUILD_PLATFORM@ (x86) Console Application")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,7 +28,7 @@ NULL=nul
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "gen - Win32 Release"
+!IF  "$(CFG)" == "gen - @BUILD_PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -103,7 +103,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "gen - Win32 Release"
+!IF  "$(CFG)" == "gen - @BUILD_PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -120,13 +120,13 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\gen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo @COPTML@ /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\gen.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\gen.pdb" /machine:I386 /out:"../gen.exe" 
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\gen.pdb" @BUILD_MACHINE@ /out:"../gen.exe" 
 LINK32_OBJS= \
        "$(INTDIR)\gen.obj"
 
@@ -136,7 +136,7 @@ LINK32_OBJS= \
 <<
   $(_VC_MANIFEST_EMBED_EXE)
 
-!ELSEIF  "$(CFG)" == "gen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "gen - @BUILD_PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -161,7 +161,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo @COPTMLD@ /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen.bsc" 
 BSC32_SBRS= \
@@ -173,7 +173,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\gen.pdb" /debug /machine:I386 /out:"../gen.exe" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\gen.pdb" /debug @BUILD_MACHINE@ /out:"../gen.exe" /pdbtype:sept 
 LINK32_OBJS= \
        "$(INTDIR)\gen.obj"
 
@@ -225,17 +225,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "gen - Win32 Release" || "$(CFG)" == "gen - Win32 Debug"
+!IF "$(CFG)" == "gen - @BUILD_PLATFORM@ Release" || "$(CFG)" == "gen - @BUILD_PLATFORM@ Debug"
 SOURCE=..\gen.c
 
-!IF  "$(CFG)" == "gen - Win32 Release"
+!IF  "$(CFG)" == "gen - @BUILD_PLATFORM@ Release"
 
 
 "$(INTDIR)\gen.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "gen - Win32 Debug"
+!ELSEIF  "$(CFG)" == "gen - @BUILD_PLATFORM@ Debug"
 
 
 "$(INTDIR)\gen.obj"    "$(INTDIR)\gen.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/lib/dns/win32/gen.vcxproj.filters.in b/lib/dns/win32/gen.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..ea41c7d
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\gen.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\gen-win32.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/dns/win32/gen.vcxproj.in b/lib/dns/win32/gen.vcxproj.in
new file mode 100644 (file)
index 0000000..5701f57
--- /dev/null
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@BUILD_PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@BUILD_PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@BUILD_PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@BUILD_PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{A3F71D12-F38A-4C77-8D87-8E8854CA74A1}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>gen</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@BUILD_PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@BUILD_PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@BUILD_PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@BUILD_PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@BUILD_PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@BUILD_PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@BUILD_PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>cd ..\r
+gen -s . -t &gt; include\dns\enumtype.h\r
+gen -s . -c &gt; include\dns\enumclass.h\r
+gen -s . -i -P ./rdata/rdatastructpre.h -S ./rdata/rdatastructsuf.h &gt; include\dns\rdatastruct.h\r
+gen -s . &gt; code.h\r
+</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@BUILD_PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>cd ..\r
+gen -s . -t &gt; include\dns\enumtype.h\r
+gen -s . -c &gt; include\dns\enumclass.h\r
+gen -s . -i -P ./rdata/rdatastructpre.h -S ./rdata/rdatastructsuf.h &gt; include\dns\rdatastruct.h\r
+gen -s . &gt; code.h\r
+</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\gen.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\gen-win32.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/dns/win32/gen.vcxproj.user b/lib/dns/win32/gen.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 99%
rename from lib/dns/win32/libdns.def
rename to lib/dns/win32/libdns.def.in
index 43ef4b3aed5ca0b93f96fd1e8e4c2610c50b48de..d7a56931a212db302d602a36d14b791b84be0e43 100644 (file)
@@ -226,6 +226,9 @@ dns_fwdtable_find
 dns_generalstats_create
 dns_generalstats_dump
 dns_generalstats_increment
+@IF GEOIP
+dns_geoip_shutdown
+@END GEOIP
 dns_iptable_addprefix
 dns_iptable_attach
 dns_iptable_create
@@ -678,6 +681,7 @@ dns_timer_setidle
 dns_tkey_builddeletequery
 dns_tkey_builddhquery
 dns_tkey_buildgssquery
+dns_tkey_gssnegotiate
 dns_tkey_processdeleteresponse
 dns_tkey_processdhresponse
 dns_tkey_processgssresponse
@@ -988,9 +992,10 @@ dst_region_computeid
 dst_region_computerid
 dst_result_register
 dst_result_totext
-
+@IF NOLONGER
 ; Exported Data
 
 EXPORTS
 
 dns_master_style_full  DATA
+@END NOLONGER
similarity index 84%
rename from lib/dns/win32/libdns.dsp
rename to lib/dns/win32/libdns.dsp.in
index 6ce4a5586a943e6d3b832f0e3409bc79bc00cf7c..80f882d58455807b9ca9b9e401bb7914c0585c7f 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
 
-CFG=libdns - Win32 Debug
+CFG=libdns - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=libdns - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libdns.mak" CFG="libdns - Win32 Debug"
+!MESSAGE NMAKE /f "libdns.mak" CFG="libdns - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libdns - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libdns - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libdns - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libdns - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "BIND9" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../isc/noatomic/include" /I "../../../../libxml2-2.7.3/include" /I "../../../../openssl-0.9.8l/inc32" /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "BIND9" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @LIBXML2_INC@ @OPENSSL_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @USE_OPENSSL@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" @COPTY@ /FD /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.8l/out32dll/libeay32.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libdns.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ /nologo /dll @MACHINE@ /out:"../../../Build/Release/libdns.dll"
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../isc/noatomic/include" /I "../../../../openssl-0.9.8l/inc32" /I "../../../../libxml2-2.7.3/include" /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ @GEOIP_INC@ /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @USE_OPENSSL@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /FR @COPTY@ /FD /GZ /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.8l/out32dll/libeay32.lib /nologo /dll /map /debug /machine:I386 /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ @GEOIP_LIB@ /nologo /dll /map /debug @MACHINE@ /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "libdns - Win32 Release"
-# Name "libdns - Win32 Debug"
+# Name "libdns - @PLATFORM@ Release"
+# Name "libdns - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -192,6 +192,12 @@ SOURCE=..\include\dns\fixedname.h
 
 SOURCE=..\include\dns\forward.h
 # End Source File
+@IF GEOIP
+# Begin Source File
+
+SOURCE=..\include\dns\geoip.h
+# End Source File
+@END GEOIP
 # Begin Source File
 
 SOURCE=..\include\dns\iptable.h
@@ -508,6 +514,12 @@ SOURCE=..\ds.c
 
 SOURCE=..\forward.c
 # End Source File
+@IF GEOIP
+# Begin Source File
+
+SOURCE=..\geoip.c
+# End Source File
+@END GEOIP
 # Begin Source File
 
 SOURCE=..\iptable.c
@@ -770,6 +782,10 @@ SOURCE=..\openssldsa_link.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\opensslecdsa_link.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\opensslgost_link.c
 # End Source File
 # Begin Source File
similarity index 74%
rename from lib/dns/win32/libdns.mak
rename to lib/dns/win32/libdns.mak.in
index ab869329d38f5e1f86c24017229ee8dbe7e8b49d..ae3db21585a0f5dbfbcf84967167015b3578c030 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on libdns.dsp
 !IF "$(CFG)" == ""
-CFG=libdns - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to libdns - Win32 Debug.
+CFG=libdns - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to libdns - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "libdns - Win32 Release" && "$(CFG)" != "libdns - Win32 Debug"
+!IF "$(CFG)" != "libdns - @PLATFORM@ Release" && "$(CFG)" != "libdns - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libdns.mak" CFG="libdns - Win32 Debug"
+!MESSAGE NMAKE /f "libdns.mak" CFG="libdns - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libdns - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libdns - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libdns - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libdns - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -25,7 +25,7 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -100,7 +100,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -111,12 +111,12 @@ ALL : "..\..\..\Build\Release\libdns.dll"
 
 !ELSE 
 
-ALL : "libisc - Win32 Release" "..\..\..\Build\Release\libdns.dll"
+ALL : "libisc - @PLATFORM@ Release" "..\..\..\Build\Release\libdns.dll"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - Win32 ReleaseCLEAN" 
+CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -163,6 +163,7 @@ CLEAN :
        -@erase "$(INTDIR)\openssl_link.obj"
        -@erase "$(INTDIR)\openssldh_link.obj"
        -@erase "$(INTDIR)\openssldsa_link.obj"
+       -@erase "$(INTDIR)\opensslecdsa_link.obj"
        -@erase "$(INTDIR)\opensslgost_link.obj"
        -@erase "$(INTDIR)\opensslrsa_link.obj"
        -@erase "$(INTDIR)\order.obj"
@@ -211,8 +212,9 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+LIBXML=@LIBXML2_LIB@
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../../openssl-0.9.8l/inc32" /I "../../../../libxml2-2.7.3/include" /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @USE_OPENSSL@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -252,7 +254,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.8l/out32dll/libeay32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" /machine:I386 /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) ../../isc/win32/Release/libisc.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" @MACHINE@ /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 
 DEF_FILE= \
        ".\libdns.def"
 LINK32_OBJS= \
@@ -338,6 +340,7 @@ LINK32_OBJS= \
        "$(INTDIR)\openssl_link.obj" \
        "$(INTDIR)\openssldh_link.obj" \
        "$(INTDIR)\openssldsa_link.obj" \
+       "$(INTDIR)\opensslecdsa_link.obj" \
        "$(INTDIR)\opensslgost_link.obj" \
        "$(INTDIR)\opensslrsa_link.obj" \
        "..\..\isc\win32\Release\libisc.lib"
@@ -348,7 +351,7 @@ LINK32_OBJS= \
 <<
   $(_VC_MANIFEST_EMBED_DLL)
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -362,12 +365,12 @@ ALL : "..\..\..\Build\Debug\libdns.dll" "$(OUTDIR)\libdns.bsc"
 
 !ELSE 
 
-ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libdns.dll" "$(OUTDIR)\libdns.bsc"
+ALL : "libisc - @PLATFORM@ Debug" "..\..\..\Build\Debug\libdns.dll" "$(OUTDIR)\libdns.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - Win32 DebugCLEAN" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -459,6 +462,8 @@ CLEAN :
        -@erase "$(INTDIR)\openssldh_link.sbr"
        -@erase "$(INTDIR)\openssldsa_link.obj"
        -@erase "$(INTDIR)\openssldsa_link.sbr"
+       -@erase "$(INTDIR)\opensslecdsa_link.obj"
+       -@erase "$(INTDIR)\opensslecdsa_link.sbr"
        -@erase "$(INTDIR)\opensslgost_link.obj"
        -@erase "$(INTDIR)\opensslgost_link.sbr"
        -@erase "$(INTDIR)\opensslrsa_link.obj"
@@ -554,7 +559,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../../openssl-0.9.8l/inc32" /I "../../../../libxml2-2.7.3/include" /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @USE_OPENSSL@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -674,6 +679,7 @@ BSC32_SBRS= \
        "$(INTDIR)\openssl_link.sbr" \
        "$(INTDIR)\openssldh_link.sbr" \
        "$(INTDIR)\openssldsa_link.sbr" \
+       "$(INTDIR)\opensslecdsa_link.sbr" \
        "$(INTDIR)\opensslgost_link.sbr" \
        "$(INTDIR)\opensslrsa_link.sbr"
 
@@ -683,7 +689,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.8l/out32dll/libeay32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug /machine:I386 /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) ../../isc/win32/debug/libisc.lib @OPENSSL_LIB@ @GSSAPI_LIB@ @KRB5_LIB@ /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug @MACHINE@ /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 
 DEF_FILE= \
        ".\libdns.def"
 LINK32_OBJS= \
@@ -769,6 +775,7 @@ LINK32_OBJS= \
        "$(INTDIR)\openssl_link.obj" \
        "$(INTDIR)\openssldh_link.obj" \
        "$(INTDIR)\openssldsa_link.obj" \
+       "$(INTDIR)\opensslecdsa_link.obj" \
        "$(INTDIR)\opensslgost_link.obj" \
        "$(INTDIR)\opensslrsa_link.obj" \
        "..\..\isc\win32\Debug\libisc.lib"
@@ -791,17 +798,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "libdns - Win32 Release" || "$(CFG)" == "libdns - Win32 Debug"
+!IF "$(CFG)" == "libdns - @PLATFORM@ Release" || "$(CFG)" == "libdns - @PLATFORM@ Debug"
 SOURCE=..\acache.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\acache.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\acache.obj" "$(INTDIR)\acache.sbr" : $(SOURCE) "$(INTDIR)"
@@ -812,14 +819,14 @@ SOURCE=..\acache.c
 
 SOURCE=..\acl.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\acl.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\acl.obj"    "$(INTDIR)\acl.sbr" : $(SOURCE) "$(INTDIR)"
@@ -830,14 +837,14 @@ SOURCE=..\acl.c
 
 SOURCE=..\adb.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\adb.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\adb.obj"    "$(INTDIR)\adb.sbr" : $(SOURCE) "$(INTDIR)"
@@ -848,14 +855,14 @@ SOURCE=..\adb.c
 
 SOURCE=..\byaddr.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\byaddr.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\byaddr.obj" "$(INTDIR)\byaddr.sbr" : $(SOURCE) "$(INTDIR)"
@@ -866,14 +873,14 @@ SOURCE=..\byaddr.c
 
 SOURCE=..\cache.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\cache.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\cache.obj"  "$(INTDIR)\cache.sbr" : $(SOURCE) "$(INTDIR)"
@@ -884,14 +891,14 @@ SOURCE=..\cache.c
 
 SOURCE=..\callbacks.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\callbacks.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\callbacks.obj"      "$(INTDIR)\callbacks.sbr" : $(SOURCE) "$(INTDIR)"
@@ -902,14 +909,14 @@ SOURCE=..\callbacks.c
 
 SOURCE=..\compress.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\compress.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\compress.obj"       "$(INTDIR)\compress.sbr" : $(SOURCE) "$(INTDIR)"
@@ -920,14 +927,14 @@ SOURCE=..\compress.c
 
 SOURCE=..\db.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\db.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\db.obj"     "$(INTDIR)\db.sbr" : $(SOURCE) "$(INTDIR)"
@@ -938,14 +945,14 @@ SOURCE=..\db.c
 
 SOURCE=..\dbiterator.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dbiterator.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dbiterator.obj"     "$(INTDIR)\dbiterator.sbr" : $(SOURCE) "$(INTDIR)"
@@ -956,14 +963,14 @@ SOURCE=..\dbiterator.c
 
 SOURCE=..\dbtable.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dbtable.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dbtable.obj"        "$(INTDIR)\dbtable.sbr" : $(SOURCE) "$(INTDIR)"
@@ -974,14 +981,14 @@ SOURCE=..\dbtable.c
 
 SOURCE=..\diff.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\diff.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\diff.obj"   "$(INTDIR)\diff.sbr" : $(SOURCE) "$(INTDIR)"
@@ -992,9 +999,9 @@ SOURCE=..\diff.c
 
 SOURCE=..\dispatch.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
-CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.8l/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../isc/noatomic/include" /I "../../../../openssl-0.9.8l/inc32" /I "../../../../libxml2-2.7.3/include" /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ /D "NDEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @USE_OPENSSL@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 "$(INTDIR)\dispatch.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) @<<
@@ -1002,9 +1009,9 @@ CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.8l/inc32/ope
 <<
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
-CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../isc/noatomic/include" /I "../../../../openssl-0.9.8l/inc32" /I "../../../../libxml2-2.7.3/include" /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_SWITCHES=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" @OPENSSL_INC@ @LIBXML2_INC@ @GSSAPI_INC@ /D "_DEBUG" /D "BIND9" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" @USE_OPENSSL@ @USE_GSSAPI@ @USE_ISC_SPNEGO@ /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 "$(INTDIR)\dispatch.obj"       "$(INTDIR)\dispatch.sbr" : $(SOURCE) "$(INTDIR)"
        $(CPP) @<<
@@ -1016,13 +1023,13 @@ CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include
 
 SOURCE=..\dlz.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dlz.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 "$(INTDIR)\dlz.obj"    "$(INTDIR)\dlz.sbr" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1032,13 +1039,13 @@ SOURCE=..\dlz.c
 
 SOURCE=.\DLLMain.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\DLLMain.obj"        "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1048,14 +1055,14 @@ SOURCE=.\DLLMain.c
 
 SOURCE=..\dns64.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dns64.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dns64.obj"  "$(INTDIR)\dns64.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1066,14 +1073,14 @@ SOURCE=..\dns64.c
 
 SOURCE=..\dnssec.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dnssec.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dnssec.obj" "$(INTDIR)\dnssec.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1084,14 +1091,14 @@ SOURCE=..\dnssec.c
 
 SOURCE=..\ds.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ds.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ds.obj"     "$(INTDIR)\ds.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1102,14 +1109,14 @@ SOURCE=..\ds.c
 
 SOURCE=..\forward.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\forward.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\forward.obj"        "$(INTDIR)\forward.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1120,14 +1127,14 @@ SOURCE=..\forward.c
 
 SOURCE=..\iptable.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\iptable.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\iptable.obj"        "$(INTDIR)\iptable.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1138,14 +1145,14 @@ SOURCE=..\iptable.c
 
 SOURCE=..\journal.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\journal.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\journal.obj"        "$(INTDIR)\journal.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1156,14 +1163,14 @@ SOURCE=..\journal.c
 
 SOURCE=..\keydata.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\keydata.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\keydata.obj"        "$(INTDIR)\keydata.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1174,14 +1181,14 @@ SOURCE=..\keydata.c
 
 SOURCE=..\keytable.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\keytable.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\keytable.obj"       "$(INTDIR)\keytable.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1192,14 +1199,14 @@ SOURCE=..\keytable.c
 
 SOURCE=..\lib.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lib.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lib.obj"    "$(INTDIR)\lib.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1210,14 +1217,14 @@ SOURCE=..\lib.c
 
 SOURCE=..\log.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\log.obj"    "$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1228,14 +1235,14 @@ SOURCE=..\log.c
 
 SOURCE=..\lookup.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lookup.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lookup.obj" "$(INTDIR)\lookup.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1246,14 +1253,14 @@ SOURCE=..\lookup.c
 
 SOURCE=..\master.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\master.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\master.obj" "$(INTDIR)\master.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1264,14 +1271,14 @@ SOURCE=..\master.c
 
 SOURCE=..\masterdump.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\masterdump.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\masterdump.obj"     "$(INTDIR)\masterdump.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1282,14 +1289,14 @@ SOURCE=..\masterdump.c
 
 SOURCE=..\message.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\message.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\message.obj"        "$(INTDIR)\message.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1300,14 +1307,14 @@ SOURCE=..\message.c
 
 SOURCE=..\name.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\name.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\name.obj"   "$(INTDIR)\name.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1318,14 +1325,14 @@ SOURCE=..\name.c
 
 SOURCE=..\ncache.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ncache.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ncache.obj" "$(INTDIR)\ncache.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1336,14 +1343,14 @@ SOURCE=..\ncache.c
 
 SOURCE=..\nsec.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\nsec.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\nsec.obj"   "$(INTDIR)\nsec.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1354,14 +1361,14 @@ SOURCE=..\nsec.c
 
 SOURCE=..\nsec3.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\nsec3.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\nsec3.obj"  "$(INTDIR)\nsec3.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1372,14 +1379,14 @@ SOURCE=..\nsec3.c
 
 SOURCE=..\order.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\order.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\order.obj"  "$(INTDIR)\order.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1390,14 +1397,14 @@ SOURCE=..\order.c
 
 SOURCE=..\peer.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\peer.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\peer.obj"   "$(INTDIR)\peer.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1409,14 +1416,14 @@ SOURCE=..\peer.c
 
 SOURCE=..\portlist.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\portlist.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\portlist.obj"       "$(INTDIR)\portlist.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1428,14 +1435,14 @@ SOURCE=..\portlist.c
 
 SOURCE=..\private.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\private.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\private.obj"        "$(INTDIR)\portlist.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1446,14 +1453,14 @@ SOURCE=..\private.c
 
 SOURCE=..\rbt.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rbt.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rbt.obj"    "$(INTDIR)\rbt.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1464,14 +1471,14 @@ SOURCE=..\rbt.c
 
 SOURCE=..\rbtdb.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rbtdb.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rbtdb.obj"  "$(INTDIR)\rbtdb.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1482,14 +1489,14 @@ SOURCE=..\rbtdb.c
 
 SOURCE=..\rbtdb64.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rbtdb64.obj" : $(SOURCE) "$(INTDIR)" "..\rbtdb.c"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rbtdb64.obj"        "$(INTDIR)\rbtdb64.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1500,14 +1507,14 @@ SOURCE=..\rbtdb64.c
 
 SOURCE=..\rcode.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rcode.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rcode.obj"  "$(INTDIR)\rcode.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1518,14 +1525,14 @@ SOURCE=..\rcode.c
 
 SOURCE=..\rdata.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rdata.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rdata.obj"  "$(INTDIR)\rdata.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1536,14 +1543,14 @@ SOURCE=..\rdata.c
 
 SOURCE=..\rdatalist.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rdatalist.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rdatalist.obj"      "$(INTDIR)\rdatalist.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1554,14 +1561,14 @@ SOURCE=..\rdatalist.c
 
 SOURCE=..\rdataset.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rdataset.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rdataset.obj"       "$(INTDIR)\rdataset.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1572,14 +1579,14 @@ SOURCE=..\rdataset.c
 
 SOURCE=..\rdatasetiter.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rdatasetiter.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rdatasetiter.obj"   "$(INTDIR)\rdatasetiter.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1590,14 +1597,14 @@ SOURCE=..\rdatasetiter.c
 
 SOURCE=..\rdataslab.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rdataslab.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rdataslab.obj"      "$(INTDIR)\rdataslab.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1608,14 +1615,14 @@ SOURCE=..\rdataslab.c
 
 SOURCE=..\request.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\request.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\request.obj"        "$(INTDIR)\request.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1626,14 +1633,14 @@ SOURCE=..\request.c
 
 SOURCE=..\resolver.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\resolver.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\resolver.obj"       "$(INTDIR)\resolver.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1644,14 +1651,14 @@ SOURCE=..\resolver.c
 
 SOURCE=..\result.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\result.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\result.obj" "$(INTDIR)\result.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1662,14 +1669,14 @@ SOURCE=..\result.c
 
 SOURCE=..\rootns.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rootns.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rootns.obj" "$(INTDIR)\rootns.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1680,14 +1687,14 @@ SOURCE=..\rootns.c
 
 SOURCE=..\rpz.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rpz.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rpz.obj"    "$(INTDIR)\rpz.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1698,14 +1705,14 @@ SOURCE=..\rpz.c
 
 SOURCE=..\rriterator.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rriterator.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rriterator.obj"     "$(INTDIR)\rriterator.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1716,14 +1723,14 @@ SOURCE=..\rriterator.c
 
 SOURCE=..\sdb.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\sdb.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\sdb.obj"    "$(INTDIR)\sdb.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1734,14 +1741,14 @@ SOURCE=..\sdb.c
 
 SOURCE=..\sdlz.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\sdlz.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\sdlz.obj"   "$(INTDIR)\sdlz.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1752,14 +1759,14 @@ SOURCE=..\sdlz.c
 
 SOURCE=..\soa.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\soa.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\soa.obj"    "$(INTDIR)\soa.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1770,14 +1777,14 @@ SOURCE=..\soa.c
 
 SOURCE=..\ssu.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ssu.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ssu.obj"    "$(INTDIR)\ssu.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1788,14 +1795,14 @@ SOURCE=..\ssu.c
 
 SOURCE=..\ssu_external.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ssu_external.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ssu_external.obj"   "$(INTDIR)\ssu_external.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1806,14 +1813,14 @@ SOURCE=..\ssu_external.c
 
 SOURCE=..\stats.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\stats.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\stats.obj"  "$(INTDIR)\stats.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1824,14 +1831,14 @@ SOURCE=..\stats.c
 
 SOURCE=..\tcpmsg.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\tcpmsg.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\tcpmsg.obj" "$(INTDIR)\tcpmsg.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1842,14 +1849,14 @@ SOURCE=..\tcpmsg.c
 
 SOURCE=..\time.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\time.obj"   "$(INTDIR)\time.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1860,14 +1867,14 @@ SOURCE=..\time.c
 
 SOURCE=..\timer.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\timer.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\timer.obj"  "$(INTDIR)\timer.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1878,14 +1885,14 @@ SOURCE=..\timer.c
 
 SOURCE=..\tkey.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\tkey.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\tkey.obj"   "$(INTDIR)\tkey.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1896,14 +1903,14 @@ SOURCE=..\tkey.c
 
 SOURCE=..\tsig.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\tsig.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\tsig.obj"   "$(INTDIR)\tsig.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1914,14 +1921,14 @@ SOURCE=..\tsig.c
 
 SOURCE=..\ttl.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ttl.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ttl.obj"    "$(INTDIR)\ttl.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1930,16 +1937,37 @@ SOURCE=..\ttl.c
 
 !ENDIF 
 
+<<<<<<< HEAD:lib/dns/win32/libdns.mak
+=======
+SOURCE=..\update.c
+
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
+
+
+"$(INTDIR)\update.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\update.obj" "$(INTDIR)\update.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+>>>>>>> 3b38a23... 3681.   [port]          Update the Windows build system to support feature:lib/dns/win32/libdns.mak.in
 SOURCE=..\validator.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\validator.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\validator.obj"      "$(INTDIR)\validator.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1950,13 +1978,13 @@ SOURCE=..\validator.c
 
 SOURCE=.\version.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\version.obj"        "$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1966,14 +1994,14 @@ SOURCE=.\version.c
 
 SOURCE=..\view.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\view.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\view.obj"   "$(INTDIR)\view.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1984,14 +2012,14 @@ SOURCE=..\view.c
 
 SOURCE=..\xfrin.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\xfrin.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\xfrin.obj"  "$(INTDIR)\xfrin.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2002,14 +2030,14 @@ SOURCE=..\xfrin.c
 
 SOURCE=..\zone.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\zone.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\zone.obj"   "$(INTDIR)\zone.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2020,14 +2048,14 @@ SOURCE=..\zone.c
 
 SOURCE=..\zonekey.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\zonekey.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\zonekey.obj"        "$(INTDIR)\zonekey.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2038,14 +2066,14 @@ SOURCE=..\zonekey.c
 
 SOURCE=..\zt.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\zt.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\zt.obj"     "$(INTDIR)\zt.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2056,14 +2084,14 @@ SOURCE=..\zt.c
 
 SOURCE=..\dst_api.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dst_api.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dst_api.obj"        "$(INTDIR)\dst_api.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2074,14 +2102,14 @@ SOURCE=..\dst_api.c
 
 SOURCE=..\dst_lib.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dst_lib.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dst_lib.obj"        "$(INTDIR)\dst_lib.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2092,14 +2120,14 @@ SOURCE=..\dst_lib.c
 
 SOURCE=..\dst_parse.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dst_parse.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dst_parse.obj"      "$(INTDIR)\dst_parse.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2110,14 +2138,14 @@ SOURCE=..\dst_parse.c
 
 SOURCE=..\dst_result.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dst_result.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dst_result.obj"     "$(INTDIR)\dst_result.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2128,14 +2156,14 @@ SOURCE=..\dst_result.c
 
 SOURCE=..\gssapi_link.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\gssapi_link.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\gssapi_link.obj"    "$(INTDIR)\gssapi_link.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2146,14 +2174,14 @@ SOURCE=..\gssapi_link.c
 
 SOURCE=..\gssapictx.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\gssapictx.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\gssapictx.obj"      "$(INTDIR)\gssapictx.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2164,14 +2192,14 @@ SOURCE=..\gssapictx.c
 
 SOURCE=..\spnego.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\spnego.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\spnego.obj" "$(INTDIR)\spnego.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2182,14 +2210,14 @@ SOURCE=..\spnego.c
 
 SOURCE=..\hmac_link.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\hmac_link.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\hmac_link.obj"      "$(INTDIR)\hmac_link.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2200,14 +2228,14 @@ SOURCE=..\hmac_link.c
 
 SOURCE=..\key.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\key.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\key.obj"    "$(INTDIR)\key.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2218,14 +2246,14 @@ SOURCE=..\key.c
 
 SOURCE=..\openssl_link.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\openssl_link.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\openssl_link.obj"   "$(INTDIR)\openssl_link.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2236,14 +2264,14 @@ SOURCE=..\openssl_link.c
 
 SOURCE=..\openssldh_link.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\openssldh_link.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\openssldh_link.obj" "$(INTDIR)\openssldh_link.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2254,32 +2282,50 @@ SOURCE=..\openssldh_link.c
 
 SOURCE=..\openssldsa_link.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\openssldsa_link.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\openssldsa_link.obj"        "$(INTDIR)\openssldsa_link.sbr" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\opensslecdsa_link.c
+
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
+
+
+"$(INTDIR)\opensslecdsa_link.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\opensslecdsa_link.obj"      "$(INTDIR)\opensslecdsa_link.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 SOURCE=..\opensslgost_link.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\opensslgost_link.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\opensslgost_link.obj"       "$(INTDIR)\opensslgost_link.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2290,14 +2336,14 @@ SOURCE=..\opensslgost_link.c
 
 SOURCE=..\opensslrsa_link.c
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
 
 "$(INTDIR)\opensslrsa_link.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\opensslrsa_link.obj"        "$(INTDIR)\opensslrsa_link.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2306,28 +2352,28 @@ SOURCE=..\opensslrsa_link.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "libdns - Win32 Release"
+!IF  "$(CFG)" == "libdns - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\dns\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\dns\win32"
 
-!ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libdns - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\dns\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\dns\win32"
 
 !ENDIF 
diff --git a/lib/dns/win32/libdns.vcxproj.filters.in b/lib/dns/win32/libdns.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..99b871f
--- /dev/null
@@ -0,0 +1,592 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+    <Filter Include="Library Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Dst Header Files">\r
+      <UniqueIdentifier>{c76276a2-cee5-4b70-bf37-e0f2ef1ae4d6}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Dst Source Files">\r
+      <UniqueIdentifier>{ae84c9c7-5da5-4c0e-9e53-bfc34a5825ae}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Library Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="libdns.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="DLLMain.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="version.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\acache.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\acl.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\adb.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\byaddr.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\cache.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\callbacks.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\clientinfo.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\compress.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\db.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dbiterator.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dbtable.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\diff.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dispatch.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dlz.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dns64.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dnssec.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\ds.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\forward.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+@IF GEOIP\r
+    <ClCompile Include="..\geoip.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+@END GEOIP\r
+    <ClCompile Include="..\iptable.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\journal.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\keydata.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\keytable.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lib.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\log.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lookup.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\master.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\masterdump.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\message.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\name.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\ncache.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\nsec.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\nsec3.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\order.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\peer.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\portlist.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\private.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rbt.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rbtdb.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rbtdb64.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rcode.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rdata.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rdatalist.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rdataset.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rdatasetiter.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rdataslab.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\request.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\resolver.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\result.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rootns.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rpz.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rriterator.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rrl.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\sdb.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\sdlz.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\soa.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\ssu.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\ssu_external.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\stats.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\tcpmsg.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\time.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\timer.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\tkey.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\tsig.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\ttl.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\update.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\validator.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\view.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\xfrin.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\zone.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\zonekey.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\zt.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dst_api.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dst_lib.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dst_parse.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\dst_result.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\gssapi_link.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\gssapictx.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\hmac_link.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\key.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\openssl_link.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\openssldh_link.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\openssldsa_link.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\opensslecdsa_link.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\opensslgost_link.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\opensslrsa_link.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\spnego.c">\r
+      <Filter>Dst Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\code.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\rbtdb.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\rbtdb64.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\acache.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\acl.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\adb.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\bit.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\byaddr.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\cache.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\callbacks.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\cert.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\clientinfo.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\compress.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\db.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\dbiterator.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\dbtable.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\diff.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\dispatch.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\dlz.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\dns64.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\dnssec.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\ds.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\dsdigest.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\enumclass.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\enumtype.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\events.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\fixedname.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\forward.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+@IF GEOIP\r
+    <ClInclude Include="..\include\dns\geoip.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+@END GEOIP\r
+    <ClInclude Include="..\include\dns\iptable.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\journal.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\keydata.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\keyflags.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\keytable.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\keyvalues.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\lib.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\log.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\lookup.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\master.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\masterdump.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\message.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\name.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\ncache.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\nsec.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\nsec3.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\opcode.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\order.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\peer.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\portlist.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\private.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rbt.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rcode.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rdata.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rdataclass.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rdatalist.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rdataset.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rdatasetiter.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rdataslab.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rdatastruct.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rdatatype.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\request.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\resolver.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\result.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rootns.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rpz.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rriterator.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\rrl.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\sdb.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\sdlz.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\secalg.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\secproto.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\soa.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\ssu.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\stats.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\tcpmsg.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\time.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\timer.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\tkey.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\tsig.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\ttl.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\types.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\update.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\validator.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\version.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\view.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\xfrin.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\zone.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\zonekey.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dns\zt.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dst\dst.h">\r
+      <Filter>Dst Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dst\gssapi.h">\r
+      <Filter>Dst Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dst\lib.h">\r
+      <Filter>Dst Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\dst\result.h">\r
+      <Filter>Dst Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\dst_internal.h">\r
+      <Filter>Dst Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\dst_openssl.h">\r
+      <Filter>Dst Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\dst_parse.h">\r
+      <Filter>Dst Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\spnego.h">\r
+      <Filter>Dst Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/dns/win32/libdns.vcxproj.in b/lib/dns/win32/libdns.vcxproj.in
new file mode 100644 (file)
index 0000000..07f0c98
--- /dev/null
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>libdns</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>BIND9;WIN32;USE_MD5;@USE_OPENSSL@@USE_GSSAPI@@USE_ISC_SPNEGO@_DEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>BIND9;WIN32;USE_MD5;@USE_OPENSSL@@USE_GSSAPI@@USE_ISC_SPNEGO@NDEBUG;_WINDOWS;_USRDLL;LIBDNS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;@LIBXML2_INC@@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;@LIBXML2_LIB@@OPENSSL_LIB@@GSSAPI_LIB@@KRB5_LIB@@GEOIP_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <None Include="libdns.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\acache.c" />\r
+    <ClCompile Include="..\acl.c" />\r
+    <ClCompile Include="..\adb.c" />\r
+    <ClCompile Include="..\byaddr.c" />\r
+    <ClCompile Include="..\cache.c" />\r
+    <ClCompile Include="..\callbacks.c" />\r
+    <ClCompile Include="..\clientinfo.c" />\r
+    <ClCompile Include="..\compress.c" />\r
+    <ClCompile Include="..\db.c" />\r
+    <ClCompile Include="..\dbiterator.c" />\r
+    <ClCompile Include="..\dbtable.c" />\r
+    <ClCompile Include="..\diff.c" />\r
+    <ClCompile Include="..\dispatch.c" />\r
+    <ClCompile Include="..\dlz.c" />\r
+    <ClCompile Include="..\dns64.c" />\r
+    <ClCompile Include="..\dnssec.c" />\r
+    <ClCompile Include="..\ds.c" />\r
+    <ClCompile Include="..\dst_api.c" />\r
+    <ClCompile Include="..\dst_lib.c" />\r
+    <ClCompile Include="..\dst_parse.c" />\r
+    <ClCompile Include="..\dst_result.c" />\r
+    <ClCompile Include="..\forward.c" />\r
+@IF GEOIP\r
+    <ClCompile Include="..\geoip.c" />\r
+@END GEOIP\r
+    <ClCompile Include="..\gssapictx.c" />\r
+    <ClCompile Include="..\gssapi_link.c" />\r
+    <ClCompile Include="..\hmac_link.c" />\r
+    <ClCompile Include="..\iptable.c" />\r
+    <ClCompile Include="..\journal.c" />\r
+    <ClCompile Include="..\key.c" />\r
+    <ClCompile Include="..\keydata.c" />\r
+    <ClCompile Include="..\keytable.c" />\r
+    <ClCompile Include="..\lib.c" />\r
+    <ClCompile Include="..\log.c" />\r
+    <ClCompile Include="..\lookup.c" />\r
+    <ClCompile Include="..\master.c" />\r
+    <ClCompile Include="..\masterdump.c" />\r
+    <ClCompile Include="..\message.c" />\r
+    <ClCompile Include="..\name.c" />\r
+    <ClCompile Include="..\ncache.c" />\r
+    <ClCompile Include="..\nsec.c" />\r
+    <ClCompile Include="..\nsec3.c" />\r
+    <ClCompile Include="..\openssldh_link.c" />\r
+    <ClCompile Include="..\openssldsa_link.c" />\r
+    <ClCompile Include="..\opensslecdsa_link.c" />\r
+    <ClCompile Include="..\opensslgost_link.c" />\r
+    <ClCompile Include="..\opensslrsa_link.c" />\r
+    <ClCompile Include="..\openssl_link.c" />\r
+    <ClCompile Include="..\order.c" />\r
+    <ClCompile Include="..\peer.c" />\r
+    <ClCompile Include="..\portlist.c" />\r
+    <ClCompile Include="..\private.c" />\r
+    <ClCompile Include="..\rbt.c" />\r
+    <ClCompile Include="..\rbtdb.c" />\r
+    <ClCompile Include="..\rbtdb64.c" />\r
+    <ClCompile Include="..\rcode.c" />\r
+    <ClCompile Include="..\rdata.c" />\r
+    <ClCompile Include="..\rdatalist.c" />\r
+    <ClCompile Include="..\rdataset.c" />\r
+    <ClCompile Include="..\rdatasetiter.c" />\r
+    <ClCompile Include="..\rdataslab.c" />\r
+    <ClCompile Include="..\request.c" />\r
+    <ClCompile Include="..\resolver.c" />\r
+    <ClCompile Include="..\result.c" />\r
+    <ClCompile Include="..\rootns.c" />\r
+    <ClCompile Include="..\rpz.c" />\r
+    <ClCompile Include="..\rriterator.c" />\r
+    <ClCompile Include="..\rrl.c" />\r
+    <ClCompile Include="..\sdb.c" />\r
+    <ClCompile Include="..\sdlz.c" />\r
+    <ClCompile Include="..\soa.c" />\r
+    <ClCompile Include="..\spnego.c" />\r
+    <ClCompile Include="..\ssu.c" />\r
+    <ClCompile Include="..\ssu_external.c" />\r
+    <ClCompile Include="..\stats.c" />\r
+    <ClCompile Include="..\tcpmsg.c" />\r
+    <ClCompile Include="..\time.c" />\r
+    <ClCompile Include="..\timer.c" />\r
+    <ClCompile Include="..\tkey.c" />\r
+    <ClCompile Include="..\tsig.c" />\r
+    <ClCompile Include="..\ttl.c" />\r
+    <ClCompile Include="..\update.c" />\r
+    <ClCompile Include="..\validator.c" />\r
+    <ClCompile Include="..\view.c" />\r
+    <ClCompile Include="..\xfrin.c" />\r
+    <ClCompile Include="..\zone.c" />\r
+    <ClCompile Include="..\zonekey.c" />\r
+    <ClCompile Include="..\zt.c" />\r
+    <ClCompile Include="DLLMain.c" />\r
+    <ClCompile Include="version.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\code.h" />\r
+    <ClInclude Include="..\dst_internal.h" />\r
+    <ClInclude Include="..\dst_openssl.h" />\r
+    <ClInclude Include="..\dst_parse.h" />\r
+    <ClInclude Include="..\include\dns\acache.h" />\r
+    <ClInclude Include="..\include\dns\acl.h" />\r
+    <ClInclude Include="..\include\dns\adb.h" />\r
+    <ClInclude Include="..\include\dns\bit.h" />\r
+    <ClInclude Include="..\include\dns\byaddr.h" />\r
+    <ClInclude Include="..\include\dns\cache.h" />\r
+    <ClInclude Include="..\include\dns\callbacks.h" />\r
+    <ClInclude Include="..\include\dns\cert.h" />\r
+    <ClInclude Include="..\include\dns\clientinfo.h" />\r
+    <ClInclude Include="..\include\dns\compress.h" />\r
+    <ClInclude Include="..\include\dns\db.h" />\r
+    <ClInclude Include="..\include\dns\dbiterator.h" />\r
+    <ClInclude Include="..\include\dns\dbtable.h" />\r
+    <ClInclude Include="..\include\dns\diff.h" />\r
+    <ClInclude Include="..\include\dns\dispatch.h" />\r
+    <ClInclude Include="..\include\dns\dlz.h" />\r
+    <ClInclude Include="..\include\dns\dns64.h" />\r
+    <ClInclude Include="..\include\dns\dnssec.h" />\r
+    <ClInclude Include="..\include\dns\ds.h" />\r
+    <ClInclude Include="..\include\dns\dsdigest.h" />\r
+    <ClInclude Include="..\include\dns\enumclass.h" />\r
+    <ClInclude Include="..\include\dns\enumtype.h" />\r
+    <ClInclude Include="..\include\dns\events.h" />\r
+    <ClInclude Include="..\include\dns\fixedname.h" />\r
+    <ClInclude Include="..\include\dns\forward.h" />\r
+@IF GEOIP\r
+    <ClInclude Include="..\include\dns\geoip.h" />\r
+@END GEOIP\r
+    <ClInclude Include="..\include\dns\iptable.h" />\r
+    <ClInclude Include="..\include\dns\journal.h" />\r
+    <ClInclude Include="..\include\dns\keydata.h" />\r
+    <ClInclude Include="..\include\dns\keyflags.h" />\r
+    <ClInclude Include="..\include\dns\keytable.h" />\r
+    <ClInclude Include="..\include\dns\keyvalues.h" />\r
+    <ClInclude Include="..\include\dns\lib.h" />\r
+    <ClInclude Include="..\include\dns\log.h" />\r
+    <ClInclude Include="..\include\dns\lookup.h" />\r
+    <ClInclude Include="..\include\dns\master.h" />\r
+    <ClInclude Include="..\include\dns\masterdump.h" />\r
+    <ClInclude Include="..\include\dns\message.h" />\r
+    <ClInclude Include="..\include\dns\name.h" />\r
+    <ClInclude Include="..\include\dns\ncache.h" />\r
+    <ClInclude Include="..\include\dns\nsec.h" />\r
+    <ClInclude Include="..\include\dns\nsec3.h" />\r
+    <ClInclude Include="..\include\dns\opcode.h" />\r
+    <ClInclude Include="..\include\dns\order.h" />\r
+    <ClInclude Include="..\include\dns\peer.h" />\r
+    <ClInclude Include="..\include\dns\portlist.h" />\r
+    <ClInclude Include="..\include\dns\private.h" />\r
+    <ClInclude Include="..\include\dns\rbt.h" />\r
+    <ClInclude Include="..\include\dns\rcode.h" />\r
+    <ClInclude Include="..\include\dns\rdata.h" />\r
+    <ClInclude Include="..\include\dns\rdataclass.h" />\r
+    <ClInclude Include="..\include\dns\rdatalist.h" />\r
+    <ClInclude Include="..\include\dns\rdataset.h" />\r
+    <ClInclude Include="..\include\dns\rdatasetiter.h" />\r
+    <ClInclude Include="..\include\dns\rdataslab.h" />\r
+    <ClInclude Include="..\include\dns\rdatastruct.h" />\r
+    <ClInclude Include="..\include\dns\rdatatype.h" />\r
+    <ClInclude Include="..\include\dns\request.h" />\r
+    <ClInclude Include="..\include\dns\resolver.h" />\r
+    <ClInclude Include="..\include\dns\result.h" />\r
+    <ClInclude Include="..\include\dns\rootns.h" />\r
+    <ClInclude Include="..\include\dns\rpz.h" />\r
+    <ClInclude Include="..\include\dns\rriterator.h" />\r
+    <ClInclude Include="..\include\dns\rrl.h" />\r
+    <ClInclude Include="..\include\dns\sdb.h" />\r
+    <ClInclude Include="..\include\dns\sdlz.h" />\r
+    <ClInclude Include="..\include\dns\secalg.h" />\r
+    <ClInclude Include="..\include\dns\secproto.h" />\r
+    <ClInclude Include="..\include\dns\soa.h" />\r
+    <ClInclude Include="..\include\dns\ssu.h" />\r
+    <ClInclude Include="..\include\dns\stats.h" />\r
+    <ClInclude Include="..\include\dns\tcpmsg.h" />\r
+    <ClInclude Include="..\include\dns\time.h" />\r
+    <ClInclude Include="..\include\dns\timer.h" />\r
+    <ClInclude Include="..\include\dns\tkey.h" />\r
+    <ClInclude Include="..\include\dns\tsig.h" />\r
+    <ClInclude Include="..\include\dns\ttl.h" />\r
+    <ClInclude Include="..\include\dns\types.h" />\r
+    <ClInclude Include="..\include\dns\update.h" />\r
+    <ClInclude Include="..\include\dns\validator.h" />\r
+    <ClInclude Include="..\include\dns\version.h" />\r
+    <ClInclude Include="..\include\dns\view.h" />\r
+    <ClInclude Include="..\include\dns\xfrin.h" />\r
+    <ClInclude Include="..\include\dns\zone.h" />\r
+    <ClInclude Include="..\include\dns\zonekey.h" />\r
+    <ClInclude Include="..\include\dns\zt.h" />\r
+    <ClInclude Include="..\include\dst\dst.h" />\r
+    <ClInclude Include="..\include\dst\gssapi.h" />\r
+    <ClInclude Include="..\include\dst\lib.h" />\r
+    <ClInclude Include="..\include\dst\result.h" />\r
+    <ClInclude Include="..\rbtdb.h" />\r
+    <ClInclude Include="..\rbtdb64.h" />\r
+    <ClInclude Include="..\spnego.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/dns/win32/libdns.vcxproj.user b/lib/dns/win32/libdns.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 6f4684d37eed4916759886b04147026c5ca7d660..f800c881e5902d6335af8643fd524ba5bb82b8f2 100644 (file)
@@ -11531,7 +11531,7 @@ zone_namerd_tostr(dns_zone_t *zone, char *buf, size_t length) {
        /*
         * Leave space for terminating '\0'.
         */
-       isc_buffer_init(&buffer, buf, length - 1);
+       isc_buffer_init(&buffer, buf, (unsigned int)length - 1);
        if (dns_name_dynamic(&zone->origin))
                result = dns_name_totext(&zone->origin, ISC_TRUE, &buffer);
        if (result != ISC_R_SUCCESS &&
@@ -11563,7 +11563,7 @@ zone_name_tostr(dns_zone_t *zone, char *buf, size_t length) {
        /*
         * Leave space for terminating '\0'.
         */
-       isc_buffer_init(&buffer, buf, length - 1);
+       isc_buffer_init(&buffer, buf, (unsigned int)length - 1);
        if (dns_name_dynamic(&zone->origin))
                result = dns_name_totext(&zone->origin, ISC_TRUE, &buffer);
        if (result != ISC_R_SUCCESS &&
@@ -11583,7 +11583,7 @@ zone_rdclass_tostr(dns_zone_t *zone, char *buf, size_t length) {
        /*
         * Leave space for terminating '\0'.
         */
-       isc_buffer_init(&buffer, buf, length - 1);
+       isc_buffer_init(&buffer, buf, (unsigned int)length - 1);
        (void)dns_rdataclass_totext(zone->rdclass, &buffer);
 
        buf[isc_buffer_usedlength(&buffer)] = '\0';
@@ -11600,7 +11600,7 @@ zone_viewname_tostr(dns_zone_t *zone, char *buf, size_t length) {
        /*
         * Leave space for terminating '\0'.
         */
-       isc_buffer_init(&buffer, buf, length - 1);
+       isc_buffer_init(&buffer, buf, (unsigned int)length - 1);
 
        if (zone->view == NULL) {
                isc_buffer_putstr(&buffer, "_none");
index d2f044cb8c4c2f2456815b9a717f91e978f2fd61..2c7f6f9df8313400e52a4898d29539eeff04b3b3 100644 (file)
@@ -51,6 +51,8 @@
 #define BACKTRACE_LIBC
 #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__ia64__))
 #define BACKTRACE_GCC
+#elif defined(WIN32)
+#define BACKTRACE_WIN32
 #elif defined(__x86_64__) || defined(__i386__)
 #define BACKTRACE_X86STACK
 #else
@@ -127,6 +129,14 @@ isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) {
 
        return (ISC_R_SUCCESS);
 }
+#elif defined(BACKTRACE_WIN32)
+isc_result_t
+isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) {
+       unsigned long ftc = (unsigned long)maxaddrs;
+
+       *nframes = (int)CaptureStackBackTrace(1, ftc, addrs, NULL);
+       return ISC_R_SUCCESS;
+}
 #elif defined(BACKTRACE_X86STACK)
 #ifdef __x86_64__
 static unsigned long
@@ -278,7 +288,8 @@ isc_backtrace_getsymbol(const void *addr, const char **symbolp,
                result = ISC_R_NOTFOUND;
        else {
                *symbolp = found->symbol;
-               *offsetp = (const char *)addr - (char *)found->addr;
+               *offsetp = (unsigned long) ((const char *)addr -
+                                           (char *)found->addr);
        }
 
        return (result);
index d25e3c4716bbe3ffec344b7d16279c809c04ac48..361847a9c5524eaf79dadea735049050ed399d41 100644 (file)
@@ -166,7 +166,7 @@ base32_decode_char(base32_decode_ctx_t *ctx, int c) {
                return (ISC_R_BADBASE32);
        if ((s = strchr(ctx->base, c)) == NULL)
                return (ISC_R_BADBASE32);
-       last = s - ctx->base;
+       last = (unsigned int)(s - ctx->base);
        /*
         * Handle lower case.
         */
index bad1565bea7b329fbe46720a8a419d3b22459f66..78a7c8a3f1ed103f0cb80e406c83059149088fd7 100644 (file)
@@ -124,7 +124,7 @@ base64_decode_char(base64_decode_ctx_t *ctx, int c) {
                return (ISC_R_BADBASE64);
        if ((s = strchr(base64, c)) == NULL)
                return (ISC_R_BADBASE64);
-       ctx->val[ctx->digits++] = s - base64;
+       ctx->val[ctx->digits++] = (int)(s - base64);
        if (ctx->digits == 4) {
                int n;
                unsigned char buf[3];
index f1d68c7700f50205075490d441058dd90750cbd6..92814a37e2f984fbd52744a7f5bc6c3266544355 100644 (file)
@@ -94,7 +94,7 @@ struct isc_hash {
        isc_boolean_t   initialized;
        isc_refcount_t  refcnt;
        isc_entropy_t   *entropy; /*%< entropy source */
-       unsigned int    limit;  /*%< upper limit of key length */
+       size_t          limit;  /*%< upper limit of key length */
        size_t          vectorlen; /*%< size of the vector below */
        hash_random_t   *rndvector; /*%< random vector for universal hashing */
 };
@@ -140,7 +140,7 @@ static unsigned char maptolower[] = {
 
 isc_result_t
 isc_hash_ctxcreate(isc_mem_t *mctx, isc_entropy_t *entropy,
-                  unsigned int limit, isc_hash_t **hctxp)
+                  size_t limit, isc_hash_t **hctxp)
 {
        isc_result_t result;
        isc_hash_t *hctx;
@@ -250,7 +250,8 @@ isc_hash_ctxinit(isc_hash_t *hctx) {
                isc_result_t result;
 
                result = isc_entropy_getdata(hctx->entropy,
-                                            hctx->rndvector, hctx->vectorlen,
+                                            hctx->rndvector,
+                                            (unsigned int)hctx->vectorlen,
                                             NULL, 0);
                INSIST(result == ISC_R_SUCCESS);
 #else
@@ -258,7 +259,7 @@ isc_hash_ctxinit(isc_hash_t *hctx) {
 #endif
        } else {
                isc_uint32_t pr;
-               unsigned int i, copylen;
+               size_t i, copylen;
                unsigned char *p;
 
                p = (unsigned char *)hctx->rndvector;
index ebadd2fd807cc5ac222f33d3c63d893396515769..da659997804121ec80c0832ebeca5057015670e6 100644 (file)
@@ -123,7 +123,7 @@ isc_heap_destroy(isc_heap_t **heapp) {
 static isc_boolean_t
 resize(isc_heap_t *heap) {
        void **new_array;
-       size_t new_size;
+       unsigned int new_size;
 
        REQUIRE(VALID_HEAP(heap));
 
index 3fa0e699fa553c49c0d5e07d1b50726cce532b8b..7f0ebb5160d30ac9d61f6990ea970bf88ab05222 100644 (file)
@@ -99,7 +99,7 @@ hex_decode_char(hex_decode_ctx_t *ctx, int c) {
 
        if ((s = strchr(hex, toupper(c))) == NULL)
                return (ISC_R_BADHEX);
-       ctx->val[ctx->digits++] = s - hex;
+       ctx->val[ctx->digits++] = (int)(s - hex);
        if (ctx->digits == 2) {
                unsigned char num;
 
index 92ea96eceb7e1259401be25855e9f512cfa14c47..8bad50ba819812c367a7a4f65a22bf078eab2fa4 100644 (file)
@@ -326,6 +326,16 @@ isc_file_splitpath(isc_mem_t *mctx, char *path,
  * - ISC_R_NOMEMORY if unable to allocate memory
  */
 
+isc_result_t
+isc_file_getsizefd(int fd, off_t *size);
+/*%<
+ * Return the size of the file (stored in the parameter pointed
+ * to by 'size') in bytes.
+ *
+ * Returns:
+ * - ISC_R_SUCCESS on success
+ */
+
 ISC_LANG_ENDDECLS
 
 #endif /* ISC_FILE_H */
index ca04b4e43c754e08d8976ba3a90efe67cd017e60..3b420b0ef772b1054ca156490e4e8a5074a00372 100644 (file)
@@ -82,7 +82,7 @@
 ISC_LANG_BEGINDECLS
 
 isc_result_t
-isc_hash_ctxcreate(isc_mem_t *mctx, isc_entropy_t *entropy, unsigned int limit,
+isc_hash_ctxcreate(isc_mem_t *mctx, isc_entropy_t *entropy, size_t limit,
                   isc_hash_t **hctx);
 isc_result_t
 isc_hash_create(isc_mem_t *mctx, isc_entropy_t *entropy, size_t limit);
index 03c2710bac354154aa6e2c0f59013fc3c7ffb053..feb827a9ed9497ca2760d7527d0bf6ff04f63a2e 100644 (file)
 #define LIBISCCC_EXTERNAL_DATA
 #define LIBISCCFG_EXTERNAL_DATA
 #define LIBBIND9_EXTERNAL_DATA
+#define LIBTESTS_EXTERNAL_DATA
 #else /*! \brief ISC_PLATFORM_USEDECLSPEC */
 #ifdef LIBISC_EXPORTS
 #define LIBISC_EXTERNAL_DATA __declspec(dllexport)
 #else
 #define LIBBIND9_EXTERNAL_DATA __declspec(dllimport)
 #endif
+#ifdef LIBTESTS_EXPORTS
+#define LIBTESTS_EXTERNAL_DATA __declspec(dllexport)
+#else
+#define LIBTESTS_EXTERNAL_DATA __declspec(dllimport)
+#endif
 #endif /*! \brief ISC_PLATFORM_USEDECLSPEC */
 
 /*
index 66a108dc4274f87adc41a54ad21b6fe7f759601e..cfe2e7767d0341b46849be362673e444d2fecc99 100644 (file)
@@ -92,7 +92,8 @@ static char rcsid[] = "$Id: inet_aton.c,v 1.23 2008/12/01 23:47:45 tbox Exp $";
 int
 isc_net_aton(const char *cp, struct in_addr *addr) {
        isc_uint32_t val;
-       int base, n;
+       int base;
+       ptrdiff_t n;
        unsigned char c;
        isc_uint8_t parts[4];
        isc_uint8_t *pp = parts;
index 6bada239e0e5e69a8930cbcb15808ca0cda08a3e..9654b8292e00570c2116ab84914d7480fd78eefb 100644 (file)
@@ -91,8 +91,9 @@ inet_pton4(const char *src, unsigned char *dst) {
                const char *pch;
 
                if ((pch = strchr(digits, ch)) != NULL) {
-                       unsigned int new = *tp * 10 + (pch - digits);
+                       unsigned int new = *tp * 10;
 
+                       new += (int)(pch - digits);
                        if (saw_digit && *tp == 0)
                                return (0);
                        if (new > 255)
@@ -196,7 +197,7 @@ inet_pton6(const char *src, unsigned char *dst) {
                 * Since some memmove()'s erroneously fail to handle
                 * overlapping regions, we'll do the shift by hand.
                 */
-               const int n = tp - colonp;
+               const int n = (int)(tp - colonp);
                int i;
 
                if (tp == endp)
index 88e9cd4a3898b6b516d3e1cf0beec30d294b0d3a..a4bfcd1e78b4cf195261f127c9aff1ddfbce5784 100644 (file)
@@ -210,7 +210,7 @@ new_source(isc_lex_t *lex, isc_boolean_t is_file, isc_boolean_t need_close,
        }
        source->pushback = NULL;
        result = isc_buffer_allocate(lex->mctx, &source->pushback,
-                                    lex->max_token);
+                                    (unsigned int)lex->max_token);
        if (result != ISC_R_SUCCESS) {
                isc_mem_free(lex->mctx, source->name);
                isc_mem_put(lex->mctx, source, sizeof(*source));
@@ -615,8 +615,9 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
                                                v->as_textregion.base =
                                                        lex->data;
                                                v->as_textregion.length =
-                                                       lex->max_token -
-                                                       remaining;
+                                                       (unsigned int)
+                                                       (lex->max_token -
+                                                        remaining);
                                        } else
                                                goto done;
                                        done = ISC_TRUE;
@@ -659,7 +660,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
                                tokenp->type = isc_tokentype_string;
                                tokenp->value.as_textregion.base = lex->data;
                                tokenp->value.as_textregion.length =
-                                       lex->max_token - remaining;
+                                       (unsigned int)
+                                       (lex->max_token - remaining);
                                done = ISC_TRUE;
                                continue;
                        }
@@ -744,7 +746,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
                                        tokenp->value.as_textregion.base =
                                                lex->data;
                                        tokenp->value.as_textregion.length =
-                                               lex->max_token - remaining;
+                                               (unsigned int)
+                                               (lex->max_token - remaining);
                                        no_comments = ISC_FALSE;
                                        done = ISC_TRUE;
                                }
index c9e63cc5bfe917fbca0932a0b1d614aa0ede7837..d1b8b1e00f2cfbf500afb538f0c3570c3ec2f255 100644 (file)
@@ -1145,7 +1145,7 @@ greatest_version(isc_logchannel_t *channel, int *greatestp) {
        char *basename, *digit_end;
        const char *dirname;
        int version, greatest = -1;
-       unsigned int basenamelen;
+       size_t basenamelen;
        isc_dir_t dir;
        isc_result_t result;
        char sep = '/';
index 20fec46c7cbfcf45db24e8245289407d8268c7df..4e0873cd7ec7d8662a1e6562b1472f659b1a59be 100644 (file)
@@ -68,7 +68,7 @@ typedef struct debuglink debuglink_t;
 struct debuglink {
        ISC_LINK(debuglink_t)   link;
        const void             *ptr[DEBUGLIST_COUNT];
-       unsigned int            size[DEBUGLIST_COUNT];
+       size_t                  size[DEBUGLIST_COUNT];
        const char             *file[DEBUGLIST_COUNT];
        unsigned int            line[DEBUGLIST_COUNT];
        unsigned int            count;
@@ -396,12 +396,10 @@ static struct isc__mempoolmethods {
  * mctx must be locked.
  */
 static inline void
-add_trace_entry(isc__mem_t *mctx, const void *ptr, unsigned int size
-               FLARG)
-{
+add_trace_entry(isc__mem_t *mctx, const void *ptr, size_t size FLARG) {
        debuglink_t *dl;
        unsigned int i;
-       unsigned int mysize = size;
+       size_t mysize = size;
 
        if ((isc_mem_debugging & ISC_MEM_DEBUGTRACE) != 0)
                fprintf(stderr, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM,
@@ -456,7 +454,7 @@ add_trace_entry(isc__mem_t *mctx, const void *ptr, unsigned int size
 }
 
 static inline void
-delete_trace_entry(isc__mem_t *mctx, const void *ptr, unsigned int size,
+delete_trace_entry(isc__mem_t *mctx, const void *ptr, size_t size,
                   const char *file, unsigned int line)
 {
        debuglink_t *dl;
@@ -623,7 +621,7 @@ more_frags(isc__mem_t *ctx, size_t new_size) {
        total_size = ctx->mem_target;
        new = ctx->basic_blocks;
        ctx->basic_blocks = ctx->basic_blocks->next;
-       frags = total_size / new_size;
+       frags = (int)(total_size / new_size);
        ctx->stats[new_size].blocks++;
        ctx->stats[new_size].freefrags += frags;
        /*
index 8b73ed56927d6bc9fb56c0c0a2574a1f956889f7..05bb168845a1436ad9cf19cff817a55367d4d870 100644 (file)
@@ -50,7 +50,7 @@ initialize_rand(void)
         */
        pid = ((pid << 16) & 0xffff0000) | ((pid >> 16) & 0xffff);
 
-       srand(time(NULL) ^ pid);
+       srand((unsigned)time(NULL) ^ pid);
 #endif
 }
 
index 7bb25d725f079fffd5fd9e2c3ccbdb9076c6020c..d88ca29a15ab61aedd62bffcb2843645be83e753 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -97,6 +97,33 @@ file_stats(const char *file, struct stat *stats) {
        return (result);
 }
 
+static isc_result_t
+fd_stats(int fd, struct stat *stats) {
+       isc_result_t result = ISC_R_SUCCESS;
+
+       REQUIRE(stats != NULL);
+
+       if (fstat(fd, stats) != 0)
+               result = isc__errno2result(errno);
+
+       return (result);
+}
+
+isc_result_t
+isc_file_getsizefd(int fd, off_t *size) {
+       isc_result_t result;
+       struct stat stats;
+
+       REQUIRE(size != NULL);
+
+       result = fd_stats(fd, &stats);
+
+       if (result == ISC_R_SUCCESS)
+               *size = stats.st_size;
+
+       return (result);
+}
+
 isc_result_t
 isc_file_mode(const char *file, mode_t *modep) {
        isc_result_t result;
index 44803275ff1232028a2d98d893f28bb5b1b1e079..4949633de6f2f4913b87bf813500e2de368006c4 100644 (file)
@@ -61,15 +61,17 @@ get_from_filesource(isc_entropysource_t *source, isc_uint32_t desired) {
        added = 0;
        while (desired > 0) {
                ndesired = ISC_MIN(desired, sizeof(buf));
-               if (!CryptGenRandom(hcryptprov, ndesired, buf)) {
+               if (!CryptGenRandom(hcryptprov, (DWORD)ndesired, buf)) {
                        CryptReleaseContext(hcryptprov, 0);
                        source->bad = ISC_TRUE;
                        goto out;
                }
 
-               entropypool_adddata(ent, buf, ndesired, ndesired * 8);
-               added += ndesired * 8;
-               desired -= ndesired;
+               entropypool_adddata(ent, buf,
+                                   (unsigned int)ndesired,
+                                   (unsigned int)ndesired * 8);
+               added += (unsigned int)ndesired * 8;
+               desired -= (isc_uint32_t)ndesired;
        }
 
  out:
index b9f3c884efbaf7bf4bebb137c43cad35cef03992..ede94d60639c321e4f2732668429c8fd3a55283d 100644 (file)
@@ -278,7 +278,7 @@ isc_file_template(const char *path, const char *templet, char *buf,
        s = strrchr(path, '\\');
 
        if (s != NULL) {
-               if ((s - path + 1 + strlen(templet) + 1) > buflen)
+         if ((s - path + 1 + strlen(templet) + 1) > (ssize_t)buflen)
                        return (ISC_R_NOSPACE);
 
                strncpy(buf, path, s - path + 1);
@@ -555,7 +555,7 @@ isc_file_absolutepath(const char *filename, char *path, size_t pathlen) {
        REQUIRE(filename != NULL);
        REQUIRE(path != NULL);
 
-       retval = GetFullPathName(filename, pathlen, path, &ptrname);
+       retval = GetFullPathName(filename, (DWORD) pathlen, path, &ptrname);
 
        /* Something went wrong in getting the path */
        if (retval == 0)
diff --git a/lib/isc/win32/include/isc/atomic.h b/lib/isc/win32/include/isc/atomic.h
new file mode 100644 (file)
index 0000000..1c99c44
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id$ */
+
+#ifndef ISC_ATOMIC_H
+#define ISC_ATOMIC_H 1
+
+#include <config.h>
+#include <isc/platform.h>
+#include <isc/types.h>
+
+/*
+ * This routine atomically increments the value stored in 'p' by 'val', and
+ * returns the previous value.
+ */
+#ifdef ISC_PLATFORM_HAVEXADD
+static __inline isc_int32_t
+isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) {
+       return (isc_int32_t) _InterlockedExchangeAdd((long *)p, (long)val);
+}
+#endif
+
+#ifdef ISC_PLATFORM_HAVEXADDQ
+static __inline isc_int64_t
+isc_atomic_xaddq(isc_int64_t *p, isc_int64_t val) {
+       return (isc_int64_t) _InterlockedExchangeAdd64((__int64 *)p,
+                                                      (__int64) val);
+}
+#endif
+
+/*
+ * This routine atomically stores the value 'val' in 'p'.
+ */
+#ifdef ISC_PLATFORM_HAVEATOMICSTORE
+static __inline void
+isc_atomic_store(isc_int32_t *p, isc_int32_t val) {
+       (void) _InterlockedExchange((long *)p, (long)val);
+}
+#endif
+
+/*
+ * This routine atomically replaces the value in 'p' with 'val', if the
+ * original value is equal to 'cmpval'.  The original value is returned in any
+ * case.
+ */
+#ifdef ISC_PLATFORM_HAVECMPXCHG
+static __inline isc_int32_t
+isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) {
+       /* beware: swap arguments */
+       return (isc_int32_t) _InterlockedCompareExchange((long *)p,
+                                                        (long)val,
+                                                        (long)cmpval);
+}
+#endif
+
+#endif /* ISC_ATOMIC_H */
similarity index 75%
rename from lib/isc/win32/include/isc/platform.h
rename to lib/isc/win32/include/isc/platform.h.in
index d632d3cf7e581982b51b06e87180321f2d4fc726..2e1d055a69677fa4c8300a2eddbb7fbe572e2c21 100644 (file)
  */
 #undef ISC_PLATFORM_HAVESYSUNH
 
+/*
+ * Define if we want to log backtrace
+ */
+@ISC_PLATFORM_USEBACKTRACE@
+
 /*
  * Defines for the noreturn attribute.
  */
 #define ISC_PLATFORM_NORETURN_PRE __declspec(noreturn)
 #define ISC_PLATFORM_NORETURN_POST
 
- /*
+/*
+ * Define if the hash functions must be provided by OpenSSL.
+ */
+@ISC_PLATFORM_OPENSSLHASH@
+
+/*
+ * If the "xadd" operation is available on this architecture,
+ * ISC_PLATFORM_HAVEXADD will be defined.
+ */
+@ISC_PLATFORM_HAVEXADD@
+
+/*
+ * If the "xaddq" operation (64bit xadd) is available on this architecture,
+ * ISC_PLATFORM_HAVEXADDQ will be defined.
+ */
+@ISC_PLATFORM_HAVEXADDQ@
+
+/*
+ * If the "atomic swap" operation is available on this architecture,
+ * ISC_PLATFORM_HAVEATOMICSTORE" will be defined.
+ */
+@ISC_PLATFORM_HAVEATOMICSTORE@
+
+/*
+ * If the "compare-and-exchange" operation is available on this architecture,
+ * ISC_PLATFORM_HAVECMPXCHG will be defined.
+ */
+@ISC_PLATFORM_HAVECMPXCHG@
+
+/*
  * Set up a macro for importing and exporting from the DLL
  */
 
 #define LIBBIND9_EXTERNAL_DATA __declspec(dllimport)
 #endif
 
+#ifdef LIBTESTS_EXPORTS
+#define LIBTESTS_EXTERNAL_DATA __declspec(dllexport)
+#else
+#define LIBTESTS_EXTERNAL_DATA __declspec(dllimport)
+#endif
+
 #endif /* ISC_PLATFORM_H */
index 58ef8836390d6bd475a68aa6b32f60699dfb8ce2..9dfa6b7ffd6916a398766cf14bc39c09192b41ff 100644 (file)
@@ -59,7 +59,7 @@ void InitSockets(void);
 struct isc_interfaceiter {
        unsigned int            magic;          /* Magic number. */
        isc_mem_t               *mctx;
-       int                     socket;
+       SOCKET                  socket;
        INTERFACE_INFO          IFData;         /* Current Interface Info */
        int                     numIF;          /* Current Interface count */
        int                     v4IF;           /* Number of IPv4 Interfaces */
@@ -137,7 +137,8 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
         * Create an unbound datagram socket to do the
         * SIO_GET_INTERFACE_LIST WSAIoctl on.
         */
-       if ((iter->socket = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+       iter->socket = socket(AF_INET, SOCK_DGRAM, 0);
+       if (iter->socket == INVALID_SOCKET) {
                error = WSAGetLastError();
                if (error == WSAEAFNOSUPPORT)
                        goto inet6_only;
@@ -217,7 +218,8 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
         * Create an unbound datagram socket to do the
         * SIO_ADDRESS_LIST_QUERY WSAIoctl on.
         */
-       if ((iter->socket = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+       iter->socket = socket(AF_INET6, SOCK_DGRAM, 0);
+       if (iter->socket == INVALID_SOCKET) {
                error = WSAGetLastError();
                if (error == WSAEAFNOSUPPORT)
                        goto inet_only;
@@ -291,7 +293,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
                isc_mem_put(mctx, iter->buf4, iter->buf4size);
 
  alloc_failure:
-       if (iter->socket >= 0)
+       if (iter->socket != INVALID_SOCKET)
                (void) closesocket(iter->socket);
 
  socket_failure:
similarity index 98%
rename from lib/isc/win32/libisc.def
rename to lib/isc/win32/libisc.def.in
index 05def78bc0f1887c6f13e36dfc2478732af38f23..0d260ecf01c9fc2f58ee6bde1cbee19fd1a3a446 100644 (file)
@@ -187,6 +187,7 @@ isc_condition_waituntil
 isc_dir_chdir
 isc_dir_chroot
 isc_dir_close
+isc_dir_createunique
 isc_dir_init
 isc_dir_open
 isc_dir_read
@@ -366,7 +367,9 @@ isc_md5_final
 isc_md5_init
 isc_md5_invalidate
 isc_md5_update
+@IF LIBXML2
 isc_mem_renderxml
+@END LIBXML2
 isc_msgcat_close
 isc_msgcat_get
 isc_msgcat_open
@@ -505,7 +508,9 @@ isc_sockaddr_pf
 isc_sockaddr_setport
 isc_sockaddr_totext
 isc_sockaddr_v6fromin
+@IF LIBXML2
 isc_socketmgr_renderxml
+@END LIBXML2
 isc_stats_attach
 isc_stats_create
 isc_stats_decrement
@@ -539,7 +544,9 @@ isc_symtab_destroy
 isc_symtab_lookup
 isc_symtab_undefine
 isc_syslog_facilityfromstring
+@IF LIBXML2
 isc_taskmgr_renderxml
+@END LIBXML2
 isc_taskpool_create
 isc_taskpool_destroy
 isc_taskpool_expand
@@ -572,7 +579,7 @@ isc_win32os_servicepackminor
 isc_win32os_versioncheck
 openlog
 syslog
-
+@IF NOLONGER
 ; Exported Data
 
 EXPORTS
@@ -584,4 +591,4 @@ isc_commandline_option              DATA
 isc_commandline_progname       DATA
 isc_commandline_reset          DATA
 isc_mem_debugging              DATA
-                       
+@END NOLONGER
similarity index 88%
rename from lib/isc/win32/libisc.dsp
rename to lib/isc/win32/libisc.dsp.in
index fad2f46ea09ad0a5caff89d309f818d2967f623b..7adb419f9fd5a94298a9e5d096f5970c64b2aa3b 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
 
-CFG=libisc - Win32 Debug
+CFG=libisc - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=libisc - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libisc.mak" CFG="libisc - Win32 Debug"
+!MESSAGE NMAKE /f "libisc.mak" CFG="libisc - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libisc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libisc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisc - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libisc - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "BIND9" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "include" /I "../include" /I "../noatomic/include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "BIND9" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,12 +52,11 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ../../../../libxml2-2.7.3/win32/bin.msvc/libxml2.lib 
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisc.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libisc.dll"
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -70,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "include" /I "../include" /I "../noatomic/include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "win32" /I "../../isccfg/include" /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR @COPTY@ /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,16 +79,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ../../../../libxml2-2.7.3/win32/bin.msvc/libxml2.lib 
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib /nologo /dll /map /debug /machine:I386 /out:"../../../Build/Debug/libisc.dll" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib ws2_32.lib /nologo /dll /map /debug @MACHINE@ /out:"../../../Build/Debug/libisc.dll" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "libisc - Win32 Release"
-# Name "libisc - Win32 Debug"
+# Name "libisc - @PLATFORM@ Release"
+# Name "libisc - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -806,10 +804,17 @@ SOURCE=..\timer.c
 SOURCE=.\win32os.c
 # End Source File
 # End Group
+@IF ATOMIC
+# Begin Source File
+
+SOURCE=.\include\atomic.h
+# End Source File
+@ELSE ATOMIC
 # Begin Source File
 
 SOURCE=..\noatomic\include\atomic.h
 # End Source File
+@END ATOMIC
 # Begin Source File
 
 SOURCE=.\libisc.def
similarity index 79%
rename from lib/isc/win32/libisc.mak
rename to lib/isc/win32/libisc.mak.in
index 8e2274052ebccd34406a80b1ed400fe50ea7ccc4..bb169f8a50b992a24d1914f835b4fa5db8445448 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on libisc.dsp
 !IF "$(CFG)" == ""
-CFG=libisc - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to libisc - Win32 Debug.
+CFG=libisc - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to libisc - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "libisc - Win32 Release" && "$(CFG)" != "libisc - Win32 Debug"
+!IF "$(CFG)" != "libisc - @PLATFORM@ Release" && "$(CFG)" != "libisc - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libisc.mak" CFG="libisc - Win32 Debug"
+!MESSAGE NMAKE /f "libisc.mak" CFG="libisc - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libisc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libisc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisc - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libisc - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -28,9 +28,9 @@ NULL=nul
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
-LIBXML=../../../../libxml2-2.7.3/win32/bin.msvc/libxml2.lib
+LIBXML=@LIBXML2_LIB@
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -105,7 +105,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -202,14 +202,14 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/noatomic/include" /I "win32" /I "../../isccfg/include" /I "../../../../libxml2-2.7.3/include" /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" @LIBXML2_INC@ /D "BIND9" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" /machine:I386 /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisc.pdb" @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Release/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" 
 DEF_FILE= \
        ".\libisc.def"
 LINK32_OBJS= \
@@ -299,7 +299,7 @@ LINK32_OBJS= \
 <<
   $(_VC_MANIFEST_EMBED_DLL)
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -483,7 +483,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/noatomic/include" /I "win32" /I "../../isccfg/include" /I "../../../../libxml2-2.7.3/include" /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "win32" /I "../../isccfg/include" @LIBXML2_INC@ /D "BIND9" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "LIBISC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc" 
@@ -574,7 +574,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug /machine:I386 /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib $(LIBXML) /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisc.pdb" /map:"$(INTDIR)\libisc.map" /debug @MACHINE@ /def:".\libisc.def" /out:"../../../Build/Debug/libisc.dll" /implib:"$(OUTDIR)\libisc.lib" /pdbtype:sept 
 DEF_FILE= \
        ".\libisc.def"
 LINK32_OBJS= \
@@ -706,16 +706,16 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "libisc - Win32 Release" || "$(CFG)" == "libisc - Win32 Debug"
+!IF "$(CFG)" == "libisc - @PLATFORM@ Release" || "$(CFG)" == "libisc - @PLATFORM@ Debug"
 SOURCE=.\app.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\app.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\app.obj"    "$(INTDIR)\app.sbr" : $(SOURCE) "$(INTDIR)"
@@ -725,13 +725,13 @@ SOURCE=.\app.c
 
 SOURCE=.\condition.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\condition.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\condition.obj"      "$(INTDIR)\condition.sbr" : $(SOURCE) "$(INTDIR)"
@@ -741,13 +741,13 @@ SOURCE=.\condition.c
 
 SOURCE=.\dir.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\dir.obj"    "$(INTDIR)\dir.sbr" : $(SOURCE) "$(INTDIR)"
@@ -757,13 +757,13 @@ SOURCE=.\dir.c
 
 SOURCE=.\DLLMain.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\DLLMain.obj"        "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
@@ -773,13 +773,13 @@ SOURCE=.\DLLMain.c
 
 SOURCE=.\entropy.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\entropy.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\entropy.obj"        "$(INTDIR)\entropy.sbr" : $(SOURCE) "$(INTDIR)"
@@ -789,13 +789,13 @@ SOURCE=.\entropy.c
 
 SOURCE=.\errno2result.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\errno2result.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\errno2result.obj"   "$(INTDIR)\errno2result.sbr" : $(SOURCE) "$(INTDIR)"
@@ -805,13 +805,13 @@ SOURCE=.\errno2result.c
 
 SOURCE=.\file.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\file.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\file.obj"   "$(INTDIR)\file.sbr" : $(SOURCE) "$(INTDIR)"
@@ -821,13 +821,13 @@ SOURCE=.\file.c
 
 SOURCE=.\fsaccess.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\fsaccess.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\fsaccess.obj"       "$(INTDIR)\fsaccess.sbr" : $(SOURCE) "$(INTDIR)"
@@ -837,13 +837,13 @@ SOURCE=.\fsaccess.c
 
 SOURCE=.\interfaceiter.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\interfaceiter.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\interfaceiter.obj"  "$(INTDIR)\interfaceiter.sbr" : $(SOURCE) "$(INTDIR)"
@@ -853,13 +853,13 @@ SOURCE=.\interfaceiter.c
 
 SOURCE=.\ipv6.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ipv6.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ipv6.obj"   "$(INTDIR)\ipv6.sbr" : $(SOURCE) "$(INTDIR)"
@@ -870,13 +870,13 @@ SOURCE=.\ipv6.c
 
 SOURCE=.\keyboard.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\keyboard.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\keyboard.obj"       "$(INTDIR)\keyboard.sbr" : $(SOURCE) "$(INTDIR)"
@@ -886,13 +886,13 @@ SOURCE=.\keyboard.c
 
 SOURCE=.\net.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\net.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\net.obj"    "$(INTDIR)\net.sbr" : $(SOURCE) "$(INTDIR)"
@@ -902,13 +902,13 @@ SOURCE=.\net.c
 
 SOURCE=.\ntpaths.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ntpaths.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ntpaths.obj"        "$(INTDIR)\ntpaths.sbr" : $(SOURCE) "$(INTDIR)"
@@ -918,13 +918,13 @@ SOURCE=.\ntpaths.c
 
 SOURCE=.\once.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\once.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\once.obj"   "$(INTDIR)\once.sbr" : $(SOURCE) "$(INTDIR)"
@@ -934,13 +934,13 @@ SOURCE=.\once.c
 
 SOURCE=.\os.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\os.obj"     "$(INTDIR)\os.sbr" : $(SOURCE) "$(INTDIR)"
@@ -950,13 +950,13 @@ SOURCE=.\os.c
 
 SOURCE=.\resource.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\resource.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\resource.obj"       "$(INTDIR)\resource.sbr" : $(SOURCE) "$(INTDIR)"
@@ -966,13 +966,13 @@ SOURCE=.\resource.c
 
 SOURCE=.\socket.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\socket.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\socket.obj" "$(INTDIR)\socket.sbr" : $(SOURCE) "$(INTDIR)"
@@ -982,13 +982,13 @@ SOURCE=.\socket.c
 
 SOURCE=.\stdio.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\stdio.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\stdio.obj"  "$(INTDIR)\stdio.sbr" : $(SOURCE) "$(INTDIR)"
@@ -998,13 +998,13 @@ SOURCE=.\stdio.c
 
 SOURCE=.\stdtime.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\stdtime.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\stdtime.obj"        "$(INTDIR)\stdtime.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1014,13 +1014,13 @@ SOURCE=.\stdtime.c
 
 SOURCE=.\strerror.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\strerror.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\strerror.obj"       "$(INTDIR)\strerror.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1030,13 +1030,13 @@ SOURCE=.\strerror.c
 
 SOURCE=.\syslog.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\syslog.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\syslog.obj" "$(INTDIR)\syslog.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1046,13 +1046,13 @@ SOURCE=.\syslog.c
 
 SOURCE=.\thread.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\thread.obj" "$(INTDIR)\thread.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1062,13 +1062,13 @@ SOURCE=.\thread.c
 
 SOURCE=.\time.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\time.obj"   "$(INTDIR)\time.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1078,13 +1078,13 @@ SOURCE=.\time.c
 
 SOURCE=.\version.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\version.obj"        "$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1094,13 +1094,13 @@ SOURCE=.\version.c
 
 SOURCE=.\win32os.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\win32os.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\win32os.obj"        "$(INTDIR)\win32os.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1110,14 +1110,14 @@ SOURCE=.\win32os.c
 
 SOURCE=..\assertions.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\assertions.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\assertions.obj"     "$(INTDIR)\assertions.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1128,14 +1128,14 @@ SOURCE=..\assertions.c
 
 SOURCE=..\backtrace.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\backtrace.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\backtrace.obj"      "$(INTDIR)\backtrace.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1146,14 +1146,14 @@ SOURCE=..\backtrace.c
 
 SOURCE=..\backtrace-emptytbl.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\backtrace-emptytbl.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\backtrace-emptytbl.obj"     "$(INTDIR)\backtrace-emptytbl.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1164,14 +1164,14 @@ SOURCE=..\backtrace-emptytbl.c
 
 SOURCE=..\base32.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\base32.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\base32.obj" "$(INTDIR)\base32.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1182,14 +1182,14 @@ SOURCE=..\base32.c
 
 SOURCE=..\base64.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\base64.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\base64.obj" "$(INTDIR)\base64.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1200,14 +1200,14 @@ SOURCE=..\base64.c
 
 SOURCE=..\bitstring.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\bitstring.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\bitstring.obj"      "$(INTDIR)\bitstring.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1218,14 +1218,14 @@ SOURCE=..\bitstring.c
 
 SOURCE=..\buffer.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\buffer.obj" "$(INTDIR)\buffer.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1236,14 +1236,14 @@ SOURCE=..\buffer.c
 
 SOURCE=..\bufferlist.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\bufferlist.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\bufferlist.obj"     "$(INTDIR)\bufferlist.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1254,14 +1254,14 @@ SOURCE=..\bufferlist.c
 
 SOURCE=..\commandline.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\commandline.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\commandline.obj"    "$(INTDIR)\commandline.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1272,14 +1272,14 @@ SOURCE=..\commandline.c
 
 SOURCE=..\error.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\error.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\error.obj"  "$(INTDIR)\error.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1290,14 +1290,14 @@ SOURCE=..\error.c
 
 SOURCE=..\event.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\event.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\event.obj"  "$(INTDIR)\event.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1308,14 +1308,14 @@ SOURCE=..\event.c
 
 SOURCE=..\hash.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\hash.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\hash.obj"   "$(INTDIR)\hash.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1326,14 +1326,14 @@ SOURCE=..\hash.c
 
 SOURCE=..\heap.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\heap.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\heap.obj"   "$(INTDIR)\heap.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1344,14 +1344,14 @@ SOURCE=..\heap.c
 
 SOURCE=..\hex.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\hex.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\hex.obj"    "$(INTDIR)\hex.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1362,14 +1362,14 @@ SOURCE=..\hex.c
 
 SOURCE=..\hmacmd5.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\hmacmd5.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\hmacmd5.obj"        "$(INTDIR)\hmacmd5.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1380,14 +1380,14 @@ SOURCE=..\hmacmd5.c
 
 SOURCE=..\hmacsha.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\hmacsha.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\hmacsha.obj"        "$(INTDIR)\hmacsha.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1398,14 +1398,14 @@ SOURCE=..\hmacsha.c
 
 SOURCE=..\httpd.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\httpd.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\httpd.obj"  "$(INTDIR)\httpd.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1416,14 +1416,14 @@ SOURCE=..\httpd.c
 
 SOURCE=..\inet_aton.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\inet_aton.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\inet_aton.obj"      "$(INTDIR)\inet_aton.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1434,14 +1434,14 @@ SOURCE=..\inet_aton.c
 
 SOURCE=..\inet_ntop.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\inet_ntop.obj"      "$(INTDIR)\inet_ntop.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1452,14 +1452,14 @@ SOURCE=..\inet_ntop.c
 
 SOURCE=..\inet_pton.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\inet_pton.obj"      "$(INTDIR)\inet_pton.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1470,14 +1470,14 @@ SOURCE=..\inet_pton.c
 
 SOURCE=..\iterated_hash.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\iterated_hash.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\iterated_hash.obj"  "$(INTDIR)\iterated_hash.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1488,14 +1488,14 @@ SOURCE=..\iterated_hash.c
 
 SOURCE=..\lex.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lex.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lex.obj"    "$(INTDIR)\lex.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1506,14 +1506,14 @@ SOURCE=..\lex.c
 
 SOURCE=..\lfsr.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lfsr.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lfsr.obj"   "$(INTDIR)\lfsr.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1524,14 +1524,14 @@ SOURCE=..\lfsr.c
 
 SOURCE=..\lib.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lib.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lib.obj"    "$(INTDIR)\lib.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1542,14 +1542,14 @@ SOURCE=..\lib.c
 
 SOURCE=..\log.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\log.obj"    "$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1560,14 +1560,14 @@ SOURCE=..\log.c
 
 SOURCE=..\md5.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\md5.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\md5.obj"    "$(INTDIR)\md5.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1578,14 +1578,14 @@ SOURCE=..\md5.c
 
 SOURCE=..\mem.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\mem.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\mem.obj"    "$(INTDIR)\mem.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1596,14 +1596,14 @@ SOURCE=..\mem.c
 
 SOURCE=..\nls\msgcat.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\msgcat.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\msgcat.obj" "$(INTDIR)\msgcat.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1614,14 +1614,14 @@ SOURCE=..\nls\msgcat.c
 
 SOURCE=..\mutexblock.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\mutexblock.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\mutexblock.obj"     "$(INTDIR)\mutexblock.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1632,14 +1632,14 @@ SOURCE=..\mutexblock.c
 
 SOURCE=..\netaddr.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\netaddr.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\netaddr.obj"        "$(INTDIR)\netaddr.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1650,14 +1650,14 @@ SOURCE=..\netaddr.c
 
 SOURCE=..\netscope.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\netscope.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\netscope.obj"       "$(INTDIR)\netscope.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1668,14 +1668,14 @@ SOURCE=..\netscope.c
 
 SOURCE=..\ondestroy.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ondestroy.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ondestroy.obj"      "$(INTDIR)\ondestroy.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1686,14 +1686,14 @@ SOURCE=..\ondestroy.c
 
 SOURCE=..\parseint.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\parseint.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\parseint.obj"       "$(INTDIR)\parseint.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1704,14 +1704,14 @@ SOURCE=..\parseint.c
 
 SOURCE=..\portset.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\portset.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\portset.obj"        "$(INTDIR)\portset.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1722,14 +1722,14 @@ SOURCE=..\portset.c
 
 SOURCE=..\quota.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\quota.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\quota.obj"  "$(INTDIR)\quota.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1740,14 +1740,14 @@ SOURCE=..\quota.c
 
 SOURCE=..\radix.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\radix.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\radix.obj"  "$(INTDIR)\radix.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1758,14 +1758,14 @@ SOURCE=..\radix.c
 
 SOURCE=..\random.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\random.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\random.obj" "$(INTDIR)\random.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1776,14 +1776,14 @@ SOURCE=..\random.c
 
 SOURCE=..\ratelimiter.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ratelimiter.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ratelimiter.obj"    "$(INTDIR)\ratelimiter.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1794,14 +1794,14 @@ SOURCE=..\ratelimiter.c
 
 SOURCE=..\refcount.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\refcount.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\refcount.obj"       "$(INTDIR)\refcount.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1812,14 +1812,14 @@ SOURCE=..\refcount.c
 
 SOURCE=..\regex.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\regex.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\regex.obj"  "$(INTDIR)\regex.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1831,14 +1831,14 @@ SOURCE=..\regex.c
 
 SOURCE=..\region.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\region.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\region.obj" "$(INTDIR)\region.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1849,14 +1849,14 @@ SOURCE=..\region.c
 
 SOURCE=..\result.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\result.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\result.obj" "$(INTDIR)\result.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1867,14 +1867,14 @@ SOURCE=..\result.c
 
 SOURCE=..\rwlock.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\rwlock.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\rwlock.obj" "$(INTDIR)\rwlock.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1903,14 +1903,14 @@ SOURCE=..\safe.c
 
 SOURCE=..\serial.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\serial.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\serial.obj" "$(INTDIR)\serial.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1921,14 +1921,14 @@ SOURCE=..\serial.c
 
 SOURCE=..\sha1.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\sha1.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\sha1.obj"   "$(INTDIR)\sha1.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1939,14 +1939,14 @@ SOURCE=..\sha1.c
 
 SOURCE=..\sha2.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\sha2.obj"   "$(INTDIR)\sha2.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1957,14 +1957,14 @@ SOURCE=..\sha2.c
 
 SOURCE=..\sockaddr.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\sockaddr.obj"       "$(INTDIR)\sockaddr.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1975,14 +1975,14 @@ SOURCE=..\sockaddr.c
 
 SOURCE=..\stats.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\stats.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\stats.obj"  "$(INTDIR)\stats.sbr" : $(SOURCE) "$(INTDIR)"
@@ -1993,14 +1993,14 @@ SOURCE=..\stats.c
 
 SOURCE=..\string.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\string.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\string.obj" "$(INTDIR)\string.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2011,14 +2011,14 @@ SOURCE=..\string.c
 
 SOURCE=..\symtab.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\symtab.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\symtab.obj" "$(INTDIR)\symtab.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2029,14 +2029,14 @@ SOURCE=..\symtab.c
 
 SOURCE=..\task.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\task.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\task.obj"   "$(INTDIR)\task.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2047,14 +2047,14 @@ SOURCE=..\task.c
 
 SOURCE=..\taskpool.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\taskpool.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\taskpool.obj"       "$(INTDIR)\taskpool.sbr" : $(SOURCE) "$(INTDIR)"
@@ -2065,14 +2065,14 @@ SOURCE=..\taskpool.c
 
 SOURCE=..\timer.c
 
-!IF  "$(CFG)" == "libisc - Win32 Release"
+!IF  "$(CFG)" == "libisc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\timer.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\timer.obj"  "$(INTDIR)\timer.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/lib/isc/win32/libisc.vcxproj.filters.in b/lib/isc/win32/libisc.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..ea3c2e3
--- /dev/null
@@ -0,0 +1,597 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Library Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Win32 Source Files">\r
+      <UniqueIdentifier>{289562c2-1bdd-4582-b6bd-3f598ee23cbd}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Win32 Header Files">\r
+      <UniqueIdentifier>{d03c3e6a-e78e-4a01-bd77-64c839b1adfe}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Library Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="libisc.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\isc\app.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\assertions.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\backtrace.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\base32.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\base64.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\bind9.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\bitstring.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\boolean.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\buffer.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\bufferlist.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\commandline.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\crc64.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\entropy.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\error.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\event.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\eventclass.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\file.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\formatcheck.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\fsaccess.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\hash.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\heap.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\hex.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\hmacmd5.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\hmacsha.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\httpd.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\interfaceiter.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\ipv6.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\iterated_hash.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\json.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\lang.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\lex.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\lfsr.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\lib.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\list.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\log.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\magic.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\md5.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\mem.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\msgcat.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\msgs.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\mutexblock.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\netaddr.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\netscope.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\ondestroy.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\os.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\parseint.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\pool.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\portset.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\print.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\queue.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\quota.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\radix.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\random.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\ratelimiter.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\refcount.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\regex.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\region.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\resource.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\result.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\resultclass.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\rwlock.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\serial.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\sha1.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\sha2.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\sockaddr.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\socket.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\stats.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\stdio.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\stdlib.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\string.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\symtab.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\task.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\taskpool.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\timer.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\types.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\util.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\version.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isc\xml.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\bind_registry.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\bindevt.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\condition.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\dir.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\int.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\ipv6.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\keyboard.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\mutex.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\net.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\netdb.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\ntgroups.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\ntpaths.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\offset.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\once.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\platform.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\stat.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\stdtime.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\strerror.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\syslog.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\thread.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\time.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\isc\win32os.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="errno2result.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="syslog.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="unistd.h">\r
+      <Filter>Win32 Header Files</Filter>\r
+    </ClInclude>\r
+@IF ATOMIC\r
+    <ClInclude Include="include\isc\atomic.h">\r
+@ELSE ATOMIC\r
+    <ClInclude Include="..\noatomic\include\isc\atomic.h">\r
+@END ATOMIC\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\config.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\versions.h">\r
+      <Filter>Library Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="app.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="condition.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="dir.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DLLMain.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="entropy.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="errno2result.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="file.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="fsaccess.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="interfaceiter.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ipv6.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="keyboard.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="net.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ntpaths.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="once.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="os.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="resource.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="socket.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="stdio.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="stdtime.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="strerror.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="syslog.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="thread.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="time.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="version.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="win32os.c">\r
+      <Filter>Win32 Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\assertions.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\backtrace.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\backtrace-emptytbl.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\base32.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\base64.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\bind9.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\bitstring.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\buffer.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\bufferlist.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\commandline.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\crc64.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\error.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\event.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\hash.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\heap.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\hex.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\hmacmd5.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\hmacsha.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\httpd.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\inet_aton.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\inet_ntop.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\inet_pton.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\iterated_hash.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lex.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lfsr.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lib.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\log.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\md5.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\mem.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\mutexblock.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\netaddr.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\netscope.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\ondestroy.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\parseint.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\pool.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\portset.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\nls\msgcat.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\quota.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\radix.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\random.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\ratelimiter.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\refcount.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\regex.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\region.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\result.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\rwlock.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\serial.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\sha1.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\sha2.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\sockaddr.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\stats.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\string.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\symtab.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\task.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\taskpool.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\timer.c">\r
+      <Filter>Library Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in
new file mode 100644 (file)
index 0000000..4e459ce
--- /dev/null
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{3840E563-D180-4761-AA9C-E6155F02EAFF}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>libisc</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>BIND9;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;win32;..\..\isccfg\include</AdditionalIncludeDirectories>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalDependencies>@LIBXML2_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+    </Link>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\..\win32utils\r
+\r
+if NOT Exist ..\Build mkdir ..\Build\r
+if NOT Exist ..\Build\Debug mkdir ..\Build\Debug\r
+\r
+@IF OPENSSL\r
+echo Copying the OpenSSL DLL.\r
+\r
+copy @OPENSSL_DLL@ ..\Build\Debug\\r
+@END OPENSSL\r
+\r
+@IF LIBXML2\r
+echo Copying the libxml DLL.\r
+\r
+copy @LIBXML2_DLL@ ..\Build\Debug\\r
+@END LIBXML2\r
+\r
+@IF GSSAPI\r
+echo Copying the GSSAPI and KRB5 DLLs.\r
+\r
+copy @GSSAPI_DLL@ ..\Build\Debug\\r
+copy @KRB5_DLL@ ..\Build\Debug\\r
+copy @COMERR_DLL@ ..\Build\Debug\\r
+copy @K5SPRT_DLL@ ..\Build\Debug\\r
+copy @WSHELP_DLL@ ..\Build\Debug\\r
+@END GSSAPI\r
+\r
+@IF GEOIP\r
+echo Copying the GeoIP DLL.\r
+\r
+copy @GEOIP_DLL@ ..\Build\Debug\\r
+@END GEOIP\r
+\r
+@IF IDNKIT\r
+echo Copying the IDN kit DLL.\r
+\r
+copy @IDN_DLL@ ..\Build\Debug\\r
+copy @ICONV_DLL@ ..\Build\Debug\\r
+@END IDNKIT\r
+\r
+echo Copying Visual C x86 Redistributable Installer.\r
+\r
+copy /Y @VCREDIST_PATH@        ..\Build\Debug\\r
+\r
+</Command>\r
+    </PreBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>BIND9;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBISC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;win32;..\..\isccfg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalDependencies>@LIBXML2_LIB@ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+    </Link>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\..\win32utils\r
+\r
+if NOT Exist ..\Build mkdir ..\Build\r
+if NOT Exist ..\Build\Release mkdir ..\Build\Release\r
+\r
+echo Copying the ARM and the Installation Notes.\r
+\r
+copy ..\COPYRIGHT ..\Build\Release\r
+copy ..\README ..\Build\Release\r
+copy ..\HISTORY ..\Build\Release\r
+copy readme1st.txt ..\Build\Release\r
+copy index.html ..\Build\Release\r
+copy ..\doc\arm\*.html ..\Build\Release\r
+copy ..\doc\arm\Bv9ARM.pdf ..\Build\Release\r
+copy ..\CHANGES ..\Build\Release\r
+if Exist ..\CHANGES.SE copy ..\CHANGES.SE ..\Build\Release\r
+copy ..\FAQ ..\Build\Release\r
+\r
+echo Copying the standalone manual pages.\r
+\r
+copy ..\bin\named\named.html ..\Build\Release\r
+copy ..\bin\rndc\*.html ..\Build\Release\r
+copy ..\bin\confgen\*.html ..\Build\Release\r
+copy ..\bin\dig\*.html ..\Build\Release\r
+copy ..\bin\nsupdate\*.html ..\Build\Release\r
+copy ..\bin\check\*.html ..\Build\Release\r
+copy ..\bin\dnssec\dnssec-keygen.html ..\Build\Release\r
+copy ..\bin\dnssec\dnssec-signzone.html ..\Build\Release\r
+copy ..\bin\dnssec\dnssec-dsfromkey.html ..\Build\Release\r
+copy ..\bin\dnssec\dnssec-keyfromlabel.html ..\Build\Release\r
+copy ..\bin\dnssec\dnssec-settime.html ..\Build\Release\r
+copy ..\bin\dnssec\dnssec-revoke.html ..\Build\Release\r
+copy ..\bin\dnssec\dnssec-verify.html ..\Build\Release\r
+copy ..\bin\pkcs11\pkcs11-keygen.html ..\Build\Release\r
+copy ..\bin\pkcs11\pkcs11-list.html ..\Build\Release\r
+copy ..\bin\pkcs11\pkcs11-destroy.html ..\Build\Release\r
+\r
+echo Copying the migration notes.\r
+\r
+copy ..\doc\misc\migration ..\Build\Release\r
+copy ..\doc\misc\migration-4to9 ..\Build\Release\r
+\r
+@IF OPENSSL\r
+echo Copying the OpenSSL DLL and LICENSE.\r
+\r
+copy @OPENSSL_DLL@ ..\Build\Release\\r
+copy @OPENSSL_PATH@\LICENSE ..\Build\Release\OpenSSL-LICENSE\r
+@END OPENSSL\r
+\r
+@IF LIBXML2\r
+echo Copying the libxml DLL.\r
+\r
+copy @LIBXML2_DLL@ ..\Build\Release\\r
+@END LIBXML2\r
+\r
+@IF GSSAPI\r
+echo Copying the GSSAPI and KRB5 DLLs.\r
+\r
+copy @GSSAPI_DLL@ ..\Build\Release\\r
+copy @KRB5_DLL@ ..\Build\Release\\r
+copy @COMERR_DLL@ ..\Build\Release\\r
+copy @K5SPRT_DLL@ ..\Build\Release\\r
+copy @WSHELP_DLL@ ..\Build\Release\\r
+@END GSSAPI\r
+\r
+@IF GEOIP\r
+echo Copying the GeoIP DLL.\r
+\r
+copy @GEOIP_DLL@ ..\Build\Release\\r
+@END GEOIP\r
+\r
+@IF IDNKIT\r
+echo Copying the IDN kit DLL.\r
+\r
+copy @IDN_DLL@ ..\Build\Release\\r
+copy @ICONV_DLL@ ..\Build\Release\\r
+@END IDNKIT\r
+\r
+echo Copying Visual C x86 Redistributable Installer.\r
+\r
+copy /Y @VCREDIST_PATH@ ..\Build\Release\\r
+\r
+</Command>\r
+    </PreBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <None Include="libisc.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\..\config.h" />\r
+    <ClInclude Include="..\include\isc\app.h" />\r
+    <ClInclude Include="..\include\isc\assertions.h" />\r
+    <ClInclude Include="..\include\isc\backtrace.h" />\r
+    <ClInclude Include="..\include\isc\base32.h" />\r
+    <ClInclude Include="..\include\isc\base64.h" />\r
+    <ClInclude Include="..\include\isc\bind9.h" />\r
+    <ClInclude Include="..\include\isc\bitstring.h" />\r
+    <ClInclude Include="..\include\isc\boolean.h" />\r
+    <ClInclude Include="..\include\isc\buffer.h" />\r
+    <ClInclude Include="..\include\isc\bufferlist.h" />\r
+    <ClInclude Include="..\include\isc\commandline.h" />\r
+    <ClInclude Include="..\include\isc\crc64.h" />\r
+    <ClInclude Include="..\include\isc\entropy.h" />\r
+    <ClInclude Include="..\include\isc\error.h" />\r
+    <ClInclude Include="..\include\isc\event.h" />\r
+    <ClInclude Include="..\include\isc\eventclass.h" />\r
+    <ClInclude Include="..\include\isc\file.h" />\r
+    <ClInclude Include="..\include\isc\formatcheck.h" />\r
+    <ClInclude Include="..\include\isc\fsaccess.h" />\r
+    <ClInclude Include="..\include\isc\hash.h" />\r
+    <ClInclude Include="..\include\isc\heap.h" />\r
+    <ClInclude Include="..\include\isc\hex.h" />\r
+    <ClInclude Include="..\include\isc\hmacmd5.h" />\r
+    <ClInclude Include="..\include\isc\hmacsha.h" />\r
+    <ClInclude Include="..\include\isc\httpd.h" />\r
+    <ClInclude Include="..\include\isc\interfaceiter.h" />\r
+    <ClInclude Include="..\include\isc\ipv6.h" />\r
+    <ClInclude Include="..\include\isc\iterated_hash.h" />\r
+    <ClInclude Include="..\include\isc\json.h" />\r
+    <ClInclude Include="..\include\isc\lang.h" />\r
+    <ClInclude Include="..\include\isc\lex.h" />\r
+    <ClInclude Include="..\include\isc\lfsr.h" />\r
+    <ClInclude Include="..\include\isc\lib.h" />\r
+    <ClInclude Include="..\include\isc\list.h" />\r
+    <ClInclude Include="..\include\isc\log.h" />\r
+    <ClInclude Include="..\include\isc\magic.h" />\r
+    <ClInclude Include="..\include\isc\md5.h" />\r
+    <ClInclude Include="..\include\isc\mem.h" />\r
+    <ClInclude Include="..\include\isc\msgcat.h" />\r
+    <ClInclude Include="..\include\isc\msgs.h" />\r
+    <ClInclude Include="..\include\isc\mutexblock.h" />\r
+    <ClInclude Include="..\include\isc\netaddr.h" />\r
+    <ClInclude Include="..\include\isc\netscope.h" />\r
+    <ClInclude Include="..\include\isc\ondestroy.h" />\r
+    <ClInclude Include="..\include\isc\os.h" />\r
+    <ClInclude Include="..\include\isc\parseint.h" />\r
+    <ClInclude Include="..\include\isc\pool.h" />\r
+    <ClInclude Include="..\include\isc\portset.h" />\r
+    <ClInclude Include="..\include\isc\print.h" />\r
+    <ClInclude Include="..\include\isc\queue.h" />\r
+    <ClInclude Include="..\include\isc\quota.h" />\r
+    <ClInclude Include="..\include\isc\radix.h" />\r
+    <ClInclude Include="..\include\isc\random.h" />\r
+    <ClInclude Include="..\include\isc\ratelimiter.h" />\r
+    <ClInclude Include="..\include\isc\refcount.h" />\r
+    <ClInclude Include="..\include\isc\regex.h" />\r
+    <ClInclude Include="..\include\isc\region.h" />\r
+    <ClInclude Include="..\include\isc\resource.h" />\r
+    <ClInclude Include="..\include\isc\result.h" />\r
+    <ClInclude Include="..\include\isc\resultclass.h" />\r
+    <ClInclude Include="..\include\isc\rwlock.h" />\r
+    <ClInclude Include="..\include\isc\serial.h" />\r
+    <ClInclude Include="..\include\isc\sha1.h" />\r
+    <ClInclude Include="..\include\isc\sha2.h" />\r
+    <ClInclude Include="..\include\isc\sockaddr.h" />\r
+    <ClInclude Include="..\include\isc\socket.h" />\r
+    <ClInclude Include="..\include\isc\stats.h" />\r
+    <ClInclude Include="..\include\isc\stdio.h" />\r
+    <ClInclude Include="..\include\isc\stdlib.h" />\r
+    <ClInclude Include="..\include\isc\string.h" />\r
+    <ClInclude Include="..\include\isc\symtab.h" />\r
+    <ClInclude Include="..\include\isc\task.h" />\r
+    <ClInclude Include="..\include\isc\taskpool.h" />\r
+    <ClInclude Include="..\include\isc\timer.h" />\r
+    <ClInclude Include="..\include\isc\types.h" />\r
+    <ClInclude Include="..\include\isc\util.h" />\r
+    <ClInclude Include="..\include\isc\version.h" />\r
+    <ClInclude Include="..\include\isc\xml.h" />\r
+@IF ATOMIC\r
+    <ClInclude Include="include\isc\atomic.h" />\r
+@ELSE ATOMIC\r
+    <ClInclude Include="..\noatomic\include\isc\atomic.h" />\r
+@END ATOMIC\r
+    <ClInclude Include="errno2result.h" />\r
+    <ClInclude Include="include\isc\bindevt.h" />\r
+    <ClInclude Include="include\isc\bind_registry.h" />\r
+    <ClInclude Include="include\isc\condition.h" />\r
+    <ClInclude Include="include\isc\dir.h" />\r
+    <ClInclude Include="include\isc\int.h" />\r
+    <ClInclude Include="include\isc\ipv6.h" />\r
+    <ClInclude Include="include\isc\keyboard.h" />\r
+    <ClInclude Include="include\isc\mutex.h" />\r
+    <ClInclude Include="include\isc\net.h" />\r
+    <ClInclude Include="include\isc\netdb.h" />\r
+    <ClInclude Include="include\isc\ntgroups.h" />\r
+    <ClInclude Include="include\isc\ntpaths.h" />\r
+    <ClInclude Include="include\isc\offset.h" />\r
+    <ClInclude Include="include\isc\once.h" />\r
+    <ClInclude Include="include\isc\platform.h" />\r
+    <ClInclude Include="include\isc\stat.h" />\r
+    <ClInclude Include="include\isc\stdtime.h" />\r
+    <ClInclude Include="include\isc\strerror.h" />\r
+    <ClInclude Include="include\isc\syslog.h" />\r
+    <ClInclude Include="include\isc\thread.h" />\r
+    <ClInclude Include="include\isc\time.h" />\r
+    <ClInclude Include="include\isc\win32os.h" />\r
+    <ClInclude Include="syslog.h" />\r
+    <ClInclude Include="unistd.h" />\r
+    <ClInclude Include="..\..\versions.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\assertions.c" />\r
+    <ClCompile Include="..\backtrace-emptytbl.c" />\r
+    <ClCompile Include="..\backtrace.c" />\r
+    <ClCompile Include="..\base32.c" />\r
+    <ClCompile Include="..\base64.c" />\r
+    <ClCompile Include="..\bind9.c" />\r
+    <ClCompile Include="..\bitstring.c" />\r
+    <ClCompile Include="..\buffer.c" />\r
+    <ClCompile Include="..\bufferlist.c" />\r
+    <ClCompile Include="..\commandline.c" />\r
+    <ClCompile Include="..\crc64.c" />\r
+    <ClCompile Include="..\error.c" />\r
+    <ClCompile Include="..\event.c" />\r
+    <ClCompile Include="..\hash.c" />\r
+    <ClCompile Include="..\heap.c" />\r
+    <ClCompile Include="..\hex.c" />\r
+    <ClCompile Include="..\hmacmd5.c" />\r
+    <ClCompile Include="..\hmacsha.c" />\r
+    <ClCompile Include="..\httpd.c" />\r
+    <ClCompile Include="..\inet_aton.c" />\r
+    <ClCompile Include="..\inet_ntop.c" />\r
+    <ClCompile Include="..\inet_pton.c" />\r
+    <ClCompile Include="..\iterated_hash.c" />\r
+    <ClCompile Include="..\lex.c" />\r
+    <ClCompile Include="..\lfsr.c" />\r
+    <ClCompile Include="..\lib.c" />\r
+    <ClCompile Include="..\log.c" />\r
+    <ClCompile Include="..\md5.c" />\r
+    <ClCompile Include="..\mem.c" />\r
+    <ClCompile Include="..\mutexblock.c" />\r
+    <ClCompile Include="..\netaddr.c" />\r
+    <ClCompile Include="..\netscope.c" />\r
+    <ClCompile Include="..\nls\msgcat.c" />\r
+    <ClCompile Include="..\ondestroy.c" />\r
+    <ClCompile Include="..\parseint.c" />\r
+    <ClCompile Include="..\pool.c" />\r
+    <ClCompile Include="..\portset.c" />\r
+    <ClCompile Include="..\quota.c" />\r
+    <ClCompile Include="..\radix.c" />\r
+    <ClCompile Include="..\random.c" />\r
+    <ClCompile Include="..\ratelimiter.c" />\r
+    <ClCompile Include="..\refcount.c" />\r
+    <ClCompile Include="..\regex.c" />\r
+    <ClCompile Include="..\region.c" />\r
+    <ClCompile Include="..\result.c" />\r
+    <ClCompile Include="..\rwlock.c" />\r
+    <ClCompile Include="..\serial.c" />\r
+    <ClCompile Include="..\sha1.c" />\r
+    <ClCompile Include="..\sha2.c" />\r
+    <ClCompile Include="..\sockaddr.c" />\r
+    <ClCompile Include="..\stats.c" />\r
+    <ClCompile Include="..\string.c" />\r
+    <ClCompile Include="..\symtab.c" />\r
+    <ClCompile Include="..\task.c" />\r
+    <ClCompile Include="..\taskpool.c" />\r
+    <ClCompile Include="..\timer.c" />\r
+    <ClCompile Include="app.c" />\r
+    <ClCompile Include="condition.c" />\r
+    <ClCompile Include="dir.c" />\r
+    <ClCompile Include="DLLMain.c" />\r
+    <ClCompile Include="entropy.c" />\r
+    <ClCompile Include="errno2result.c" />\r
+    <ClCompile Include="file.c" />\r
+    <ClCompile Include="fsaccess.c" />\r
+    <ClCompile Include="interfaceiter.c" />\r
+    <ClCompile Include="ipv6.c" />\r
+    <ClCompile Include="keyboard.c" />\r
+    <ClCompile Include="net.c" />\r
+    <ClCompile Include="ntpaths.c" />\r
+    <ClCompile Include="once.c" />\r
+    <ClCompile Include="os.c" />\r
+    <ClCompile Include="resource.c" />\r
+    <ClCompile Include="socket.c" />\r
+    <ClCompile Include="stdio.c" />\r
+    <ClCompile Include="stdtime.c" />\r
+    <ClCompile Include="strerror.c" />\r
+    <ClCompile Include="syslog.c" />\r
+    <ClCompile Include="thread.c" />\r
+    <ClCompile Include="time.c" />\r
+    <ClCompile Include="version.c" />\r
+    <ClCompile Include="win32os.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/isc/win32/libisc.vcxproj.user b/lib/isc/win32/libisc.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index e49af2794256299842af361cad70aef5cc9781d7..e255c422173502b43be8604e0416152b3d84cbf4 100644 (file)
@@ -211,7 +211,8 @@ initialize_ipv6only(void) {
 
 static void
 try_ipv6pktinfo(void) {
-       int s, on;
+       SOCKET s;
+       int on;
        char strbuf[ISC_STRERRORSIZE];
        isc_result_t result;
        int optname;
index 39104ab97943d97caee53ac48a284b68a895356d..00c040532460b0dfa2db8db5ee0712951f830f06 100644 (file)
@@ -207,7 +207,7 @@ struct msghdr {
        u_int   msg_iovlen;             /* # elements in msg_iov */
        void    *msg_control;           /* ancillary data, see below */
        u_int   msg_controllen;         /* ancillary data buffer len */
-       int     msg_totallen;           /* total length of this message */
+       u_int   msg_totallen;           /* total length of this message */
 } msghdr;
 
 /*
@@ -973,10 +973,10 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
                   cpbuffer->buf, write_count);
 
                memcpy(cpbuffer->buf,(dev->region.base + dev->n), write_count);
-               cpbuffer->buflen = write_count;
+               cpbuffer->buflen = (unsigned int)write_count;
                ISC_LIST_ENQUEUE(lpo->bufferlist, cpbuffer, link);
                iov[0].buf = cpbuffer->buf;
-               iov[0].len = write_count;
+               iov[0].len = (u_long)write_count;
                iovcount = 1;
 
                goto config;
@@ -1001,7 +1001,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
                isc_buffer_usedregion(buffer, &used);
 
                if (used.length > 0) {
-                       int uselen = used.length - skip_count;
+                       int uselen = (int)(used.length - skip_count);
                        cpbuffer = HeapAlloc(hHeapHandle, HEAP_ZERO_MEMORY, sizeof(buflist_t));
                        RUNTIME_CHECK(cpbuffer != NULL);
                        cpbuffer->buf = HeapAlloc(hHeapHandle, HEAP_ZERO_MEMORY, uselen);
@@ -1015,7 +1015,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
                        memcpy(cpbuffer->buf,(used.base + skip_count), uselen);
                        cpbuffer->buflen = uselen;
                        iov[iovcount].buf = cpbuffer->buf;
-                       iov[iovcount].len = used.length - skip_count;
+                       iov[iovcount].len = (u_long)(used.length - skip_count);
                        write_count += uselen;
                        skip_count = 0;
                        iovcount++;
@@ -1028,7 +1028,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
  config:
        msg->msg_iov = iov;
        msg->msg_iovlen = iovcount;
-       msg->msg_totallen = write_count;
+       msg->msg_totallen = (u_int)write_count;
 }
 
 static void
@@ -2413,7 +2413,8 @@ SocketIoThread(LPVOID ThreadContext) {
        while (TRUE) {
                wait_again:
                bSuccess = GetQueuedCompletionStatus(manager->hIoCompletionPort,
-                                                    &nbytes, (LPDWORD)&sock,
+                                                    &nbytes,
+                                                    (PULONG_PTR)&sock,
                                                     (LPWSAOVERLAPPED *)&lpo,
                                                     INFINITE);
                if (lpo == NULL) /* Received request to exit */
index 69a1c6f09605814ef67abae22595148a4d7e215c..50e473835e9483ae9408477f5db3eb62a622fb71 100644 (file)
@@ -49,11 +49,14 @@ isc_stdio_close(FILE *f) {
 }
 
 isc_result_t
-isc_stdio_seek(FILE *f, long offset, int whence) {
-       /* based on the fact off_t is typedef to long */
+isc_stdio_seek(FILE *f, off_t offset, int whence) {
        int r;
 
+#ifndef _WIN64
        r = fseek(f, offset, whence);
+#else
+       r = _fseeki64(f, offset, whence);
+#endif
        if (r == 0)
                return (ISC_R_SUCCESS);
        else
index 574297efe5076a06ed73e1f5bfefedb3498100d2..119beca240ac18db68fd257753816a6f01ca1e5a 100644 (file)
@@ -33,5 +33,5 @@ isc_stdtime_get(isc_stdtime_t *t) {
 
        REQUIRE(t != NULL);
 
-       (void)time(t);
+       (void)_time32(t);
 }
index 78b34edf4f921f8fa4bb48b05c8a6fe404fc5595..03d342ffc8021a022e4e13be3605ec2ac875dec1 100644 (file)
@@ -53,8 +53,9 @@ isccc_base64_encode(isccc_region_t *source, int wordlength,
        isc_result_t result;
 
        sr.base = source->rstart;
-       sr.length = source->rend - source->rstart;
-       isc_buffer_init(&tb, target->rstart, target->rend - target->rstart);
+       sr.length = (unsigned int)(source->rend - source->rstart);
+       isc_buffer_init(&tb, target->rstart,
+                       (unsigned int)(target->rend - target->rstart));
 
        result = isc_base64_totext(&sr, wordlength, wordbreak, &tb);
        if (result != ISC_R_SUCCESS)
@@ -69,7 +70,8 @@ isccc_base64_decode(const char *cstr, isccc_region_t *target) {
        isc_buffer_t b;
        isc_result_t result;
 
-       isc_buffer_init(&b, target->rstart, target->rend - target->rstart);
+       isc_buffer_init(&b, target->rstart,
+                       (unsigned int)(target->rend - target->rstart));
        result = isc_base64_decodestring(cstr, &b);
        if (result != ISC_R_SUCCESS)
                return (result);
index ae5391a5e54b9946c316680d69fe6d963f6a3c8a..69e7f7cee0b7f232da1efa6a50d1cc94703be68f 100644 (file)
@@ -87,7 +87,7 @@ list_towire(isccc_sexpr_t *alist, isccc_region_t *target);
 static isc_result_t
 value_towire(isccc_sexpr_t *elt, isccc_region_t *target)
 {
-       size_t len;
+       unsigned int len;
        unsigned char *lenp;
        isccc_region_t *vr;
        isc_result_t result;
@@ -117,7 +117,7 @@ value_towire(isccc_sexpr_t *elt, isccc_region_t *target)
                result = table_towire(elt, target);
                if (result != ISC_R_SUCCESS)
                        return (result);
-               len = (size_t)(target->rstart - lenp);
+               len = (unsigned int)(target->rstart - lenp);
                /*
                 * 'len' is 4 bytes too big, since it counts
                 * the placeholder length too.  Adjust and
@@ -141,7 +141,7 @@ value_towire(isccc_sexpr_t *elt, isccc_region_t *target)
                result = list_towire(elt, target);
                if (result != ISC_R_SUCCESS)
                        return (result);
-               len = (size_t)(target->rstart - lenp);
+               len = (unsigned int)(target->rstart - lenp);
                /*
                 * 'len' is 4 bytes too big, since it counts
                 * the placeholder length.  Adjust and emit.
@@ -265,7 +265,8 @@ isccc_cc_towire(isccc_sexpr_t *alist, isccc_region_t *target,
        if (result != ISC_R_SUCCESS)
                return (result);
        if (secret != NULL)
-               return (sign(signed_rstart, (target->rstart - signed_rstart),
+               return (sign(signed_rstart,
+                            (unsigned int)(target->rstart - signed_rstart),
                             hmd5_rstart, secret));
        return (ISC_R_SUCCESS);
 }
@@ -404,6 +405,7 @@ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
        if (secret != NULL) {
                if (checksum_rstart != NULL)
                        result = verify(alist, checksum_rstart,
+                                       (unsigned int)
                                        (source->rend - checksum_rstart),
                                        secret);
                else
similarity index 66%
rename from lib/isccc/win32/libisccc.dsp
rename to lib/isccc/win32/libisccc.dsp.in
index 5f7917804c1b8371b36e321cf7e28af1a01fddc2..f195b5b93b68a8d51709af53dae722882cc9ad68 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
 
-CFG=libisccc - Win32 Release
+CFG=libisccc - @PLATFORM@ Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=libisccc - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libisccc.mak" CFG="libisccc - Win32 Release"
+!MESSAGE NMAKE /f "libisccc.mak" CFG="libisccc - @PLATFORM@ Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libisccc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libisccc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisccc - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libisccc - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" @COPTY@ /FD /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccc.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libisccc.dll"
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /FR @COPTY@ /FD /GZ /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccc.dll" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug @MACHINE@ /out:"../../../Build/Debug/libisccc.dll" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "libisccc - Win32 Release"
-# Name "libisccc - Win32 Debug"
+# Name "libisccc - @PLATFORM@ Release"
+# Name "libisccc - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 71%
rename from lib/isccc/win32/libisccc.mak
rename to lib/isccc/win32/libisccc.mak.in
index 9773a7275639df9b80188b78e68d1befa082ca47..1498ceb3b2c66c62d0dac18d9fa9f9850123b8e3 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on libisccc.dsp
 !IF "$(CFG)" == ""
-CFG=libisccc - Win32 Release
-!MESSAGE No configuration specified. Defaulting to libisccc - Win32 Release.
+CFG=libisccc - @PLATFORM@ Release
+!MESSAGE No configuration specified. Defaulting to libisccc - @PLATFORM@ Release.
 !ENDIF 
 
-!IF "$(CFG)" != "libisccc - Win32 Release" && "$(CFG)" != "libisccc - Win32 Debug"
+!IF "$(CFG)" != "libisccc - @PLATFORM@ Release" && "$(CFG)" != "libisccc - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libisccc.mak" CFG="libisccc - Win32 Release"
+!MESSAGE NMAKE /f "libisccc.mak" CFG="libisccc - @PLATFORM@ Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libisccc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libisccc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisccc - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libisccc - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -104,7 +104,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -115,12 +115,12 @@ ALL : "..\..\..\Build\Release\libisccc.dll"
 
 !ELSE 
 
-ALL : "libisc - Win32 Release" "..\..\..\Build\Release\libisccc.dll"
+ALL : "libisc - @PLATFORM@ Release" "..\..\..\Build\Release\libisccc.dll"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - Win32 ReleaseCLEAN" 
+CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -143,14 +143,14 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /Fp"$(INTDIR)\libisccc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /Fp"$(INTDIR)\libisccc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccc.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccc.pdb" /machine:I386 /def:".\libisccc.def" /out:"../../../Build/Release/libisccc.dll" /implib:"$(OUTDIR)\libisccc.lib" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccc.pdb" @MACHINE@ /def:".\libisccc.def" /out:"../../../Build/Release/libisccc.dll" /implib:"$(OUTDIR)\libisccc.lib" 
 DEF_FILE= \
        ".\libisccc.def"
 LINK32_OBJS= \
@@ -172,7 +172,7 @@ LINK32_OBJS= \
 <<
   $(_VC_MANIFEST_EMBED_DLL)
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -186,12 +186,12 @@ ALL : "..\..\..\Build\Debug\libisccc.dll" "$(OUTDIR)\libisccc.bsc"
 
 !ELSE 
 
-ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccc.dll" "$(OUTDIR)\libisccc.bsc"
+ALL : "libisc - @PLATFORM@ Debug" "..\..\..\Build\Debug\libisccc.dll" "$(OUTDIR)\libisccc.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - Win32 DebugCLEAN" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -228,7 +228,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" @LIBXML2_INC@ /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccc.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccc.bsc" 
@@ -250,7 +250,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccc.pdb" /debug /machine:I386 /def:".\libisccc.def" /out:"../../../Build/Debug/libisccc.dll" /implib:"$(OUTDIR)\libisccc.lib" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccc.pdb" /debug @MACHINE@ /def:".\libisccc.def" /out:"../../../Build/Debug/libisccc.dll" /implib:"$(OUTDIR)\libisccc.lib" /pdbtype:sept 
 DEF_FILE= \
        ".\libisccc.def"
 LINK32_OBJS= \
@@ -314,17 +314,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "libisccc - Win32 Release" || "$(CFG)" == "libisccc - Win32 Debug"
+!IF "$(CFG)" == "libisccc - @PLATFORM@ Release" || "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 SOURCE=..\alist.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\alist.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\alist.obj"  "$(INTDIR)\alist.sbr" : $(SOURCE) "$(INTDIR)"
@@ -335,14 +335,14 @@ SOURCE=..\alist.c
 
 SOURCE=..\base64.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\base64.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\base64.obj" "$(INTDIR)\base64.sbr" : $(SOURCE) "$(INTDIR)"
@@ -353,14 +353,14 @@ SOURCE=..\base64.c
 
 SOURCE=..\cc.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\cc.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\cc.obj"     "$(INTDIR)\cc.sbr" : $(SOURCE) "$(INTDIR)"
@@ -371,14 +371,14 @@ SOURCE=..\cc.c
 
 SOURCE=..\ccmsg.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\ccmsg.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\ccmsg.obj"  "$(INTDIR)\ccmsg.sbr" : $(SOURCE) "$(INTDIR)"
@@ -389,13 +389,13 @@ SOURCE=..\ccmsg.c
 
 SOURCE=.\DLLMain.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\DLLMain.obj"        "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
@@ -405,14 +405,14 @@ SOURCE=.\DLLMain.c
 
 SOURCE=..\lib.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lib.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lib.obj"    "$(INTDIR)\lib.sbr" : $(SOURCE) "$(INTDIR)"
@@ -423,14 +423,14 @@ SOURCE=..\lib.c
 
 SOURCE=..\result.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\result.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\result.obj" "$(INTDIR)\result.sbr" : $(SOURCE) "$(INTDIR)"
@@ -441,14 +441,14 @@ SOURCE=..\result.c
 
 SOURCE=..\sexpr.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\sexpr.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\sexpr.obj"  "$(INTDIR)\sexpr.sbr" : $(SOURCE) "$(INTDIR)"
@@ -459,14 +459,14 @@ SOURCE=..\sexpr.c
 
 SOURCE=..\symtab.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\symtab.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\symtab.obj" "$(INTDIR)\symtab.sbr" : $(SOURCE) "$(INTDIR)"
@@ -477,13 +477,13 @@ SOURCE=..\symtab.c
 
 SOURCE=.\version.c
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
 
 "$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\version.obj"        "$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
@@ -491,28 +491,28 @@ SOURCE=.\version.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "libisccc - Win32 Release"
+!IF  "$(CFG)" == "libisccc - @PLATFORM@ Release"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\isccc\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\isccc\win32"
 
-!ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccc - @PLATFORM@ Debug"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\isccc\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\isccc\win32"
 
 !ENDIF 
diff --git a/lib/isccc/win32/libisccc.vcxproj.filters.in b/lib/isccc/win32/libisccc.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..e1c616c
--- /dev/null
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="libisccc.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="DLLMain.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="version.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\alist.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\base64.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\cc.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\ccmsg.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lib.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\result.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\sexpr.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\symtab.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\isccc\alist.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\base64.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\cc.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\ccmsg.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\events.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\lib.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\result.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\sexpr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\symtab.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\symtype.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\types.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccc\util.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/isccc/win32/libisccc.vcxproj.in b/lib/isccc/win32/libisccc.vcxproj.in
new file mode 100644 (file)
index 0000000..8319315
--- /dev/null
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{B556705F-1920-4400-878A-B259D3556047}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>libisccc</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;USE_MD5;@USE_OPENSSL@_DEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;USE_MD5;@USE_OPENSSL@NDEBUG;_WINDOWS;_USRDLL;LIBISCCC_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;@LIBXML2_INC@include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <None Include="libisccc.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\alist.c" />\r
+    <ClCompile Include="..\base64.c" />\r
+    <ClCompile Include="..\cc.c" />\r
+    <ClCompile Include="..\ccmsg.c" />\r
+    <ClCompile Include="..\lib.c" />\r
+    <ClCompile Include="..\result.c" />\r
+    <ClCompile Include="..\sexpr.c" />\r
+    <ClCompile Include="..\symtab.c" />\r
+    <ClCompile Include="DLLMain.c" />\r
+    <ClCompile Include="version.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\isccc\alist.h" />\r
+    <ClInclude Include="..\include\isccc\base64.h" />\r
+    <ClInclude Include="..\include\isccc\cc.h" />\r
+    <ClInclude Include="..\include\isccc\ccmsg.h" />\r
+    <ClInclude Include="..\include\isccc\events.h" />\r
+    <ClInclude Include="..\include\isccc\lib.h" />\r
+    <ClInclude Include="..\include\isccc\result.h" />\r
+    <ClInclude Include="..\include\isccc\sexpr.h" />\r
+    <ClInclude Include="..\include\isccc\symtab.h" />\r
+    <ClInclude Include="..\include\isccc\symtype.h" />\r
+    <ClInclude Include="..\include\isccc\types.h" />\r
+    <ClInclude Include="..\include\isccc\util.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/isccc/win32/libisccc.vcxproj.user b/lib/isccc/win32/libisccc.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 64%
rename from lib/isccfg/win32/libisccfg.dsp
rename to lib/isccfg/win32/libisccfg.dsp.in
index c525c8924e4477c199fe6efdcac8a3e3eb350f7f..abd8631699d72837b0372fb30dd9931bbbccfe26 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
 
-CFG=libisccfg - Win32 Debug
+CFG=libisccfg - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=libisccfg - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libisccfg.mak" CFG="libisccfg - Win32 Debug"
+!MESSAGE NMAKE /f "libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libisccfg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libisccfg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisccfg - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libisccfg - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../../libxml2-2.7.3/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCFG_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" @LIBXML2_INC@ @GEOIP_INC@ /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCFG_EXPORTS" @COPTY@ /FD /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../dns/win32/Release/libdns.lib ../../isc/win32/Release/libisc.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccfg.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../dns/win32/Release/libdns.lib ../../isc/win32/Release/libisc.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libisccfg.dll"
 
-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../../libxml2-2.7.3/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISCCFG_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" @LIBXML2_INC@ @GEOIP_INC@ /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISCCFG_EXPORTS" /FR @COPTY@ /FD /GZ /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../dns/win32/debug/libdns.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccfg.dll" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../dns/win32/debug/libdns.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug @MACHINE@ /out:"../../../Build/Debug/libisccfg.dll" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "libisccfg - Win32 Release"
-# Name "libisccfg - Win32 Debug"
+# Name "libisccfg - @PLATFORM@ Release"
+# Name "libisccfg - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 68%
rename from lib/isccfg/win32/libisccfg.mak
rename to lib/isccfg/win32/libisccfg.mak.in
index 309b5d649f62764697b1755b6eeda4337fca2050..96eb02f0754e2f050ac35d3cf89ddad2ded9a0d4 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on libisccfg.dsp
 !IF "$(CFG)" == ""
-CFG=libisccfg - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to libisccfg - Win32 Debug.
+CFG=libisccfg - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to libisccfg - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "libisccfg - Win32 Release" && "$(CFG)" != "libisccfg - Win32 Debug"
+!IF "$(CFG)" != "libisccfg - @PLATFORM@ Release" && "$(CFG)" != "libisccfg - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libisccfg.mak" CFG="libisccfg - Win32 Debug"
+!MESSAGE NMAKE /f "libisccfg.mak" CFG="libisccfg - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libisccfg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libisccfg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libisccfg - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libisccfg - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -104,7 +104,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -115,12 +115,12 @@ ALL : "..\..\..\Build\Release\libisccfg.dll"
 
 !ELSE 
 
-ALL : "libdns - Win32 Release" "libisc - Win32 Release" "..\..\..\Build\Release\libisccfg.dll"
+ALL : "libdns - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\Build\Release\libisccfg.dll"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -139,14 +139,14 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../../libxml2-2.7.3/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCFG_EXPORTS" /Fp"$(INTDIR)\libisccfg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" @LIBXML2_INC@ @GEOIP_INC@ /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCFG_EXPORTS" /Fp"$(INTDIR)\libisccfg.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccfg.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../dns/win32/Release/libdns.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccfg.pdb" /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Release/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../dns/win32/Release/libdns.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccfg.pdb" @MACHINE@ /def:".\libisccfg.def" /out:"../../../Build/Release/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" 
 DEF_FILE= \
        ".\libisccfg.def"
 LINK32_OBJS= \
@@ -165,7 +165,7 @@ LINK32_OBJS= \
 <<
   $(_VC_MANIFEST_EMBED_DLL)
 
-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -179,12 +179,12 @@ ALL : "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
 
 !ELSE 
 
-ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
+ALL : "libisc - @PLATFORM@ Debug" "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
 
 !ENDIF 
 
 !IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - Win32 DebugCLEAN" 
+CLEAN :"libisc - @PLATFORM@ DebugCLEAN" 
 !ELSE 
 CLEAN :
 !ENDIF 
@@ -213,7 +213,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../../libxml2-2.7.3/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISCCFG_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccfg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" @LIBXML2_INC@ @GEOIP_INC@ /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISCCFG_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libisccfg.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccfg.bsc" 
@@ -231,7 +231,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../dns/win32/debug/libdns.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccfg.pdb" /debug /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Debug/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../dns/win32/debug/libdns.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccfg.pdb" /debug @MACHINE@ /def:".\libisccfg.def" /out:"../../../Build/Debug/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" /pdbtype:sept 
 DEF_FILE= \
        ".\libisccfg.def"
 LINK32_OBJS= \
@@ -292,16 +292,16 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "libisccfg - Win32 Release" || "$(CFG)" == "libisccfg - Win32 Debug"
+!IF "$(CFG)" == "libisccfg - @PLATFORM@ Release" || "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 SOURCE=.\DLLMain.c
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 
 
 "$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\DLLMain.obj"        "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
@@ -311,14 +311,14 @@ SOURCE=.\DLLMain.c
 
 SOURCE=..\aclconf.c
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 
 
 "$(INTDIR)\aclconf.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\aclconf.obj"        "$(INTDIR)\aclconf.sbr" : $(SOURCE) "$(INTDIR)"
@@ -329,14 +329,14 @@ SOURCE=..\aclconf.c
 
 SOURCE=..\log.c
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 
 
 "$(INTDIR)\log.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\log.obj"    "$(INTDIR)\log.sbr" : $(SOURCE) "$(INTDIR)"
@@ -347,14 +347,14 @@ SOURCE=..\log.c
 
 SOURCE=..\namedconf.c
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 
 
 "$(INTDIR)\namedconf.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\namedconf.obj"      "$(INTDIR)\namedconf.sbr" : $(SOURCE) "$(INTDIR)"
@@ -365,14 +365,14 @@ SOURCE=..\namedconf.c
 
 SOURCE=..\parser.c
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 
 
 "$(INTDIR)\parser.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\parser.obj" "$(INTDIR)\parser.sbr" : $(SOURCE) "$(INTDIR)"
@@ -383,13 +383,13 @@ SOURCE=..\parser.c
 
 SOURCE=.\version.c
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 
 
 "$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\version.obj"        "$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
@@ -397,48 +397,48 @@ SOURCE=.\version.c
 
 !ENDIF 
 
-!IF  "$(CFG)" == "libisccfg - Win32 Release"
+!IF  "$(CFG)" == "libisccfg - @PLATFORM@ Release"
 
-"libdns - Win32 Release" : 
+"libdns - @PLATFORM@ Release" : 
    cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
    cd "..\..\isccfg\win32"
 
-"libdns - Win32 ReleaseCLEAN" : 
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
-"libisc - Win32 Release" : 
+"libisc - @PLATFORM@ Release" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
    cd "..\..\isccfg\win32"
 
-"libisc - Win32 ReleaseCLEAN" : 
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
-!ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
+!ELSEIF  "$(CFG)" == "libisccfg - @PLATFORM@ Debug"
 
-"libdns - Win32 Debug" : 
+"libdns - @PLATFORM@ Debug" : 
    cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
    cd "..\..\isccfg\win32"
 
-"libdns - Win32 DebugCLEAN" : 
+"libdns - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
-"libisc - Win32 Debug" : 
+"libisc - @PLATFORM@ Debug" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
    cd "..\..\isccfg\win32"
 
-"libisc - Win32 DebugCLEAN" : 
+"libisc - @PLATFORM@ DebugCLEAN" : 
    cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
 !ENDIF 
diff --git a/lib/isccfg/win32/libisccfg.vcxproj.filters.in b/lib/isccfg/win32/libisccfg.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..b1abea4
--- /dev/null
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="libisccfg.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="DLLMain.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="version.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\aclconf.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\log.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\namedconf.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\parser.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\isccfg\aclconf.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccfg\cfg.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccfg\grammar.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccfg\log.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\isccfg\namedconf.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/isccfg/win32/libisccfg.vcxproj.in b/lib/isccfg/win32/libisccfg.vcxproj.in
new file mode 100644 (file)
index 0000000..9d2aede
--- /dev/null
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{B2DFA58C-6347-478E-81E8-01E06999D4F1}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>libisccfg</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;USE_MD5;@USE_OPENSSL@_DEBUG;_WINDOWS;_USRDLL;LIBISCCFG_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;@LIBXML2_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalLibraryDirectories>..\..\dns\win32\$(Configuration);..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;USE_MD5;@USE_OPENSSL@NDEBUG;_WINDOWS;_USRDLL;LIBISCCFG_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;@LIBXML2_INC@@GEOIP_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalLibraryDirectories>..\..\dns\win32\$(Configuration);..\..\isc\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libdns.lib;libisc.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <None Include="libisccfg.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\aclconf.c" />\r
+    <ClCompile Include="..\log.c" />\r
+    <ClCompile Include="..\namedconf.c" />\r
+    <ClCompile Include="..\parser.c" />\r
+    <ClCompile Include="DLLMain.c" />\r
+    <ClCompile Include="version.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\isccfg\aclconf.h" />\r
+    <ClInclude Include="..\include\isccfg\cfg.h" />\r
+    <ClInclude Include="..\include\isccfg\grammar.h" />\r
+    <ClInclude Include="..\include\isccfg\log.h" />\r
+    <ClInclude Include="..\include\isccfg\namedconf.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/isccfg/win32/libisccfg.vcxproj.user b/lib/isccfg/win32/libisccfg.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 047707ffde46fe83c24d50ee11da6f6dbf2c7342..c2a286b3297d6e900dce66732d89d56109b1bfa4 100644 (file)
@@ -181,7 +181,11 @@ lwres_context_create(lwres_context_t **contextp, void *arg,
        ctx->sock = -1;
 
        ctx->timeout = LWRES_DEFAULT_TIMEOUT;
+#ifndef WIN32
        ctx->serial = time(NULL); /* XXXMLG or BEW */
+#else
+       ctx->serial = _time32(NULL);
+#endif
 
        ctx->use_ipv4 = 1;
        ctx->use_ipv6 = 1;
@@ -286,7 +290,11 @@ lwres_free(void *arg, void *mem, size_t len) {
 
 static lwres_result_t
 context_connect(lwres_context_t *ctx) {
+#ifndef WIN32
        int s;
+#else
+       SOCKET s;
+#endif
        int ret;
        struct sockaddr_in sin;
        struct sockaddr_in6 sin6;
@@ -332,12 +340,16 @@ context_connect(lwres_context_t *ctx) {
        InitSockets();
 #endif
        s = socket(domain, SOCK_DGRAM, IPPROTO_UDP);
+#ifndef WIN32
        if (s < 0) {
-#ifdef WIN32
+               return (LWRES_R_IOERROR);
+       }
+#else
+       if (s == INVALID_SOCKET) {
                DestroySockets();
-#endif
                return (LWRES_R_IOERROR);
        }
+#endif
 
        ret = connect(s, sa, salen);
        if (ret != 0) {
@@ -357,7 +369,7 @@ context_connect(lwres_context_t *ctx) {
                return (LWRES_R_IOERROR);
        }
 
-       ctx->sock = s;
+       ctx->sock = (int)s;
 
        return (LWRES_R_SUCCESS);
 }
index 1a1efd4653057b27a0da06b642afc6e0a278100a..49d74a14b00e9246c4dbaab8c3d32a624cf6bec5 100644 (file)
 
 #define LWRES_ALIGNBYTES (sizeof(char *) - 1)
 #define LWRES_ALIGN(p) \
-       (((unsigned long)(p) + LWRES_ALIGNBYTES) &~ LWRES_ALIGNBYTES)
+       (((uintptr_t)(p) + LWRES_ALIGNBYTES) &~ LWRES_ALIGNBYTES)
 
 static struct hostent *he = NULL;
 static int copytobuf(struct hostent *, struct hostent *, char *, int);
@@ -303,7 +303,7 @@ copytobuf(struct hostent *he, struct hostent *hptr, char *buf, int buflen) {
         * Find out the amount of space required to store the answer.
         */
         nptr = 2; /* NULL ptrs */
-        len = (char *)LWRES_ALIGN(buf) - buf;
+        len = (int)((char *)LWRES_ALIGN(buf) - buf);
         for (i = 0; he->h_addr_list[i]; i++, nptr++) {
                 len += he->h_length;
         }
index 5a0d85a365d6466b1e8a9d5fe77adae768f9f00e..707c66d8abc80f1280a378fdd8d4570efa8aa89e 100644 (file)
@@ -96,7 +96,8 @@ static char rcsid[] = "$Id: lwinetaton.c,v 1.16 2007/06/19 23:47:22 tbox Exp $";
 int
 lwres_net_aton(const char *cp, struct in_addr *addr) {
        lwres_uint32_t val;
-       int base, n;
+       int base;
+       ptrdiff_t n;
        unsigned char c;
        lwres_uint8_t parts[4];
        lwres_uint8_t *pp = parts;
index e0ea85df35736c5e65f488a54dd2706cbf63bec4..94dcebf3c6eec8ffef2497f9b7a59cebe77ec692 100644 (file)
@@ -90,8 +90,9 @@ inet_pton4(const char *src, unsigned char *dst) {
                const char *pch;
 
                if ((pch = strchr(digits, ch)) != NULL) {
-                       unsigned int new = *tp * 10 + (pch - digits);
+                       unsigned int new = *tp * 10;
 
+                       new += (unsigned int)(pch - digits);
                        if (new > 255)
                                return (0);
                        *tp = new;
@@ -198,7 +199,7 @@ inet_pton6(const char *src, unsigned char *dst) {
                 * Since some memmove()'s erroneously fail to handle
                 * overlapping regions, we'll do the shift by hand.
                 */
-               const int n = tp - colonp;
+               const int n = (int)(tp - colonp);
                int i;
 
                for (i = 1; i <= n; i++) {
index 3363e66b89b4eef99c0e24172e9aa34e015933ee..32579f136d93fbb72fe50e925bfd6482eaa1737b 100644 (file)
@@ -142,9 +142,9 @@ lwres_gabnrequest_render(lwres_context_t *ctx, lwres_gabnrequest_t *req,
        if (buf == NULL)
                return (LWRES_R_NOMEMORY);
 
-       lwres_buffer_init(b, buf, buflen);
+       lwres_buffer_init(b, buf, (unsigned int)buflen);
 
-       pkt->length = buflen;
+       pkt->length = (lwres_uint32_t)buflen;
        pkt->version = LWRES_LWPACKETVERSION_0;
        pkt->pktflags &= ~LWRES_LWPACKETFLAG_RESPONSE;
        pkt->opcode = LWRES_OPCODE_GETADDRSBYNAME;
@@ -223,9 +223,9 @@ lwres_gabnresponse_render(lwres_context_t *ctx, lwres_gabnresponse_t *req,
        buf = CTXMALLOC(buflen);
        if (buf == NULL)
                return (LWRES_R_NOMEMORY);
-       lwres_buffer_init(b, buf, buflen);
+       lwres_buffer_init(b, buf, (unsigned int)buflen);
 
-       pkt->length = buflen;
+       pkt->length = (lwres_uint32_t)buflen;
        pkt->version = LWRES_LWPACKETVERSION_0;
        pkt->pktflags |= LWRES_LWPACKETFLAG_RESPONSE;
        pkt->opcode = LWRES_OPCODE_GETADDRSBYNAME;
index d18ae153f23e0314fba8877eff738e95e1744750..aabf59bc8aca87b48bc47f53a1691f43d38f33d2 100644 (file)
@@ -135,9 +135,9 @@ lwres_gnbarequest_render(lwres_context_t *ctx, lwres_gnbarequest_t *req,
        buf = CTXMALLOC(buflen);
        if (buf == NULL)
                return (LWRES_R_NOMEMORY);
-       lwres_buffer_init(b, buf, buflen);
+       lwres_buffer_init(b, buf, (unsigned int)buflen);
 
-       pkt->length = buflen;
+       pkt->length = (lwres_uint32_t)buflen;
        pkt->version = LWRES_LWPACKETVERSION_0;
        pkt->pktflags &= ~LWRES_LWPACKETFLAG_RESPONSE;
        pkt->opcode = LWRES_OPCODE_GETNAMEBYADDR;
@@ -199,9 +199,9 @@ lwres_gnbaresponse_render(lwres_context_t *ctx, lwres_gnbaresponse_t *req,
        buf = CTXMALLOC(buflen);
        if (buf == NULL)
                return (LWRES_R_NOMEMORY);
-       lwres_buffer_init(b, buf, buflen);
+       lwres_buffer_init(b, buf, (unsigned int)buflen);
 
-       pkt->length = buflen;
+       pkt->length = (lwres_uint32_t)buflen;
        pkt->version = LWRES_LWPACKETVERSION_0;
        pkt->pktflags |= LWRES_LWPACKETFLAG_RESPONSE;
        pkt->opcode = LWRES_OPCODE_GETNAMEBYADDR;
index 72718bad0c5d0d14c8eb6cbe6d2b91ef9651be09..6b77ba57e5e67280589fb0e7c0088f35e16de36e 100644 (file)
@@ -61,9 +61,9 @@ lwres_grbnrequest_render(lwres_context_t *ctx, lwres_grbnrequest_t *req,
        if (buf == NULL)
                return (LWRES_R_NOMEMORY);
 
-       lwres_buffer_init(b, buf, buflen);
+       lwres_buffer_init(b, buf, (unsigned int)buflen);
 
-       pkt->length = buflen;
+       pkt->length = (lwres_uint32_t)buflen;
        pkt->version = LWRES_LWPACKETVERSION_0;
        pkt->pktflags &= ~LWRES_LWPACKETFLAG_RESPONSE;
        pkt->opcode = LWRES_OPCODE_GETRDATABYNAME;
@@ -139,9 +139,9 @@ lwres_grbnresponse_render(lwres_context_t *ctx, lwres_grbnresponse_t *req,
        buf = CTXMALLOC(buflen);
        if (buf == NULL)
                return (LWRES_R_NOMEMORY);
-       lwres_buffer_init(b, buf, buflen);
+       lwres_buffer_init(b, buf, (unsigned int)buflen);
 
-       pkt->length = buflen;
+       pkt->length = (lwres_uint32_t)buflen;
        pkt->version = LWRES_LWPACKETVERSION_0;
        pkt->pktflags |= LWRES_LWPACKETFLAG_RESPONSE;
        pkt->opcode = LWRES_OPCODE_GETRDATABYNAME;
index 369fe4e18f7154a407e3b33d886dc29e1df6daed..997e26ccf7ed716b522f68996e91eee561fcc3b3 100644 (file)
@@ -132,9 +132,9 @@ lwres_nooprequest_render(lwres_context_t *ctx, lwres_nooprequest_t *req,
        buf = CTXMALLOC(buflen);
        if (buf == NULL)
                return (LWRES_R_NOMEMORY);
-       lwres_buffer_init(b, buf, buflen);
+       lwres_buffer_init(b, buf, (unsigned int)buflen);
 
-       pkt->length = buflen;
+       pkt->length = (lwres_uint32_t)buflen;
        pkt->version = LWRES_LWPACKETVERSION_0;
        pkt->pktflags &= ~LWRES_LWPACKETFLAG_RESPONSE;
        pkt->opcode = LWRES_OPCODE_NOOP;
@@ -185,9 +185,9 @@ lwres_noopresponse_render(lwres_context_t *ctx, lwres_noopresponse_t *req,
        buf = CTXMALLOC(buflen);
        if (buf == NULL)
                return (LWRES_R_NOMEMORY);
-       lwres_buffer_init(b, buf, buflen);
+       lwres_buffer_init(b, buf, (unsigned int)buflen);
 
-       pkt->length = buflen;
+       pkt->length = (lwres_uint32_t)buflen;
        pkt->version = LWRES_LWPACKETVERSION_0;
        pkt->pktflags |= LWRES_LWPACKETFLAG_RESPONSE;
        pkt->opcode = LWRES_OPCODE_NOOP;
index a1fe85ff2db148bcb1303c816be7ccd6f1b9c8a0..5073476d31695d3acd883db221a9dd8aa089d048 100644 (file)
@@ -69,7 +69,7 @@ struct addrinfo {
 #define        NETDB_INTERNAL  -1      /* see errno */
 #define        NETDB_SUCCESS   0       /* no problem */
 #define        HOST_NOT_FOUND  1 /* Authoritative Answer Host not found */
-#define        TRY_AGAIN       2 /* Non-Authoritive Host not found, or SERVERFAIL */
+#define        TRY_AGAIN       2 /* Non-Authoritative Host not found, or SERVERFAIL */
 #define        NO_RECOVERY     3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
 #define        NO_DATA         4 /* Valid name, no data record of requested type */
 #define        NO_ADDRESS      NO_DATA         /* no address, look for MX record */
similarity index 70%
rename from lib/lwres/win32/liblwres.dsp
rename to lib/lwres/win32/liblwres.dsp.in
index 7945b1f04b69a1b22f54c93f10f5845e6ec68a87..f4d54fa1a6dac02d65e2b5ade43487b345d7faa0 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
 
-CFG=liblwres - Win32 Debug
+CFG=liblwres - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=liblwres - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - Win32 Debug"
+!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "liblwres - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "liblwres - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "liblwres - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "liblwres - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" @COPTY@ /FD /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/liblwres.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/liblwres.dll"
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "liblwres_EXPORTS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR @COPTY@ /FD /GZ /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/liblwres.dll" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /debug @MACHINE@ /out:"../../../Build/Debug/liblwres.dll" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "liblwres - Win32 Release"
-# Name "liblwres - Win32 Debug"
+# Name "liblwres - @PLATFORM@ Release"
+# Name "liblwres - @PLATFORM@ Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
similarity index 77%
rename from lib/lwres/win32/liblwres.mak
rename to lib/lwres/win32/liblwres.mak.in
index 5f3482e5a66afc5886c8f6f207de76e599095847..075ffcce2dc316f3273689273a053248c8c878a5 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on liblwres.dsp
 !IF "$(CFG)" == ""
-CFG=liblwres - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to liblwres - Win32 Debug.
+CFG=liblwres - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to liblwres - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "liblwres - Win32 Release" && "$(CFG)" != "liblwres - Win32 Debug"
+!IF "$(CFG)" != "liblwres - @PLATFORM@ Release" && "$(CFG)" != "liblwres - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - Win32 Debug"
+!MESSAGE NMAKE /f "liblwres.mak" CFG="liblwres - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "liblwres - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "liblwres - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "liblwres - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "liblwres - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -104,7 +104,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -144,14 +144,14 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /Fp"$(INTDIR)\liblwres.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /Fp"$(INTDIR)\liblwres.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\liblwres.bsc" 
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\liblwres.pdb" /machine:I386 /def:".\liblwres.def" /out:"../../../Build/Release/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\liblwres.pdb" @MACHINE@ /def:".\liblwres.def" /out:"../../../Build/Release/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" 
 DEF_FILE= \
        ".\liblwres.def"
 LINK32_OBJS= \
@@ -184,7 +184,7 @@ LINK32_OBJS= \
 <<
   $(_VC_MANIFEST_EMBED_DLL)
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -253,7 +253,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\liblwres.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../lib/lwres/win32/include/lwres" /I "include" /I "../include" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBLWRES_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\liblwres.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\liblwres.bsc" 
@@ -287,7 +287,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\liblwres.pdb" /debug /machine:I386 /def:".\liblwres.def" /out:"../../../Build/Debug/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib iphlpapi.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\liblwres.pdb" /debug @MACHINE@ /def:".\liblwres.def" /out:"../../../Build/Debug/liblwres.dll" /implib:"$(OUTDIR)\liblwres.lib" /pdbtype:sept 
 DEF_FILE= \
        ".\liblwres.def"
 LINK32_OBJS= \
@@ -362,17 +362,17 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "liblwres - Win32 Release" || "$(CFG)" == "liblwres - Win32 Debug"
+!IF "$(CFG)" == "liblwres - @PLATFORM@ Release" || "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 SOURCE=..\context.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\context.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\context.obj"        "$(INTDIR)\context.sbr" : $(SOURCE) "$(INTDIR)"
@@ -383,13 +383,13 @@ SOURCE=..\context.c
 
 SOURCE=.\DLLMain.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\DLLMain.obj"        "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
@@ -399,14 +399,14 @@ SOURCE=.\DLLMain.c
 
 SOURCE=..\gai_strerror.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\gai_strerror.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\gai_strerror.obj"   "$(INTDIR)\gai_strerror.sbr" : $(SOURCE) "$(INTDIR)"
@@ -417,14 +417,14 @@ SOURCE=..\gai_strerror.c
 
 SOURCE=..\getaddrinfo.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\getaddrinfo.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\getaddrinfo.obj"    "$(INTDIR)\getaddrinfo.sbr" : $(SOURCE) "$(INTDIR)"
@@ -435,14 +435,14 @@ SOURCE=..\getaddrinfo.c
 
 SOURCE=..\gethost.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\gethost.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\gethost.obj"        "$(INTDIR)\gethost.sbr" : $(SOURCE) "$(INTDIR)"
@@ -453,14 +453,14 @@ SOURCE=..\gethost.c
 
 SOURCE=..\getipnode.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\getipnode.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\getipnode.obj"      "$(INTDIR)\getipnode.sbr" : $(SOURCE) "$(INTDIR)"
@@ -471,14 +471,14 @@ SOURCE=..\getipnode.c
 
 SOURCE=..\getnameinfo.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\getnameinfo.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\getnameinfo.obj"    "$(INTDIR)\getnameinfo.sbr" : $(SOURCE) "$(INTDIR)"
@@ -489,14 +489,14 @@ SOURCE=..\getnameinfo.c
 
 SOURCE=..\getrrset.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\getrrset.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\getrrset.obj"       "$(INTDIR)\getrrset.sbr" : $(SOURCE) "$(INTDIR)"
@@ -507,14 +507,14 @@ SOURCE=..\getrrset.c
 
 SOURCE=..\herror.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\herror.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\herror.obj" "$(INTDIR)\herror.sbr" : $(SOURCE) "$(INTDIR)"
@@ -525,14 +525,14 @@ SOURCE=..\herror.c
 
 SOURCE=..\lwbuffer.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwbuffer.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwbuffer.obj"       "$(INTDIR)\lwbuffer.sbr" : $(SOURCE) "$(INTDIR)"
@@ -543,13 +543,13 @@ SOURCE=..\lwbuffer.c
 
 SOURCE=.\lwconfig.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwconfig.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwconfig.obj"       "$(INTDIR)\lwconfig.sbr" : $(SOURCE) "$(INTDIR)"
@@ -559,14 +559,14 @@ SOURCE=.\lwconfig.c
 
 SOURCE=..\lwinetaton.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwinetaton.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwinetaton.obj"     "$(INTDIR)\lwinetaton.sbr" : $(SOURCE) "$(INTDIR)"
@@ -577,14 +577,14 @@ SOURCE=..\lwinetaton.c
 
 SOURCE=..\lwinetntop.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwinetntop.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwinetntop.obj"     "$(INTDIR)\lwinetntop.sbr" : $(SOURCE) "$(INTDIR)"
@@ -595,14 +595,14 @@ SOURCE=..\lwinetntop.c
 
 SOURCE=..\lwinetpton.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwinetpton.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwinetpton.obj"     "$(INTDIR)\lwinetpton.sbr" : $(SOURCE) "$(INTDIR)"
@@ -613,14 +613,14 @@ SOURCE=..\lwinetpton.c
 
 SOURCE=..\lwpacket.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwpacket.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwpacket.obj"       "$(INTDIR)\lwpacket.sbr" : $(SOURCE) "$(INTDIR)"
@@ -631,14 +631,14 @@ SOURCE=..\lwpacket.c
 
 SOURCE=..\lwres_gabn.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwres_gabn.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwres_gabn.obj"     "$(INTDIR)\lwres_gabn.sbr" : $(SOURCE) "$(INTDIR)"
@@ -649,14 +649,14 @@ SOURCE=..\lwres_gabn.c
 
 SOURCE=..\lwres_gnba.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwres_gnba.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwres_gnba.obj"     "$(INTDIR)\lwres_gnba.sbr" : $(SOURCE) "$(INTDIR)"
@@ -667,14 +667,14 @@ SOURCE=..\lwres_gnba.c
 
 SOURCE=..\lwres_grbn.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwres_grbn.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwres_grbn.obj"     "$(INTDIR)\lwres_grbn.sbr" : $(SOURCE) "$(INTDIR)"
@@ -685,14 +685,14 @@ SOURCE=..\lwres_grbn.c
 
 SOURCE=..\lwres_noop.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwres_noop.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwres_noop.obj"     "$(INTDIR)\lwres_noop.sbr" : $(SOURCE) "$(INTDIR)"
@@ -703,14 +703,14 @@ SOURCE=..\lwres_noop.c
 
 SOURCE=..\lwresutil.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\lwresutil.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\lwresutil.obj"      "$(INTDIR)\lwresutil.sbr" : $(SOURCE) "$(INTDIR)"
@@ -721,13 +721,13 @@ SOURCE=..\lwresutil.c
 
 SOURCE=.\socket.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\socket.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\socket.obj" "$(INTDIR)\socket.sbr" : $(SOURCE) "$(INTDIR)"
@@ -737,13 +737,13 @@ SOURCE=.\socket.c
 
 SOURCE=.\version.c
 
-!IF  "$(CFG)" == "liblwres - Win32 Release"
+!IF  "$(CFG)" == "liblwres - @PLATFORM@ Release"
 
 
 "$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "liblwres - Win32 Debug"
+!ELSEIF  "$(CFG)" == "liblwres - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\version.obj"        "$(INTDIR)\version.sbr" : $(SOURCE) "$(INTDIR)"
diff --git a/lib/lwres/win32/liblwres.vcxproj.filters.in b/lib/lwres/win32/liblwres.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..4b7fed6
--- /dev/null
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="liblwres.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="DLLMain.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="lwconfig.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="socket.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="version.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\context.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\gai_strerror.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\getaddrinfo.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\gethost.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\getipnode.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\getnameinfo.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\getrrset.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\herror.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwbuffer.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwinetaton.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwinetntop.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwinetpton.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwpacket.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwres_gabn.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwres_gnba.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwres_grbn.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwres_noop.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\lwresutil.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="include\lwres\int.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\lwres\net.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\lwres\netdb.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="include\lwres\platform.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\lwres\context.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\lwres\ipv6.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\lwres\lang.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\lwres\list.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\lwres\lwbuffer.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\lwres\lwpacket.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\lwres\lwres.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\lwres\result.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/lwres/win32/liblwres.vcxproj.in b/lib/lwres/win32/liblwres.vcxproj.in
new file mode 100644 (file)
index 0000000..f21998c
--- /dev/null
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{EBDB30A3-E8EB-4E1D-915E-06720600A84E}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>liblwres</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;USE_MD5;@USE_OPENSSL@_DEBUG;_WINDOWS;_USRDLL;LIBLWRES_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\lwres\win32\include;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;USE_MD5;@USE_OPENSSL@NDEBUG;_WINDOWS;_USRDLL;LIBLWRES_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\;..\..\lwres\win32\include;..\..\..\;include;..\include;..\..\isc\win32;..\..\isc\win32\include;..\..\isc\include;..\..\dns\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <None Include="liblwres.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\context.c" />\r
+    <ClCompile Include="..\gai_strerror.c" />\r
+    <ClCompile Include="..\getaddrinfo.c" />\r
+    <ClCompile Include="..\gethost.c" />\r
+    <ClCompile Include="..\getipnode.c" />\r
+    <ClCompile Include="..\getnameinfo.c" />\r
+    <ClCompile Include="..\getrrset.c" />\r
+    <ClCompile Include="..\herror.c" />\r
+    <ClCompile Include="..\lwbuffer.c" />\r
+    <ClCompile Include="..\lwinetaton.c" />\r
+    <ClCompile Include="..\lwinetntop.c" />\r
+    <ClCompile Include="..\lwinetpton.c" />\r
+    <ClCompile Include="..\lwpacket.c" />\r
+    <ClCompile Include="..\lwresutil.c" />\r
+    <ClCompile Include="..\lwres_gabn.c" />\r
+    <ClCompile Include="..\lwres_gnba.c" />\r
+    <ClCompile Include="..\lwres_grbn.c" />\r
+    <ClCompile Include="..\lwres_noop.c" />\r
+    <ClCompile Include="DLLMain.c" />\r
+    <ClCompile Include="lwconfig.c" />\r
+    <ClCompile Include="socket.c" />\r
+    <ClCompile Include="version.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\lwres\context.h" />\r
+    <ClInclude Include="..\include\lwres\ipv6.h" />\r
+    <ClInclude Include="..\include\lwres\lang.h" />\r
+    <ClInclude Include="..\include\lwres\list.h" />\r
+    <ClInclude Include="..\include\lwres\lwbuffer.h" />\r
+    <ClInclude Include="..\include\lwres\lwpacket.h" />\r
+    <ClInclude Include="..\include\lwres\lwres.h" />\r
+    <ClInclude Include="..\include\lwres\result.h" />\r
+    <ClInclude Include="include\lwres\int.h" />\r
+    <ClInclude Include="include\lwres\net.h" />\r
+    <ClInclude Include="include\lwres\netdb.h" />\r
+    <ClInclude Include="include\lwres\platform.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/lwres/win32/liblwres.vcxproj.user b/lib/lwres/win32/liblwres.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
index 6f52cee2926a0b32c0df088a35424c2d3bcba6e1..57cc7600f581a20f50cdec490dcb250bdf304d3f 100644 (file)
@@ -25,6 +25,7 @@
 #include <stdio.h>
 
 #include <isc/lang.h>
+#include <isc/platform.h>
 #include <isc/result.h>
 #include <isc/formatcheck.h>
 
@@ -65,11 +66,21 @@ typedef struct {
        const char      *func_name;
 } testspec_t;
 
-extern int     T_debug;
+LIBTESTS_EXTERNAL_DATA extern  int     T_debug;
+#ifndef WIN32
 extern testspec_t T_testlist[];
+#endif
 
 ISC_LANG_BEGINDECLS
 
+#ifdef WIN32
+void
+t_settests(const testspec_t list[]);
+
+int
+t_main(int argc, char **argv);
+#endif
+
 void
 t_assert(const char *component, int anum, int class, const char *what, ...)
      ISC_FORMAT_PRINTF(4, 5);
index 113da752bed262529ec91d8e324f493f72c6596e..8978d73fb143e68b515e6c8677d85187dac774fa 100644 (file)
 #include <time.h>
 #include <unistd.h>
 
+#ifndef WIN32
 #include <sys/wait.h>
+#else
+#include <direct.h>
+#endif
 
 #include <isc/boolean.h>
 #include <isc/commandline.h>
@@ -84,6 +88,9 @@ static char           T_tvec[T_MAXTESTS / 8];
 static char *          T_env[T_MAXENV + 1];
 static char            T_buf[T_BIGBUF];
 static char *          T_dir;
+#ifdef WIN32
+static testspec_t      T_testlist[T_MAXTESTS];
+#endif
 
 static int
 t_initconf(const char *path);
@@ -111,20 +118,31 @@ t_sighandler(int sig) {
 }
 
 int
-main(int argc, char **argv) {
+#ifndef WIN32
+main(int argc, char **argv)
+#else
+t_main(int argc, char **argv)
+#endif
+{
        int                     c;
        int                     tnum;
+#ifndef WIN32
        int                     subprocs;
        pid_t                   deadpid;
        int                     status;
+#endif
        int                     len;
        isc_boolean_t           first;
        testspec_t              *pts;
+#ifndef WIN32
        struct sigaction        sa;
+#endif
 
        isc_mem_debugging = ISC_MEM_DEBUGRECORD;
        first = ISC_TRUE;
+#ifndef WIN32
        subprocs = 1;
+#endif
        T_timeout = T_TCTOUT;
 
        /*
@@ -203,7 +221,9 @@ main(int argc, char **argv) {
                        exit(0);
                }
                else if (c == 'x') {
+#ifndef WIN32
                        subprocs = 0;
+#endif
                }
                else if (c == 'q') {
                        T_timeout = atoi(isc_commandline_argument);
@@ -240,12 +260,14 @@ main(int argc, char **argv) {
         * Setup signals.
         */
 
+#ifndef WIN32
        sa.sa_flags = 0;
        sigfillset(&sa.sa_mask);
 
        sa.sa_handler = t_sighandler;
        (void)sigaction(SIGINT,  &sa, NULL);
        (void)sigaction(SIGALRM, &sa, NULL);
+#endif
 
        /*
         * Output start stanza to journal.
@@ -275,6 +297,7 @@ main(int argc, char **argv) {
        pts = &T_testlist[0];
        while (*pts->pfv != NULL) {
                if (T_tvec[tnum / 8] & (0x01 << (tnum % 8))) {
+#ifndef WIN32
                        if (subprocs) {
                                T_pid = fork();
                                if (T_pid == 0) {
@@ -327,6 +350,9 @@ main(int argc, char **argv) {
                        else {
                                (*pts->pfv)();
                        }
+#else
+                       (*pts->pfv)();
+#endif
                }
                ++pts;
                ++tnum;
@@ -525,7 +551,7 @@ t_fgetbs(FILE *fp) {
                p = buf;
                while ((c = fgetc(fp)) != EOF) {
 
-                       if (c == '\n')
+                       if ((c == '\r') || (c == '\n'))
                                break;
 
                        *p++ = c;
@@ -801,3 +827,20 @@ t_eval(const char *filename, int (*func)(char **), int nargs) {
 
        return (result);
 }
+
+#ifdef WIN32
+void
+t_settests(const testspec_t list[]) {
+       int                     tnum;
+       const testspec_t        *pts;
+
+       memset(T_testlist, 0, sizeof(T_testlist));
+
+       pts = &list[0];
+       for (tnum = 0; tnum < T_MAXTESTS - 1; pts++, tnum++) {
+               if (*pts->pfv == NULL)
+                       break;
+               T_testlist[tnum] = *pts;
+       }
+}
+#endif
diff --git a/lib/tests/win32/DLLMain.c b/lib/tests/win32/DLLMain.c
new file mode 100644 (file)
index 0000000..8e4cd38
--- /dev/null
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id$ */
+
+#include <windows.h>
+#include <signal.h>
+
+/*
+ * Called when we enter the DLL
+ */
+__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL,
+                                         DWORD fdwReason, LPVOID lpvReserved)
+{
+       switch (fdwReason) {
+       /*
+        * The DLL is loading due to process
+        * initialization or a call to LoadLibrary.
+        */
+       case DLL_PROCESS_ATTACH:
+               break;
+
+       /* The attached process creates a new thread.  */
+       case DLL_THREAD_ATTACH:
+               break;
+
+       /* The thread of the attached process terminates. */
+       case DLL_THREAD_DETACH:
+               break;
+
+       /*
+        * The DLL is unloading from a process due to
+        * process termination or a call to FreeLibrary.
+        */
+       case DLL_PROCESS_DETACH:
+               break;
+
+       default:
+               break;
+       }
+       return (TRUE);
+}
+
diff --git a/lib/tests/win32/libtests.def b/lib/tests/win32/libtests.def
new file mode 100644 (file)
index 0000000..ed11153
--- /dev/null
@@ -0,0 +1,15 @@
+LIBRARY libtests
+
+; Exported Functions
+EXPORTS
+t_assert
+t_bustline
+t_dc_method_fromtext
+t_dns_result_fromtext
+t_eval
+t_fgetbs
+t_getenv
+t_info
+t_main
+t_result
+t_settests
diff --git a/lib/tests/win32/libtests.dsp.in b/lib/tests/win32/libtests.dsp.in
new file mode 100644 (file)
index 0000000..c638991
--- /dev/null
@@ -0,0 +1,121 @@
+# Microsoft Developer Studio Project File - Name="libtests" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
+
+CFG=libtests - @PLATFORM@ Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libtests.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libtests.mak" CFG="libtests - @PLATFORM@ Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libtests - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libtests - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" @COPTY@ /FD /c
+# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 @LIBXML2_INC@ /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" @COPTY@ /FD /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libtests.dll"
+
+!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" @COPTY@ /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @LIBXML2_INC@ /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" /FR @COPTY@ /FD /GZ /c
+# SUBTRACT CPP /X
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib /nologo /dll /debug @MACHINE@ /out:"../../../Build/Debug/libtests.dll" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libtests - @PLATFORM@ Release"
+# Name "libtests - @PLATFORM@ Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\t_api.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\DLLMain.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\tests\t_api.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=.\libtests.def
+# End Source File
+# End Target
+# End Project
diff --git a/lib/tests/win32/libtests.dsw b/lib/tests/win32/libtests.dsw
new file mode 100644 (file)
index 0000000..c9a15a1
--- /dev/null
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libtests"=.\libtests.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/lib/tests/win32/libtests.mak.in b/lib/tests/win32/libtests.mak.in
new file mode 100644 (file)
index 0000000..18b1734
--- /dev/null
@@ -0,0 +1,378 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on libtests.dsp
+!IF "$(CFG)" == ""
+CFG=libtests - @PLATFORM@ Release
+!MESSAGE No configuration specified. Defaulting to libtests - @PLATFORM@ Release.
+!ENDIF 
+
+!IF "$(CFG)" != "libtests - @PLATFORM@ Release" && "$(CFG)" != "libtests - @PLATFORM@ Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libtests.mak" CFG="libtests - @PLATFORM@ Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libtests - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "libtests - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Release\libtests.dll"
+
+!ELSE 
+
+ALL : "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\libtests.dll"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_api.obj"
+       -@erase "$(INTDIR)\DLLMain.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(OUTDIR)\libtests.exp"
+       -@erase "$(OUTDIR)\libtests.lib"
+       -@erase "..\..\..\Build\Release\libtests.dll"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 @LIBXML2_INC@ /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" /Fp"$(INTDIR)\libtests.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libtests.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libtests.pdb" @MACHINE@ /def:".\libtests.def" /out:"../../../Build/Release/libtests.dll" /implib:"$(OUTDIR)\libtests.lib" 
+DEF_FILE= \
+       ".\libtests.def"
+LINK32_OBJS= \
+       "$(INTDIR)\t_api.obj" \
+       "$(INTDIR)\DLLMain.obj" \
+       "..\..\dns\win32\Release\libdns.lib" \
+       "..\..\isc\win32\Release\libisc.lib"
+
+"..\..\..\Build\Release\libtests.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+  $(_VC_MANIFEST_EMBED_DLL)
+
+!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\..\..\Build\Debug\libtests.dll" "$(OUTDIR)\libtests.bsc"
+
+!ELSE 
+
+ALL : "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\libtests.dll" "$(OUTDIR)\libtests.bsc"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN"
+!ELSE 
+CLEAN :
+!ENDIF 
+       -@erase "$(INTDIR)\t_api.obj"
+       -@erase "$(INTDIR)\t_api.sbr"
+       -@erase "$(INTDIR)\DLLMain.obj"
+       -@erase "$(INTDIR)\DLLMain.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\libtests.bsc"
+       -@erase "$(OUTDIR)\libtests.exp"
+       -@erase "$(OUTDIR)\libtests.lib"
+       -@erase "$(OUTDIR)\libtests.pdb"
+       -@erase "..\..\..\Build\Debug\libtests.dll"
+       -@erase "..\..\..\Build\Debug\libtests.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @LIBXML2_INC@ /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libtests.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libtests.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\t_api.sbr" \
+       "$(INTDIR)\DLLMain.sbr"
+
+"$(OUTDIR)\libtests.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libtests.pdb" /debug @MACHINE@ /def:".\libtests.def" /out:"../../../Build/Debug/libtests.dll" /implib:"$(OUTDIR)\libtests.lib" /pdbtype:sept 
+DEF_FILE= \
+       ".\libtests.def"
+LINK32_OBJS= \
+       "$(INTDIR)\t_api.obj" \
+       "$(INTDIR)\DLLMain.obj" \
+       "..\..\dns\win32\Debug\libdns.lib" \
+       "..\..\isc\win32\Debug\libisc.lib"
+
+"..\..\..\Build\Debug\libtests.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+  $(_VC_MANIFEST_EMBED_DLL)
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("libtests.dep")
+!INCLUDE "libtests.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "libtests.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "libtests - @PLATFORM@ Release" || "$(CFG)" == "libtests - @PLATFORM@ Debug"
+SOURCE=..\t_api.c
+
+!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
+
+
+"$(INTDIR)\t_api.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\t_api.obj"  "$(INTDIR)\t_api.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=.\DLLMain.c
+
+!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
+
+
+"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
+
+
+"$(INTDIR)\DLLMain.obj"        "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
+
+"libdns - @PLATFORM@ Release" : 
+   cd "..\..\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
+   cd "..\..\tests\win32"
+
+"libdns - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\tests\win32"
+
+!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
+
+"libdns - @PLATFORM@ Debug" : 
+   cd "..\..\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
+   cd "..\..\tests\win32"
+
+"libdns - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\dns\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\tests\win32"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
+
+"libisc - @PLATFORM@ Release" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
+   cd "..\..\tests\win32"
+
+"libisc - @PLATFORM@ ReleaseCLEAN" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
+   cd "..\..\tests\win32"
+
+!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
+
+"libisc - @PLATFORM@ Debug" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
+   cd "..\..\tests\win32"
+
+"libisc - @PLATFORM@ DebugCLEAN" : 
+   cd "..\..\isc\win32"
+   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
+   cd "..\..\tests\win32"
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP
diff --git a/lib/tests/win32/libtests.vcxproj.filters.in b/lib/tests/win32/libtests.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..ed52796
--- /dev/null
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="libtests.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="DLLMain.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\t_api.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\tests\t_api.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/tests/win32/libtests.vcxproj.in b/lib/tests/win32/libtests.vcxproj.in
new file mode 100644 (file)
index 0000000..d959c08
--- /dev/null
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{F6F08940-7597-4FEE-9CE0-E09A009C45A3}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>libtests</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTESTS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../dns/include;@LIBXML2_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalLibraryDirectories>../../isc/win32/$(Configuration);../../dns/win32/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>.\libtests.def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTESTS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../dns/include;@LIBXML2_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <StringPooling>true</StringPooling>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <AdditionalLibraryDirectories>../../isc/win32/$(Configuration);../../dns/win32/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <ModuleDefinitionFile>.\libtests.def</ModuleDefinitionFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <None Include="libtests.def" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\t_api.c" />\r
+    <ClCompile Include="DLLMain.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\include\tests\t_api.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/tests/win32/libtests.vcxproj.user b/lib/tests/win32/libtests.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
similarity index 63%
rename from lib/win32/bindevt/bindevt.dsp
rename to lib/win32/bindevt/bindevt.dsp.in
index 4c9dc6b6aa804a90339caec1b613bc76f658d71e..34cbbd10f29b36ae8116fbcf9912462ac4eac3bb 100644 (file)
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
 
-CFG=bindevt - Win32 Debug
+CFG=bindevt - @PLATFORM@ Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=bindevt - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - Win32 Debug"
+!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "bindevt - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "bindevt - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "bindevt - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "bindevt - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "bindevt - Win32 Release"
+!IF  "$(CFG)" == "bindevt - @PLATFORM@ Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,9 +42,9 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FD /c
+# SUBTRACT CPP @COPTY@ /Yc /Yu
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\Build\Release\bindevt.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none @MACHINE@ /out:"..\..\..\Build\Release\bindevt.dll"
 
-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bindevt - @PLATFORM@ Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -69,9 +69,9 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR /FD /GZ /c
+# SUBTRACT CPP @COPTY@ /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,15 +80,15 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\bindevt.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug @MACHINE@ /out:"..\..\..\Build\Debug\bindevt.dll"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "bindevt - Win32 Release"
-# Name "bindevt - Win32 Debug"
+# Name "bindevt - @PLATFORM@ Release"
+# Name "bindevt - @PLATFORM@ Debug"
 # Begin Source File
 
 SOURCE=.\bindevt.c
@@ -97,7 +97,7 @@ SOURCE=.\bindevt.c
 
 SOURCE=.\bindevt.mc
 
-!IF  "$(CFG)" == "bindevt - Win32 Release"
+!IF  "$(CFG)" == "bindevt - @PLATFORM@ Release"
 
 # Begin Custom Build
 TargetName=bindevt
@@ -109,7 +109,7 @@ InputName=bindevt
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bindevt - @PLATFORM@ Debug"
 
 # Begin Custom Build
 TargetName=bindevt
similarity index 80%
rename from lib/win32/bindevt/bindevt.mak
rename to lib/win32/bindevt/bindevt.mak.in
index 8dd6326c0839a7afd8deda5a18d0aa2f239c3e43..b8b503e8a0cb1e90478e9a55821efed7b24b8133 100644 (file)
@@ -1,20 +1,20 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on bindevt.dsp
 !IF "$(CFG)" == ""
-CFG=bindevt - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to bindevt - Win32 Debug.
+CFG=bindevt - @PLATFORM@ Debug
+!MESSAGE No configuration specified. Defaulting to bindevt - @PLATFORM@ Debug.
 !ENDIF 
 
-!IF "$(CFG)" != "bindevt - Win32 Release" && "$(CFG)" != "bindevt - Win32 Debug"
+!IF "$(CFG)" != "bindevt - @PLATFORM@ Release" && "$(CFG)" != "bindevt - @PLATFORM@ Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - Win32 Debug"
+!MESSAGE NMAKE /f "bindevt.mak" CFG="bindevt - @PLATFORM@ Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "bindevt - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "bindevt - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "bindevt - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
+!MESSAGE "bindevt - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
 !MESSAGE 
 !ERROR An invalid configuration is specified.
 !ENDIF 
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "bindevt - Win32 Release"
+!IF  "$(CFG)" == "bindevt - @PLATFORM@ Release"
 _VC_MANIFEST_INC=0
 _VC_MANIFEST_BASENAME=__VC80
 !ELSE
@@ -104,7 +104,7 @@ _VC_MANIFEST_CLEAN=
 
 !endif
 
-!IF  "$(CFG)" == "bindevt - Win32 Release"
+!IF  "$(CFG)" == "bindevt - @PLATFORM@ Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
@@ -123,7 +123,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MT /W3 @COPTX@ @COPTI@ /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "NDEBUG" 
 BSC32=bscmake.exe
@@ -131,7 +131,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\Build\Release\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none @MACHINE@ /out:"..\..\..\Build\Release\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" 
 LINK32_OBJS= \
        "$(INTDIR)\bindevt.obj" \
        "$(INTDIR)\bindevt.res"
@@ -142,7 +142,7 @@ LINK32_OBJS= \
 <<
   $(_VC_MANIFEST_EMBED_DLL)
 
-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bindevt - @PLATFORM@ Debug"
 
 OUTDIR=.\Debug
 INTDIR=.\Debug
@@ -167,7 +167,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "_DEBUG" 
 BSC32=bscmake.exe
@@ -181,7 +181,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug @MACHINE@ /out:"..\..\..\Build\Debug\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" 
 LINK32_OBJS= \
        "$(INTDIR)\bindevt.obj" \
        "$(INTDIR)\bindevt.res"
@@ -234,16 +234,16 @@ LINK32_OBJS= \
 !ENDIF 
 
 
-!IF "$(CFG)" == "bindevt - Win32 Release" || "$(CFG)" == "bindevt - Win32 Debug"
+!IF "$(CFG)" == "bindevt - @PLATFORM@ Release" || "$(CFG)" == "bindevt - @PLATFORM@ Debug"
 SOURCE=.\bindevt.c
 
-!IF  "$(CFG)" == "bindevt - Win32 Release"
+!IF  "$(CFG)" == "bindevt - @PLATFORM@ Release"
 
 
 "$(INTDIR)\bindevt.obj" : $(SOURCE) "$(INTDIR)"
 
 
-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bindevt - @PLATFORM@ Debug"
 
 
 "$(INTDIR)\bindevt.obj"        "$(INTDIR)\bindevt.sbr" : $(SOURCE) "$(INTDIR)"
@@ -253,7 +253,7 @@ SOURCE=.\bindevt.c
 
 SOURCE=.\bindevt.mc
 
-!IF  "$(CFG)" == "bindevt - Win32 Release"
+!IF  "$(CFG)" == "bindevt - @PLATFORM@ Release"
 
 TargetName=bindevt
 InputPath=.\bindevt.mc
@@ -266,7 +266,7 @@ InputName=bindevt
 << 
        
 
-!ELSEIF  "$(CFG)" == "bindevt - Win32 Debug"
+!ELSEIF  "$(CFG)" == "bindevt - @PLATFORM@ Debug"
 
 TargetName=bindevt
 InputPath=.\bindevt.mc
diff --git a/lib/win32/bindevt/bindevt.vcxproj.filters.in b/lib/win32/bindevt/bindevt.vcxproj.filters.in
new file mode 100644 (file)
index 0000000..2790c2f
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <ClCompile Include="bindevt.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="bindevt.mc" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="bindevt.rc" />\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/win32/bindevt/bindevt.vcxproj.in b/lib/win32/bindevt/bindevt.vcxproj.in
new file mode 100644 (file)
index 0000000..a1e9651
--- /dev/null
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|@PLATFORM@">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|@PLATFORM@">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>@PLATFORM@</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>bindevt</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <CustomBuildBeforeTargets>ResourceCompile</CustomBuildBeforeTargets>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir>.\$(Configuration)\</IntDir>\r
+    <CustomBuildBeforeTargets>ResourceCompile</CustomBuildBeforeTargets>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">\r
+    <ClCompile>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BINDEVT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\include;..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <BrowseInformation>true</BrowseInformation>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+    </Link>\r
+    <CustomBuildStep>\r
+      <Command>mc bindevt.mc</Command>\r
+    </CustomBuildStep>\r
+    <CustomBuildStep>\r
+      <Outputs>$(TargetName).rc</Outputs>\r
+    </CustomBuildStep>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>false</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BINDEVT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\include;..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>\r
+      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>\r
+      <ObjectFileName>.\$(Configuration)\</ObjectFileName>\r
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Console</SubSystem>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>\r
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
+      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>\r
+    </Link>\r
+    <CustomBuildStep>\r
+      <Command>mc bindevt.mc</Command>\r
+    </CustomBuildStep>\r
+    <CustomBuildStep>\r
+      <Outputs>$(TargetName).rc</Outputs>\r
+    </CustomBuildStep>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="bindevt.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="bindevt.mc" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="bindevt.rc" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/lib/win32/bindevt/bindevt.vcxproj.user b/lib/win32/bindevt/bindevt.vcxproj.user
new file mode 100644 (file)
index 0000000..695b5c7
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+</Project>
\ No newline at end of file
diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat
deleted file mode 100644 (file)
index d56e177..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-echo off
-rem
-rem Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-rem Copyright (C) 2001-2002  Internet Software Consortium.
-rem
-rem Permission to use, copy, modify, and distribute this software for any
-rem purpose with or without fee is hereby granted, provided that the above
-rem copyright notice and this permission notice appear in all copies.
-rem 
-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-rem PERFORMANCE OF THIS SOFTWARE.
-
-rem BuildAll.bat
-rem This script sets up the files necessary ready to build BIND 9
-rem and then builds all of the binaries that make up the installation kit.
-rem This requires perl to be installed on the system.
-
-rem IMPORTANT NOTE:
-rem OpenSSL is a prerequisite for building and running this release of
-rem BIND 9. You must fetch the OpenSSL sources yourself from
-rem http://www.OpenSSL.org/ and compile it yourself.  The code must reside
-rem at the same level as the bind 9.2.0 source tree and it's top-level
-rem directory be named openssl-0.9.6k. This restriction will be lifted in
-rem a future release of BIND 9 for Windows NT/2000/XP.
-
-echo Setting up the BIND files required for the build
-
-rem Setup the files
-call BuildSetup.bat
-
-echo Build all of the Library files
-
-cd ..\lib
-
-cd isc\win32
-nmake /nologo -f libisc.mak CFG="libisc - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd dns\win32
-nmake /nologo -f libdns.mak CFG="libdns - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd isccfg\win32
-nmake /nologo -f libisccfg.mak CFG="libisccfg - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd isccc\win32
-nmake /nologo -f libisccc.mak CFG="libisccc - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd bind9\win32
-nmake /nologo -f libbind9.mak CFG="libbind9 - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd lwres\win32
-nmake /nologo -f liblwres.mak CFG="liblwres - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-rem This is the DLL required for the event Viewer
-
-cd win32\bindevt
-nmake /nologo -f bindevt.mak CFG="bindevt - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd ..
-
-echo Now build the apps
-
-cd bin
-
-cd named\win32
-nmake /nologo -f named.mak CFG="named - Win32 Release"  NO_EXTERNAL_DEPS="1"
-
-cd ..\..
-
-cd rndc\win32
-nmake /nologo -f rndc.mak CFG="rndc - Win32 Release"  NO_EXTERNAL_DEPS="1"
-
-cd ..\..
-
-cd confgen\win32
-nmake /nologo -f rndcconfgen.mak CFG="rndcconfgen - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f ddnsconfgen.mak CFG="ddnsconfgen - Win32 Release"  NO_EXTERNAL_DEPS="1"
-
-cd ..\..
-
-cd dig\win32
-nmake /nologo -f dig.mak CFG="dig - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo /nologo -f host.mak CFG="host - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f nslookup.mak CFG="nslookup - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd nsupdate\win32
-nmake /nologo -f nsupdate.mak CFG="nsupdate - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd check\win32
-nmake /nologo -f namedcheckconf.mak CFG="namedcheckconf - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f namedcheckzone.mak CFG="namedcheckzone - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd dnssec\win32
-nmake /nologo -f keygen.mak CFG="keygen - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f signzone.mak CFG="signzone - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f dsfromkey.mak CFG="dsfromkey - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f keyfromlabel.mak CFG="keyfromlabel - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f revoke.mak CFG="revoke - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f settime.mak CFG="settime - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd pkcs11\win32
-nmake /nologo -f pk11keygen.mak CFG="pk11keygen - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f pk11list.mak CFG="pk11list - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f pk11destroy.mak CFG="pk11destroy - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd tools\win32
-nmake /nologo -f arpaname.mak CFG="arpaname - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f genrandom.mak CFG="genrandom - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f nsec3hash.mak CFG="nsec3hash - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f journalprint.mak CFG="journalprint - Win32 Release"  NO_EXTERNAL_DEPS="1"
-nmake /nologo -f ischmacfixup.mak CFG="ischmacfixup - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-rem This is the BIND 9 Installer
-
-cd win32\BINDInstall
-nmake /nologo -f BINDInstall.mak CFG="BINDInstall - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..\..
-
-cd ..
-
-cd win32utils
-
-call BuildPost.bat
-
-echo Done.
-
-rem exit here.
diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
deleted file mode 100644 (file)
index 6e11707..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-echo off
-rem
-rem Copyright (C) 2004,2005  Internet Systems Consortium, Inc. ("ISC")
-rem Copyright (C) 2001-2002  Internet Software Consortium.
-rem 
-rem Permission to use, copy, modify, and distribute this software for any
-rem purpose with or without fee is hereby granted, provided that the above
-rem copyright notice and this permission notice appear in all copies.
-rem 
-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-rem PERFORMANCE OF THIS SOFTWARE.
-
-rem BuildSetup.bat
-rem This script sets up the files necessary ready to build BIND 9.
-rem This requires perl to be installed on the system.
-
-rem Set up the configuration file
-cd ..
-copy config.h.win32 config.h
-cd win32utils
-
-rem Make sure all the files that need to be in DOS format really are
-perl todos.pl
-
-rem Get and update for the latest build of the openssl and libxml libraries
-perl updateopenssl.pl
-perl updatelibxml2.pl
-
-rem Generate the version information
-perl makeversion.pl
-
-rem Generate the SRCID information
-perl makesrcid.pl
-
-rem Generate header files for lib/dns
-call dnsheadergen.bat
-
-rem Make sure that the Build directories are there.
-
-if NOT Exist ..\Build mkdir ..\Build
-if NOT Exist ..\Build\Release mkdir ..\Build\Release
-if NOT Exist ..\Build\Debug mkdir ..\Build\Debug
-
-echo Copying the ARM and the Installation Notes.
-
-copy ..\COPYRIGHT ..\Build\Release
-copy ..\README ..\Build\Release
-copy ..\HISTORY ..\Build\Release
-copy readme1st.txt ..\Build\Release
-copy index.html ..\Build\Release
-copy ..\doc\arm\*.html ..\Build\Release
-copy ..\doc\arm\Bv9ARM.pdf ..\Build\Release
-copy ..\CHANGES ..\Build\Release
-if Exist ..\CHANGES.SE copy ..\CHANGES.SE ..\Build\Release
-copy ..\FAQ ..\Build\Release
-
-echo Copying the standalone manual pages.
-
-copy ..\bin\named\named.html ..\Build\Release
-copy ..\bin\rndc\*.html ..\Build\Release
-copy ..\bin\confgen\*.html ..\Build\Release
-copy ..\bin\dig\*.html ..\Build\Release
-copy ..\bin\nsupdate\*.html ..\Build\Release
-copy ..\bin\check\*.html ..\Build\Release
-copy ..\bin\dnssec\dnssec-keygen.html ..\Build\Release
-copy ..\bin\dnssec\dnssec-signzone.html ..\Build\Release
-copy ..\bin\dnssec\dnssec-dsfromkey.html ..\Build\Release
-copy ..\bin\dnssec\dnssec-keyfromlabel.html ..\Build\Release
-copy ..\bin\pkcs11\pkcs11-keygen.html ..\Build\Release
-copy ..\bin\pkcs11\pkcs11-list.html ..\Build\Release
-copy ..\bin\pkcs11\pkcs11-destroy.html ..\Build\Release
-
-echo Copying the migration notes.
-
-copy ..\doc\misc\migration ..\Build\Release
-copy ..\doc\misc\migration-4to9 ..\Build\Release
-
-call SetupLibs.bat
-
-rem
-rem try to find vcredist_x86.exe upper
-rem
-if Not Defined VCRedistPath (
-if Exist ..\..\vcredist_x86.exe set VCRedistPath=..\..\vcredist_x86.exe
-)
-
-rem
-rem get vcredist where someone said it should be
-rem
-if Defined VCRedistPath (
-
-if Exist "%VCRedistPath%" (
-
-echo Copying Visual C x86 Redistributable Installer
-
-rem
-rem Use /Y so we always have the current version of the installer.
-rem
-
-copy /Y "%VCRedistPath%" ..\Build\Release\
-copy /Y        "%VCRedistPath%" ..\Build\Debug\
-
-) else (
-
-       echo "**** %VCRedistPath% not found ****"
-
-)
-) else (
-
-if Defined FrameworkSDKDir (
-
-rem
-rem vcredist_x86.exe path relative to FrameworkSDKDir
-rem 
-if Exist "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe" (
-
-echo Copying Visual C x86 Redistributable Installer
-
-rem
-rem Use /Y so we allways have the current version of the installer.
-rem
-
-copy /Y "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"  ..\Build\Release\
-copy /Y "%FrameworkSDKDir%\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"  ..\Build\Debug\
-
-) else (
-       echo "**** %FrameworkSDKDir%\%vcredist% not found ****"
-)
-) else (
-if NOT Defined FrameworkDir (
-       echo "**** Warning FrameworkSDKDir not defined ****"
-       echo "****         Run vsvars32.bat            ****"
-) else (
-       echo "**** vcredist_x86.exe not found ****"
-       echo "**** please set VCRedistPath ****"
-)
-)
-)
-
-echo Running Message Compiler
-
-cd ..\lib\win32\bindevt
-mc bindevt.mc
-cd ..\..\..\win32utils
-
-rem Done
diff --git a/win32utils/Configure b/win32utils/Configure
new file mode 100644 (file)
index 0000000..9316615
--- /dev/null
@@ -0,0 +1,2580 @@
+#!/usr/bin/perl
+#
+# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+# $Id$
+
+# Configure
+#
+# This script builds nmake and visual studio build files
+#
+
+require 5.000;
+use strict;
+use File::Spec;
+
+# files to configure
+
+my $configfilein = "..\\config.h.win32";
+my $configfileout = ">..\\config.h";
+my $platformfile = "..\\lib\\isc\\win32\\include\\isc\\platform.h";
+
+my @filelist = ("..\\bin\\check\\win32\\checktool.dsp",
+                "..\\bin\\check\\win32\\checkconf.dsp",
+                "..\\bin\\check\\win32\\checkconf.mak",
+                "..\\bin\\check\\win32\\checkzone.dsp",
+                "..\\bin\\check\\win32\\checkzone.mak",
+                "..\\bin\\confgen\\win32\\confgentool.dsp",
+                "..\\bin\\confgen\\win32\\ddnsconfgen.dsp",
+                "..\\bin\\confgen\\win32\\ddnsconfgen.mak",
+                "..\\bin\\confgen\\win32\\rndcconfgen.dsp",
+                "..\\bin\\confgen\\win32\\rndcconfgen.mak",
+                "..\\bin\\dig\\win32\\dig.dsp",
+                "..\\bin\\dig\\win32\\dig.mak",
+                "..\\bin\\dig\\win32\\dighost.dsp",
+                "..\\bin\\dig\\win32\\host.dsp",
+                "..\\bin\\dig\\win32\\host.mak",
+                "..\\bin\\dig\\win32\\nslookup.dsp",
+                "..\\bin\\dig\\win32\\nslookup.mak",
+                "..\\bin\\dnssec\\win32\\dnssectool.dsp",
+                "..\\bin\\dnssec\\win32\\dsfromkey.dsp",
+                "..\\bin\\dnssec\\win32\\dsfromkey.mak",
+                "..\\bin\\dnssec\\win32\\importkey.dsp",
+                "..\\bin\\dnssec\\win32\\importkey.mak",
+                "..\\bin\\dnssec\\win32\\keyfromlabel.dsp",
+                "..\\bin\\dnssec\\win32\\keyfromlabel.mak",
+                "..\\bin\\dnssec\\win32\\keygen.dsp",
+                "..\\bin\\dnssec\\win32\\keygen.mak",
+                "..\\bin\\dnssec\\win32\\revoke.dsp",
+                "..\\bin\\dnssec\\win32\\revoke.mak",
+                "..\\bin\\dnssec\\win32\\settime.dsp",
+                "..\\bin\\dnssec\\win32\\settime.mak",
+                "..\\bin\\dnssec\\win32\\signzone.dsp",
+                "..\\bin\\dnssec\\win32\\signzone.mak",
+                "..\\bin\\named\\win32\\named.dsp",
+                "..\\bin\\named\\win32\\named.mak",
+                "..\\bin\\nsupdate\\win32\\nsupdate.dsp",
+                "..\\bin\\nsupdate\\win32\\nsupdate.mak",
+                "..\\bin\\pkcs11\\win32\\pk11destroy.dsp",
+                "..\\bin\\pkcs11\\win32\\pk11destroy.mak",
+                "..\\bin\\pkcs11\\win32\\pk11keygen.dsp",
+                "..\\bin\\pkcs11\\win32\\pk11keygen.mak",
+                "..\\bin\\pkcs11\\win32\\pk11list.dsp",
+                "..\\bin\\pkcs11\\win32\\pk11list.mak",
+                "..\\bin\\python\\dnssec-checkds.py",
+                "..\\bin\\python\\dnssec-coverage.py",
+                "..\\bin\\rndc\\win32\\rndc.dsp",
+                "..\\bin\\rndc\\win32\\rndc.mak",
+                "..\\bin\\rndc\\win32\\rndcutil.dsp",
+                "..\\bin\\tools\\win32\\arpaname.dsp",
+                "..\\bin\\tools\\win32\\arpaname.mak",
+                "..\\bin\\tools\\win32\\genrandom.dsp",
+                "..\\bin\\tools\\win32\\genrandom.mak",
+                "..\\bin\\tools\\win32\\ischmacfixup.dsp",
+                "..\\bin\\tools\\win32\\ischmacfixup.mak",
+                "..\\bin\\tools\\win32\\journalprint.dsp",
+                "..\\bin\\tools\\win32\\journalprint.mak",
+                "..\\bin\\tools\\win32\\nsec3hash.dsp",
+                "..\\bin\\tools\\win32\\nsec3hash.mak",
+                "..\\bin\\tests\\atomic\\win32\\t_atomic.dsp",
+                "..\\bin\\tests\\atomic\\win32\\t_atomic.mak",
+                "..\\bin\\tests\\db\\win32\\t_db.dsp",
+                "..\\bin\\tests\\db\\win32\\t_db.mak",
+                "..\\bin\\tests\\dst\\win32\\t_dst.dsp",
+                "..\\bin\\tests\\dst\\win32\\t_dst.mak",
+                "..\\bin\\tests\\master\\win32\\t_master.dsp",
+                "..\\bin\\tests\\master\\win32\\t_master.mak",
+                "..\\bin\\tests\\mem\\win32\\t_mem.dsp",
+                "..\\bin\\tests\\mem\\win32\\t_mem.mak",
+                "..\\bin\\tests\\hashes\\win32\\t_hashes.dsp",
+                "..\\bin\\tests\\hashes\\win32\\t_hashes.mak",
+                "..\\bin\\tests\\names\\win32\\t_names.dsp",
+                "..\\bin\\tests\\names\\win32\\t_names.mak",
+                "..\\bin\\tests\\rbt\\win32\\t_rbt.dsp",
+                "..\\bin\\tests\\rbt\\win32\\t_rbt.mak",
+                "..\\bin\\tests\\resolver\\win32\\t_resolver.dsp",
+                "..\\bin\\tests\\resolver\\win32\\t_resolver.mak",
+                "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.dsp",
+                "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.mak",
+                "..\\bin\\tests\\tasks\\win32\\t_tasks.dsp",
+                "..\\bin\\tests\\tasks\\win32\\t_tasks.mak",
+                "..\\bin\\tests\\timers\\win32\\t_timers.dsp",
+                "..\\bin\\tests\\timers\\win32\\t_timers.mak",
+                "..\\bin\\tests\\win32\\backtrace_test.dsp",
+                "..\\bin\\tests\\win32\\backtrace_test.mak",
+                "..\\bin\\tests\\win32\\inter_test.dsp",
+                "..\\bin\\tests\\win32\\inter_test.mak",
+                "..\\bin\\tests\\win32\\rwlock_test.dsp",
+                "..\\bin\\tests\\win32\\rwlock_test.mak",
+                "..\\bin\\tests\\win32\\shutdown_test.dsp",
+                "..\\bin\\tests\\win32\\shutdown_test.mak",
+                "..\\bin\\tests\\win32\\sock_test.dsp",
+                "..\\bin\\tests\\win32\\sock_test.mak",
+                "..\\bin\\tests\\win32\\task_test.dsp",
+                "..\\bin\\tests\\win32\\task_test.mak",
+                "..\\bin\\tests\\win32\\timer_test.dsp",
+                "..\\bin\\tests\\win32\\timer_test.mak",
+                "..\\bin\\tests\\win32\\inter_test.dsp",
+                "..\\bin\\tests\\win32\\inter_test.mak",
+                "..\\bin\\tests\\win32\\rwlock_test.dsp",
+                "..\\bin\\tests\\win32\\rwlock_test.mak",
+                "..\\bin\\tests\\win32\\shutdown_test.dsp",
+                "..\\bin\\tests\\win32\\shutdown_test.mak",
+                "..\\bin\\tests\\win32\\sock_test.dsp",
+                "..\\bin\\tests\\win32\\sock_test.mak",
+                "..\\bin\\tests\\win32\\task_test.dsp",
+                "..\\bin\\tests\\win32\\task_test.mak",
+                "..\\bin\\tests\\win32\\timer_test.dsp",
+                "..\\bin\\tests\\win32\\timer_test.mak",
+                "..\\bin\\win32\\BINDInstall\\BINDInstall.dsp",
+                "..\\bin\\win32\\BINDInstall\\BINDInstall.mak",
+                "..\\lib\\bind9\\win32\\libbind9.dsp",
+                "..\\lib\\bind9\\win32\\libbind9.mak",
+                "..\\lib\\dns\\win32\\gen.dsp",
+                "..\\lib\\dns\\win32\\gen.mak",
+                "..\\lib\\dns\\win32\\libdns.def",
+                "..\\lib\\dns\\win32\\libdns.dsp",
+                "..\\lib\\dns\\win32\\libdns.mak",
+                "..\\lib\\isc\\win32\\libisc.def",
+                "..\\lib\\isc\\win32\\libisc.dsp",
+                "..\\lib\\isc\\win32\\libisc.mak",
+                "..\\lib\\isccc\\win32\\libisccc.dsp",
+                "..\\lib\\isccc\\win32\\libisccc.mak",
+                "..\\lib\\isccfg\\win32\\libisccfg.dsp",
+                "..\\lib\\isccfg\\win32\\libisccfg.mak",
+                "..\\lib\\lwres\\win32\\liblwres.dsp",
+                "..\\lib\\lwres\\win32\\liblwres.mak",
+                "..\\lib\\tests\\win32\\libtests.dsp",
+                "..\\lib\\tests\\win32\\libtests.mak",
+                "..\\lib\\win32\\bindevt\\bindevt.dsp",
+                "..\\lib\\win32\\bindevt\\bindevt.mak",
+                "legacy\\BINDBuild.dsw",
+                "legacy\\BuildAll.bat",
+                "legacy\\BuildPost.bat",
+                "legacy\\BuildSetup.bat");
+
+my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj",
+                   "..\\bin\\check\\win32\\checkconf.vcxproj.filters",
+                   "..\\bin\\check\\win32\\checktool.vcxproj",
+                   "..\\bin\\check\\win32\\checktool.vcxproj.filters",
+                   "..\\bin\\check\\win32\\checkzone.vcxproj",
+                   "..\\bin\\check\\win32\\checkzone.vcxproj.filters",
+                   "..\\bin\\confgen\\win32\\confgentool.vcxproj",
+                   "..\\bin\\confgen\\win32\\confgentool.vcxproj.filters",
+                   "..\\bin\\confgen\\win32\\ddnsconfgen.vcxproj",
+                   "..\\bin\\confgen\\win32\\ddnsconfgen.vcxproj.filters",
+                   "..\\bin\\confgen\\win32\\rndcconfgen.vcxproj",
+                   "..\\bin\\confgen\\win32\\rndcconfgen.vcxproj.filters",
+                   "..\\bin\\dig\\win32\\dig.vcxproj",
+                   "..\\bin\\dig\\win32\\dig.vcxproj.filters",
+                   "..\\bin\\dig\\win32\\dighost.vcxproj",
+                   "..\\bin\\dig\\win32\\dighost.vcxproj.filters",
+                   "..\\bin\\dig\\win32\\host.vcxproj",
+                   "..\\bin\\dig\\win32\\host.vcxproj.filters",
+                   "..\\bin\\dig\\win32\\nslookup.vcxproj",
+                   "..\\bin\\dig\\win32\\nslookup.vcxproj.filters",
+                   "..\\bin\\dnssec\\win32\\dnssectool.vcxproj",
+                   "..\\bin\\dnssec\\win32\\dnssectool.vcxproj.filters",
+                   "..\\bin\\dnssec\\win32\\dsfromkey.vcxproj",
+                   "..\\bin\\dnssec\\win32\\dsfromkey.vcxproj.filters",
+                   "..\\bin\\dnssec\\win32\\importkey.vcxproj",
+                   "..\\bin\\dnssec\\win32\\importkey.vcxproj.filters",
+                   "..\\bin\\dnssec\\win32\\keyfromlabel.vcxproj",
+                   "..\\bin\\dnssec\\win32\\keyfromlabel.vcxproj.filters",
+                   "..\\bin\\dnssec\\win32\\keygen.vcxproj",
+                   "..\\bin\\dnssec\\win32\\keygen.vcxproj.filters",
+                   "..\\bin\\dnssec\\win32\\revoke.vcxproj",
+                   "..\\bin\\dnssec\\win32\\revoke.vcxproj.filters",
+                   "..\\bin\\dnssec\\win32\\settime.vcxproj",
+                   "..\\bin\\dnssec\\win32\\settime.vcxproj.filters",
+                   "..\\bin\\dnssec\\win32\\signzone.vcxproj",
+                   "..\\bin\\dnssec\\win32\\signzone.vcxproj.filters",
+                   "..\\bin\\dnssec\\win32\\verify.vcxproj",
+                   "..\\bin\\dnssec\\win32\\verify.vcxproj.filters",
+                   "..\\bin\\named\\win32\\named.vcxproj",
+                   "..\\bin\\named\\win32\\named.vcxproj.filters",
+                   "..\\bin\\nsupdate\\win32\\nsupdate.vcxproj",
+                   "..\\bin\\nsupdate\\win32\\nsupdate.vcxproj.filters",
+                   "..\\bin\\pkcs11\\win32\\pk11destroy.vcxproj",
+                   "..\\bin\\pkcs11\\win32\\pk11destroy.vcxproj.filters",
+                   "..\\bin\\pkcs11\\win32\\pk11keygen.vcxproj",
+                   "..\\bin\\pkcs11\\win32\\pk11keygen.vcxproj.filters",
+                   "..\\bin\\pkcs11\\win32\\pk11list.vcxproj",
+                   "..\\bin\\pkcs11\\win32\\pk11list.vcxproj.filters",
+                   "..\\bin\\rndc\\win32\\rndc.vcxproj",
+                   "..\\bin\\rndc\\win32\\rndc.vcxproj.filters",
+                   "..\\bin\\rndc\\win32\\rndcutil.vcxproj",
+                   "..\\bin\\rndc\\win32\\rndcutil.vcxproj.filters",
+                   "..\\bin\\tools\\win32\\arpaname.vcxproj",
+                   "..\\bin\\tools\\win32\\arpaname.vcxproj.filters",
+                   "..\\bin\\tools\\win32\\genrandom.vcxproj",
+                   "..\\bin\\tools\\win32\\genrandom.vcxproj.filters",
+                   "..\\bin\\tools\\win32\\ischmacfixup.vcxproj",
+                   "..\\bin\\tools\\win32\\ischmacfixup.vcxproj.filters",
+                   "..\\bin\\tools\\win32\\journalprint.vcxproj",
+                   "..\\bin\\tools\\win32\\journalprint.vcxproj.filters",
+                   "..\\bin\\tools\\win32\\nsec3hash.vcxproj",
+                   "..\\bin\\tools\\win32\\nsec3hash.vcxproj.filters",
+                   "..\\bin\\tests\\atomic\\win32\\t_atomic.vcxproj",
+                   "..\\bin\\tests\\atomic\\win32\\t_atomic.vcxproj.filters",
+                   "..\\bin\\tests\\db\\win32\\t_db.vcxproj",
+                   "..\\bin\\tests\\db\\win32\\t_db.vcxproj.filters",
+                   "..\\bin\\tests\\dst\\win32\\t_dst.vcxproj",
+                   "..\\bin\\tests\\dst\\win32\\t_dst.vcxproj.filters",
+                   "..\\bin\\tests\\master\\win32\\t_master.vcxproj",
+                   "..\\bin\\tests\\master\\win32\\t_master.vcxproj.filters",
+                   "..\\bin\\tests\\mem\\win32\\t_mem.vcxproj",
+                   "..\\bin\\tests\\mem\\win32\\t_mem.vcxproj.filters",
+                   "..\\bin\\tests\\hashes\\win32\\t_hashes.vcxproj",
+                   "..\\bin\\tests\\hashes\\win32\\t_hashes.vcxproj.filters",
+                   "..\\bin\\tests\\names\\win32\\t_names.vcxproj",
+                   "..\\bin\\tests\\names\\win32\\t_names.vcxproj.filters",
+                   "..\\bin\\tests\\rbt\\win32\\t_rbt.vcxproj",
+                   "..\\bin\\tests\\rbt\\win32\\t_rbt.vcxproj.filters",
+                   "..\\bin\\tests\\resolver\\win32\\t_resolver.vcxproj",
+                   "..\\bin\\tests\\resolver\\win32\\t_resolver.vcxproj.filters",
+                   "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.vcxproj",
+                   "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.vcxproj.filters",
+                   "..\\bin\\tests\\tasks\\win32\\t_tasks.vcxproj",
+                   "..\\bin\\tests\\tasks\\win32\\t_tasks.vcxproj.filters",
+                   "..\\bin\\tests\\timers\\win32\\t_timers.vcxproj",
+                   "..\\bin\\tests\\timers\\win32\\t_timers.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\backtrace_test.vcxproj",
+                   "..\\bin\\tests\\win32\\backtrace_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\inter_test.vcxproj",
+                   "..\\bin\\tests\\win32\\inter_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\rwlock_test.vcxproj",
+                   "..\\bin\\tests\\win32\\rwlock_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\shutdown_test.vcxproj",
+                   "..\\bin\\tests\\win32\\shutdown_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\sock_test.vcxproj",
+                   "..\\bin\\tests\\win32\\sock_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\task_test.vcxproj",
+                   "..\\bin\\tests\\win32\\task_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\timer_test.vcxproj",
+                   "..\\bin\\tests\\win32\\timer_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\inter_test.vcxproj",
+                   "..\\bin\\tests\\win32\\inter_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\rwlock_test.vcxproj",
+                   "..\\bin\\tests\\win32\\rwlock_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\shutdown_test.vcxproj",
+                   "..\\bin\\tests\\win32\\shutdown_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\sock_test.vcxproj",
+                   "..\\bin\\tests\\win32\\sock_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\task_test.vcxproj",
+                   "..\\bin\\tests\\win32\\task_test.vcxproj.filters",
+                   "..\\bin\\tests\\win32\\timer_test.vcxproj",
+                   "..\\bin\\tests\\win32\\timer_test.vcxproj.filters",
+                   "..\\bin\\win32\\BINDInstall\\BINDInstall.vcxproj",
+                   "..\\bin\\win32\\BINDInstall\\BINDInstall.vcxproj.filters",
+                   "..\\lib\\bind9\\win32\\libbind9.vcxproj",
+                   "..\\lib\\bind9\\win32\\libbind9.vcxproj.filters",
+                   "..\\lib\\dns\\win32\\gen.vcxproj",
+                   "..\\lib\\dns\\win32\\gen.vcxproj.filters",
+                   "..\\lib\\dns\\win32\\libdns.vcxproj",
+                   "..\\lib\\dns\\win32\\libdns.vcxproj.filters",
+                   "..\\lib\\isc\\win32\\libisc.vcxproj",
+                   "..\\lib\\isc\\win32\\libisc.vcxproj.filters",
+                   "..\\lib\\isccc\\win32\\libisccc.vcxproj",
+                   "..\\lib\\isccc\\win32\\libisccc.vcxproj.filters",
+                   "..\\lib\\isccfg\\win32\\libisccfg.vcxproj",
+                   "..\\lib\\isccfg\\win32\\libisccfg.vcxproj.filters",
+                   "..\\lib\\lwres\\win32\\liblwres.vcxproj",
+                   "..\\lib\\lwres\\win32\\liblwres.vcxproj.filters",
+                   "..\\lib\\tests\\win32\\libtests.vcxproj",
+                   "..\\lib\\tests\\win32\\libtests.vcxproj.filters",
+                   "..\\lib\\win32\\bindevt\\bindevt.vcxproj",
+                   "..\\lib\\win32\\bindevt\\bindevt.vcxproj.filters",
+                   "bind9.sln");
+
+# for config.h
+
+my %configdefh;
+
+my @substdefh = ("ALLOW_FILTER_AAAA",
+                 "CONFIGARGS",
+                 "DNS_RDATASET_FIXED",
+                 "ENABLE_RPZ_NSDNAME",
+                 "ENABLE_RPZ_NSIP",
+                 "HAVE_EVP_SHA256",
+                 "HAVE_EVP_SHA384",
+                 "HAVE_EVP_SHA512",
+                 "HAVE_GEOIP",
+                 "HAVE_GEOIP_V6",
+                 "HAVE_GEOIP_CITY_V6",
+                 "HAVE_LIBXML2",
+                 "HAVE_OPENSSL_DSA",
+                 "HAVE_OPENSSL_ECDSA",
+                 "HAVE_OPENSSL_GOST",
+                 "HAVE_READLINE",
+                 "ISC_LIST_CHECKINIT",
+                 "WITH_IDN");
+
+# for platform.h
+
+my %configdefp;
+
+my @substdefp = ("ISC_PLATFORM_HAVEATOMICSTORE",
+                 "ISC_PLATFORM_HAVECMPXCHG",
+                 "ISC_PLATFORM_HAVEXADD",
+                 "ISC_PLATFORM_HAVEXADDQ",
+                 "ISC_PLATFORM_OPENSSLHASH",
+                 "ISC_PLATFORM_USEBACKTRACE");
+
+# includes
+
+my %configinc;
+
+my @substinc = ("GSSAPI_INC",
+                "GEOIP_INC",
+                "IDN_INC",
+                "LIBXML2_INC",
+                "OPENSSL_INC",
+                "READLINE_INC");
+
+# libraries
+
+my %configlib;
+
+my @substlib = ("GSSAPI_LIB",
+                "GEOIP_LIB",
+                "IDN_LIB",
+                "KRB5_LIB",
+                "LIBXML2_LIB",
+                "OPENSSL_LIB",
+                "READLINE_LIB",
+                "READLINE_LIBD");
+
+# DLLs
+
+my %configdll;
+
+my @substdll = ("COMERR_DLL",
+                "GSSAPI_DLL",
+                "GEOIP_DLL",
+                "ICONV_DLL",
+                "IDN_DLL",
+                "KRB5_DLL",
+                "K5SPRT_DLL",
+                "LIBXML2_DLL",
+                "OPENSSL_DLL",
+                "WSHELP_DLL");
+
+# variables
+
+my %configvar;
+
+my @substvar = ("BUILD_MACHINE",
+                "BUILD_PLATFORM",
+                "COPTI",
+                "COPTML",
+                "COPTMLD",
+                "COPTX",
+                "COPTY",
+                "INTRINSIC",
+                "MACHINE",
+                "OPENSSL_PATH",
+                "PLATFORM",
+                "PKCS11_TOOLS",
+                "prefix",
+                "PYTHON",
+                "VCREDIST_PATH"),
+
+# defines
+
+my %configdefd;
+
+my @substdefd = ("PK11_LIB_LOCATION",
+                 "USE_GSSAPI",
+                 "USE_OPENSSL",
+                 "USE_PKCS11",
+                 "USE_PYTHON",
+                 "USE_ISC_SPNEGO");
+
+# conditions
+
+my %configcond;
+
+my @substcond = ("ATOMIC",
+                 "GSSAPI",
+                 "GEOIP",
+                 "IDNKIT",
+                 "LIBXML2",
+                 "OPENSSL",
+                 "PKCS11",
+                 "PYTHON",
+                 "TESTS",
+                 "XTESTS");
+
+# arguments
+
+# enable-xxx/disable-xxx
+
+my @enablelist = ("developer",
+                  "fixed-rrset",
+                  "intrinsics",
+                  "isc-spnego",
+                  "openssl-hash",
+                  "filter-aaaa",
+                  "rpz-nsdname",
+                  "rpz-nsip");
+
+
+# with-xxx/without-xxx
+
+my @withlist = ("cross-compile",
+                "ecdsa",
+                "extra-tests",
+                "gssapi",
+                "geoip",
+                "gost",
+                "iconv",
+                "idn",
+                "openssl",
+                "libxml2",
+                "pkcs11",
+                "python",
+                "readline",
+                "tests",
+                "vcredist");
+
+# general arguments
+
+my @optionlist = ("help", "verbose", "legacy", "win32", "x64", "clean");
+
+# usage
+
+my @usage = ("Usage: perl Configure help\n",
+             "       perl Configure options* win32|x64\n",
+             "       perl Configure clean\n");
+
+# help
+
+my @help = (
+"'Configure' configures BIND9 build files.\n\n",
+@usage,
+"\nGeneral Options and Commands:\n",
+"  verbose               (options) print messages\n",
+"  help                  (command) print this help\n",
+"  legacy                (options) process only files for legacy build\n",
+"  win32                 (command) configure for Win32 platform\n",
+"  x64                   (command) configure for x64 platform\n",
+"  clean                 (command) clean up generated files\n",
+"  <none>                (command) print a summary of the configuration\n",
+"\nOptional Features:\n",
+"  enable-intrinsics     enable instrinsic/atomic functions [default=yes]\n",
+"  enable-openssl-hash   use OpenSSL for hash functions [default=no]\n",
+"  enable-isc-spnego     use SPNEGO from lib/dns [default=yes]\n",
+"  enable-filter-aaaa    enable filtering of AAAA records [default=no]\n",
+"  enable-fixed-rrset    enable fixed rrset ordering [default=no]\n",
+"  enable-developer      enable developer build settings [default=no]\n",
+"  enable-rpz-nsip       enable rpz-nsip rules [default=yes]\n",
+"  enable-rpz-nsdname    enable rpz-nsdname rules [default=yes]\n",
+"\nOptional Packages:\n",
+"  with-tests            build with test suite\n",
+"  with-extra-tests      build with extra test suite\n",
+"  with-openssl[=PATH]   build with OpenSSL yes|no|path\n",
+"  with-pkcs11[=PATH]    build with PKCS#11 support yes|no|provider-path\n",
+"  with-ecdsa            crypto ECDSA\n",
+"  with-gost             crypto GOST\n",
+"  with-gssapi[=PATH]    build with MIT KfW GSSAPI yes|no|path\n",
+"  with-libxml2[=PATH]   build with libxml2 library yes|no|path\n",
+"  with-geoip[=PATH]     build with GeoIP support yes|no|path\n",
+"  with-python[=COMMAND] specify python interpreter python|command\n",
+"  with-readline[=PATH]  build with readline library support yes|no|path\n",
+"  with-idn[=PATH]       build with IDN kit support yes|no|path\n",
+"  with-iconv[=PATH]     path of the iconv DLL [default=same than idn]\n",
+"  with-vcredist[=PATH]  visual C++ redistributable package yes|path\n\n",
+"  with-cross-compile    32 / 64 bit build / host plaforms\n");
+
+# Parse arguments
+
+my $verbose = 0;
+my $legacy_only = 0;
+my $want_help = "no";
+my $want_win32 = "no";
+my $want_x64 = "no";
+my $want_clean = "no";
+my $want_unknown = "no";
+my $unknown_value;
+my $enable_intrinsics = "yes";
+my $enable_openssl_hash = "no";
+my $enable_filter_aaaa = "no";
+my $enable_isc_spnego = "yes";
+my $enable_fixed_rrset = "no";
+my $enable_developer = "no";
+my $enable_rpz_nsip = "yes";
+my $enable_rpz_nsdname = "yes";
+my $use_tests = "no";
+my $use_xtests = "no";
+my $use_openssl = "auto";
+my $openssl_path = "..\\..\\";
+my $use_pkcs11 = "no";
+my $pkcs11_path = "unknown";
+my $use_ecdsa = "auto";
+my $use_gost = "auto";
+my $use_gssapi = "no";
+my $gssapi_path = "C:\\Program\ Files\\MIT\\Kerberos\\";
+my $use_geoip = "no";
+my $geoip_path = "";
+my $use_libxml2 = "auto";
+my $libxml2_path = "..\\..\\";
+my $use_python = "auto";
+my $python_command = "python";
+my $use_readline = "no";
+my $readline_path = "..\\..\\";
+my $use_idn = "no";
+my $idn_path = "..\\..\\";
+my $iconv_path = " --idn-- ";
+my $use_vcredist = "yes";
+my $vcredist_path = " --infer-- ";
+my $cross_compile = "no";
+
+# no arguments -> usage
+
+if ($#ARGV < 0) {
+    foreach (@usage) {
+        print $_;
+    }
+    exit 1;
+}
+
+# parse arguments
+
+foreach (@ARGV) {
+    if (/^verbose$/i) {
+        $verbose = 1;
+    } elsif (/^help$/i) {
+        $want_help = "yes";
+    } elsif (/^disable-(.*)$/i) {
+        appargs($_);
+        myenable($1, "no");
+    } elsif (/^enable-(.$)$/i) {
+        appargs($_);
+        myenable($1, "yes");
+    } elsif (/^without-(.*)$/i) {
+        appargs($_);
+        mywith($1, "no");
+    } elsif (/^with-(.*)=(.*)$/i) {
+        appargs($_);
+        mywith($1, $2);
+    } elsif (/^with-(.*)$/i) {
+        appargs($_);
+        mywith($1, "yes");
+    } elsif (/^legacy$/i) {
+        $legacy_only = 1;
+    } elsif (/^win32$/i) {
+        $want_win32 = "yes";
+    } elsif (/^x64$/i) {
+        appargs($_);
+        $want_x64 = "yes";
+    } elsif (/^clean$/i) {
+        $want_clean = "yes";
+    } else {
+        $want_unknown = "yes";
+        $unknown_value = $_;
+    }
+}
+
+# legacy default to win32
+
+if ($legacy_only && ($want_x64 ne "yes")) {
+    $want_win32 = "yes";
+}
+
+# configure the platform
+
+if (($want_win32 eq "yes") && ($want_x64 eq "yes")) {
+    die "can't ask for both Win32 and x64 platforms\n";
+} elsif ($want_win32 eq "yes") {
+    $configvar{"PLATFORM"} = "Win32";
+    $configvar{"BUILD_PLATFORM"} = "Win32";
+    $configvar{"MACHINE"} = "/machine:X86";
+    $configvar{"BUILD_MACHINE"} = "/machine:X86";
+} elsif ($want_x64 eq "yes") {
+    $configvar{"PLATFORM"} = "x64";
+    $configvar{"BUILD_PLATFORM"} = "x64";
+    $configvar{"MACHINE"} = "/machine:X64";
+    $configvar{"BUILD_MACHINE"} = "/machine:X64";
+}
+
+# append seen args to CONFIGARGS define
+
+sub appargs {
+    my $arg = $_[0];
+    # escape backslashes, spaces and double quotes
+    $arg =~ s/([\\ "])/\\$1/g;
+    if (defined($configdefh{"CONFIGARGS"})) {
+        $configdefh{"CONFIGARGS"} .= " " . $arg;
+    } else {
+        $configdefh{"CONFIGARGS"} = $arg;
+    }
+}
+
+if (!$configdefh{"CONFIGARGS"}) {
+    # CONFIGARGS default is "default"
+    $configdefh{"CONFIGARGS"} = "\"default\"";
+} else {
+    my $val = $configdefh{"CONFIGARGS"};
+    $configdefh{"CONFIGARGS"} = "\"'$val'\"";
+}
+
+# parse enable/disable
+
+sub myenable {
+    my $key = $_[0];
+    my $val = $_[1];
+
+    if ($key =~ /^intrinsics$/i) {
+        if ($val =~ /^no$/i) {
+            $enable_intrinsics = "no";
+        }
+    } elsif ($key =~ /^openssl-hash$/i) {
+        if ($val =~ /^yes$/i) {
+            $enable_openssl_hash = "yes";
+        }
+    } elsif ($key =~ /^isc-spnego$/i) {
+        if ($val =~ /^no$/i) {
+            $enable_isc_spnego = "no";
+        }
+    } elsif ($key =~ /^filter-aaaa$/i) {
+        if ($val =~ /^yes$/i) {
+            $enable_filter_aaaa = "yes";
+        }
+    } elsif ($key =~ /^fixed-rrset$/i) {
+        if ($val =~ /^yes$/i) {
+            $enable_fixed_rrset = "yes";
+        }
+    } elsif ($key =~ /^developer$/i) {
+        if ($val =~ /^yes$/i) {
+            $enable_developer = "yes";
+        }
+    } elsif ($key =~ /^rpz-nsip$/i) {
+        if ($val =~ /^no$/i) {
+            $enable_rpz_nsip = "no";
+        }
+    } elsif ($key =~ /^rpz-nsdname$/i) {
+        if ($val =~ /^no$/i) {
+            $enable_rpz_nsdname = "no";
+        }
+    } else {
+        $want_unknown = "yes";
+        if ($val eq "no") {
+            $unknown_value = "disable-" . $key;
+        } else {
+            $unknown_value = "enable-". $key;
+        }
+    }
+}
+
+# enable-developer expansion now
+
+if ($enable_developer eq "yes") {
+    $configdefh{"ISC_LIST_CHECKINIT"} = 1;
+    $enable_filter_aaaa = "yes";
+    # no atf on WIN32
+    $enable_fixed_rrset = "yes";
+    # TODO: dlz filesystem
+    $use_tests = "yes";
+}
+
+# parse with/without
+
+sub mywith {
+    my $key = $_[0];
+    my $val = $_[1];
+
+    if ($key =~ /^tests$/i) {
+        if ($val =~ /^yes$/i) {
+            $use_tests = "yes";
+        }
+    } elsif ($key =~ /^extra-tests$/i) {
+        if ($val =~ /^yes$/i) {
+            $use_tests = "yes";
+            $use_xtests = "yes";
+        }
+    } elsif ($key =~ /^openssl$/i) {
+        if ($val =~ /^no$/i) {
+            $use_openssl = "no";
+        } elsif ($val !~ /^yes$/i) {
+            $use_openssl = "yes";
+            $openssl_path = $val;
+        }
+    } elsif ($key =~ /^pkcs11$/i) {
+        if ($val =~ /^yes$/i) {
+            $use_pkcs11 = "yes";
+        } elsif ($val !~ /^no$/i) {
+            $use_pkcs11= "yes";
+            $pkcs11_path = $val;
+            $pkcs11_path =~ s/\.dll$//i;
+        }
+    } elsif ($key =~ /^ecdsa$/i) {
+        if ($val =~ /^no$/i) {
+            $use_ecdsa = "no";
+        } elsif ($val =~ /^yes$/i) {
+            $use_ecdsa = "yes";
+        }
+    } elsif ($key =~ /^gost$/i) {
+        if ($val =~ /^no$/i) {
+            $use_gost = "no";
+        } elsif ($val =~ /^yes$/i) {
+            $use_gost = "yes";
+        }
+    } elsif ($key =~ /^gssapi$/i) {
+        if ($val !~ /^no$/i) {
+            $use_gssapi = "yes";
+            if ($val !~ /^yes$/i) {
+                $gssapi_path = $val;
+            }
+        }
+    } elsif ($key =~ /^libxml2$/i) {
+        if ($val =~ /^no$/i) {
+            $use_libxml2 = "no";
+        } elsif ($val !~ /^yes$/i) {
+            $use_libxml2 = "yes";
+            $libxml2_path = $val;
+        }
+    } elsif ($key =~ /^geoip$/i) {
+        if ($val !~ /^no$/i) {
+            $use_geoip = "yes";
+            if ($val !~ /^yes$/i) {
+                $geoip_path = $val;
+            }
+        }
+    } elsif ($key =~ /^readline$/i) {
+        if ($val !~ /^no$/i) {
+            $use_readline = "yes";
+            if ($val !~ /^yes$/i) {
+                $readline_path = $val;
+            }
+        }
+    } elsif ($key =~ /^idn$/i) {
+        if ($val !~ /^no$/i) {
+            $use_idn = "yes";
+            if ($val !~ /^yes$/i) {
+                $idn_path = $val;
+            }
+        }
+    } elsif ($key =~ /^iconv$/i) {
+        if ($val =~ /^no$/i) {
+            $want_unknown = "yes";
+            $unknown_value = "without-iconv doesn't make sense)";
+        } elsif ($val !~ /^yes$/i) {
+            $iconv_path = $val;
+        }
+    } elsif ($key =~ /^python$/i) {
+        if ($val =~ /^no$/i) {
+            $use_python = "no";
+        } else {
+            $use_python = "yes";
+            if ($val !~ /^yes$/i) {
+                $python_command = $val;
+            }
+        }
+    } elsif ($key =~ /^vcredist$/i) {
+        if ($val =~ /^no$/i) {
+            $want_unknown = "yes";
+            $unknown_value = "without-vcredist (vcredist is required)";
+        } elsif ($val !~ /^yes$/i) {
+            $vcredist_path = $val;
+        }
+    } elsif ($key =~ /^cross-compile$/i) {
+        if ($val =~ /^yes$/i) {
+            $cross_compile = "yes";
+        }
+    } else {
+        $want_unknown = "yes";
+        if ($val eq "no") {
+            $unknown_value = "without-" . $key;
+        } else {
+            $unknown_value = "with-" . $key;
+        }
+    }
+}
+
+if ($want_help ne "no") {
+    foreach (@help) {
+        print $_;
+    }
+    exit 1;
+}
+
+# clean up and exit if requested
+if ($want_clean eq "yes") {
+    my $file;
+    foreach $file (@filelist) {
+        unlink($file);
+    }
+
+    foreach $file (@projectlist) {
+        unlink($file);
+    }
+
+    exit 0;
+}
+
+if ($want_unknown ne "no") {
+    print STDERR "can't parse $unknown_value\n";
+    exit 1;
+}
+
+if ($verbose) {
+    if ($want_win32 eq "yes") {
+        print "configure for win32\n";
+    }
+    if ($want_x64 eq "yes") {
+        print "configure for x64\n";
+    }
+    if ($cross_compile eq "yes") {
+        print "cross compiling";
+        if ($want_x64 eq "yes") {
+            print ": build on win32 for x64 host\n";
+        } elsif ($want_win32 eq "yes") {
+            print ": build on x64 for win32 host\n";
+        } else {
+            print "\n";
+        }
+    }
+    if ($enable_intrinsics eq "yes") {
+        print "intrinsics: enabled\n";
+    } else {
+        print "intrinsics: disabled\n";
+    }
+    if ($enable_openssl_hash eq "yes") {
+        print "openssl-hash: enabled\n";
+    } else {
+        print "openssl-hash: disabled\n";
+    }
+    if ($enable_isc_spnego eq "yes") {
+        print "isc-spnego: enabled\n";
+    } else {
+        print "isc-spnego: disabled\n";
+    }
+    if ($enable_filter_aaaa eq "yes") {
+        print "filter-aaaa: enabled\n";
+    } else {
+        print "filter-aaaa: disabled\n";
+    }
+    if ($enable_fixed_rrset eq "yes") {
+        print "fixed-rrset: enabled\n";
+    } else {
+        print "fixed-rrset: disabled\n";
+    }
+    if ($enable_developer eq "yes") {
+        print "developer: enabled\n";
+    } else {
+        print "developer: disabled\n";
+    }
+    if ($enable_rpz_nsip eq "yes") {
+        print "rpz-nsip: enabled\n";
+    } else {
+        print "rpz-nsip: disabled\n";
+    }
+    if ($enable_rpz_nsdname eq "yes") {
+        print "rpz-nsdname: enabled\n";
+    } else {
+        print "rpz-nsdname: disabled\n";
+    }
+    if ($use_openssl eq "no") {
+        print "openssl: disabled\n";
+    } else {
+        print "openssl-path: $openssl_path\n";
+    }
+    if ($use_tests eq "yes") {
+        print "tests: enabled\n";
+    }
+    if ($use_xtests eq "yes") {
+        print "extra tests: enabled\n";
+    }
+    if ($use_pkcs11 eq "no") {
+        print "pkcs11: disabled\n";
+    } else {
+        print "pkcs11-provider-path: $pkcs11_path\n";
+    }
+    if ($use_ecdsa eq "no") {
+        print "ecdsa: disabled\n";
+    } else {
+        print "ecdsa: enabled\n";
+    }
+    if ($use_gost eq "no") {
+        print "gost: disabled\n";
+    } else {
+        print "gost: enabled\n";
+    }
+    if ($use_gssapi eq "no") {
+        print "gssapi: disabled\n";
+    } else {
+        print "gssapi-path: $gssapi_path\n";
+    }
+    if ($use_libxml2 eq "no") {
+        print "libxml2: disabled\n";
+    } else {
+        print "libxml2-path: $libxml2_path\n";
+    }
+    if ($use_geoip eq "no") {
+        print "geoip: disabled\n";
+    } else {
+        print "geoip-path: $geoip_path\n";
+    }
+    if ($use_readline eq "no") {
+        print "readline: disabled\n";
+    } else {
+        print "readline-path: $readline_path\n";
+    }
+    if ($use_idn eq "no") {
+        print "idn: disabled\n";
+    } else {
+        print "idn-path: $idn_path\n";
+        if ($iconv_path ne " --idn-- ") {
+            print "iconv-path: $iconv_path\n";
+        }
+    }
+    if ($use_python eq "no") {
+        print "python: disabled\n";
+    } else {
+        print "python-command: $python_command\n";
+    }
+    print "vcredist-path: $vcredist_path\n";
+}
+
+# Check environment
+
+# infer vcredist when not given
+
+if ($vcredist_path eq " --infer-- ") {
+    if ($verbose) {
+        print "trying to infer vcredist path from build environment\n";
+    }
+    if ($ENV{"VCRedistPath"} ne "") {
+        $vcredist_path = $ENV{"VCRedistPath"};
+    } elsif ($ENV{"FrameworkSDKDir"} ne "") {
+        if (($want_win32 eq "yes") &&
+            (-f File::Spec->catfile($ENV{"FrameworkSDKDir"},
+                                    "BootStrapper", "Packages",
+                                    "vcredist_x86", "vcredist_x86.exe"))) {
+            $vcredist_path = File::Spec->catfile($ENV{"FrameworkSDKDir"},
+                                                 "BootStrapper",
+                                                 "Packages",
+                                                 "vcredist_x86",
+                                                 "vcredist_x86.exe");
+        } elsif (($want_x64 eq "yes") &&
+                 (-f File::Spec->catfile($ENV{"FrameworkSDKDir"},
+                                         "BootStrapper", "Packages",
+                                         "vcredist_x64",
+                                         "vcredist_x64.exe"))) {
+            $vcredist_path = File::Spec->catfile($ENV{"FrameworkSDKDir"},
+                                                 "BootStrapper",
+                                                 "Packages",
+                                                 "vcredist_x64",
+                                                 "vcredist_x64.exe");
+        }
+    } elsif ($ENV{"VCINSTALLDIR"} ne "") {
+        if (($want_win32 eq "yes") &&
+            (-f File::Spec->catfile($ENV{"VCINSTALLDIR"}, "redist",
+                                    "1033", "vcredist_x86.exe"))) {
+            $vcredist_path = File::Spec->catfile($ENV{"VCINSTALLDIR"},
+                                                 "redist", "1033",
+                                                 "vcredist_x86.exe");
+        } elsif (($want_x64 eq "yes") &&
+                 (-f File::Spec->catfile($ENV{"VCINSTALLDIR"}, "redist",
+                                         "1033", "vcredist_x64.exe"))) {
+            $vcredist_path = File::Spec->catfile($ENV{"VCINSTALLDIR"},
+                                                 "redist", "1033",
+                                                 "vcredist_x64.exe");
+        }
+    } else {
+        die "with-vcredist is REQUIRED\n";
+    }
+}
+
+my $msc_ver = 0;
+
+open F, ">mscver.c" || die $!;
+print F << 'EOF';
+#include <windows.h>
+#include <stdio.h>
+
+int
+main(void)
+{
+        printf("%d\n", _MSC_VER);
+        return(0);
+}
+EOF
+close F;
+my $compret = `cl /nologo /MD mscver.c`;
+if (grep { -f and -x } ".\\mscver.exe") {
+    $msc_ver = `.\\mscver.exe`;
+} else {
+    die "can't get _MSC_VER value: $compret\n";
+}
+if ($verbose) {
+    print "_MSV_VER == $msc_ver\n";
+}
+if ($msc_ver < 1600) {
+    print STDERR "warning: old version of C++ compiler/Visual Studio\n";
+    print STDERR "only the legacy (cf legacy\\win32-build.txt) will work\n";
+}
+
+# gen single threaded for < VS 2005
+
+if ($msc_ver < 1400) {
+    $configvar{"COPTML"} = "/ML";
+    $configvar{"COPTMLD"} = "/MLD";
+}
+
+# /GX deprecated in VS 2005
+
+if ($msc_ver < 1400) {
+    $configvar{"COPTX"} = "/GX";
+} else {
+    $configvar{"COPTX"} = "/EHsc";
+}
+
+# /YX for < VS 2005
+
+if ($msc_ver < 1400) {
+    $configvar{"COPTY"} = "/YX";
+}
+
+# backtrace for >= VS 2012
+
+if ($msc_ver >= 1700) {
+    $configdefp{"ISC_PLATFORM_USEBACKTRACE"} = 1;
+}
+
+# warn when cross compiling
+
+if ($cross_compile eq "yes") {
+    if ($want_x64 eq "yes") {
+        $configvar{"BUILD_PLATFORM"} = "Win32";
+        $configvar{"BUILD_MACHINE"} = "/machine:X86";
+    }
+    if ($want_win32 eq "yes") {
+        $configvar{"BUILD_PLATFORM"} = "x64";
+        $configvar{"BUILD_MACHINE"} = "/machine:X64";
+    }
+} elsif ($want_win32 eq "yes") {
+    open F, ">cross.c" || die $!;
+    print F << 'EOF';
+#include <windows.h>
+#include <stdio.h>
+
+int
+main(void)
+{
+#ifdef _WIN64
+        fprintf(stderr, "compiling for x64 when win32 was asked?!\n");
+#endif
+        return(0);
+}
+EOF
+    close F;
+    my $compret = `cl /nologo /MD cross.c`;
+    if (grep { -f and -x } ".\\cross.exe") {
+        my $cross = `.\\cross.exe`;
+        if ($cross) {
+            print STDERR $cross;
+        }
+    } else {
+        print STDERR "can't check cross compile: $compret\n";
+    }
+} else {
+    open F, ">cross.c" || die $!;
+    print F << 'EOF';
+#include <windows.h>
+#include <stdio.h>
+
+int
+main(void)
+{
+#ifndef _WIN64
+        fprintf(stderr, "compiling in 32 bits when x64 was asked?!\n");
+#endif
+        return(0);
+}
+EOF
+    close F;
+    my $compret = `cl /nologo /MD cross.c`;
+    if (grep { -f and -x } ".\\cross.exe") {
+        my $cross = `.\\cross.exe`;
+        if ($cross) {
+            print STDERR $cross;
+        }
+    } else {
+        print STDERR "can't check cross compile: $compret\n";
+    }
+}
+
+# Process arguments
+
+# enable-intrinsics
+if ($enable_intrinsics eq "yes") {
+    $configcond{"ATOMIC"} = 1;
+    $configvar{"INTRINSIC"} = "true";
+    $configvar{"COPTI"} = "/Oi";
+    $configdefp{"ISC_PLATFORM_HAVEXADD"} = 1;
+    if ($want_x64 eq "yes") {
+        $configdefp{"ISC_PLATFORM_HAVEXADDQ"} = 1;
+    }
+    $configdefp{"ISC_PLATFORM_HAVEATOMICSTORE"} = 1;
+    $configdefp{"ISC_PLATFORM_HAVECMPXCHG"} = 1;
+} else {
+    $configvar{"INTRINSIC"} = "false";
+}
+
+# enable-filter-aaaa
+if ($enable_filter_aaaa eq "yes") {
+    $configdefh{"ALLOW_FILTER_AAAA"} = 1;
+}
+
+# enable-fixed-rrset
+if ($enable_fixed_rrset eq "yes") {
+    $configdefh{"DNS_RDATASET_FIXED"} = 1;
+}
+
+# enable-rpz-nsip
+if ($enable_rpz_nsip ne "no") {
+    $configdefh{"ENABLE_RPZ_NSIP"} = 1;
+}
+
+# enable-rpz-nsdname
+if ($enable_rpz_nsdname ne "no") {
+    $configdefh{"ENABLE_RPZ_NSDNAME"} = 1;
+}
+
+# with-tests
+if ($use_tests eq "yes") {
+    $configcond{"TESTS"} = 1;
+}
+
+# with-extra-tests
+if ($use_xtests eq "yes") {
+    $configcond{"XTESTS"} = 1;
+}
+
+# with-openssl
+if ($use_openssl eq "no") {
+    if ($verbose) {
+        print "OpenSSL library is disabled\n";
+    }
+} elsif ($use_openssl eq "auto") {
+    if ($verbose) {
+        print "checking for an OpenSSL built directory at sibling root\n";
+    }
+    opendir DIR, $openssl_path || die "No Directory: $!\n";
+    my @dirlist = grep (/^openssl-[0-9]+\.[0-9]+\.[0-9]+[a-z]{0,1}$/i,
+                        readdir(DIR));
+    closedir(DIR);
+
+    # Make sure we have something
+    if (scalar(@dirlist) == 0) {
+        die "can't find an OpenSSL at sibling root\n";
+    }
+    # Now see if we have a directory or just a file.
+    # Make sure we are case insensitive
+    my $file;
+    foreach $file (sort {uc($b) cmp uc($a)} @dirlist) {
+        if (-f File::Spec->catfile($openssl_path,
+                                   $file,
+                                   "inc32\\openssl",
+                                   "opensslv.h")) {
+            $openssl_path = File::Spec->catdir($openssl_path, $file);
+            $use_openssl = "yes";
+            last;
+        }
+    }
+
+    # If we have one use it otherwise report the error
+    if ($use_openssl eq "auto") {
+        die "can't find an OpenSSL built directory at sibling root\n";
+    }
+}
+# falls into (so no else)
+if ($use_openssl eq "yes") {
+    $openssl_path = File::Spec->rel2abs($openssl_path);
+    if ($verbose) {
+        print "checking for OpenSSL built directory at \"$openssl_path\"\n";
+    }
+    if (!-f File::Spec->catfile($openssl_path,
+                                "inc32\\openssl",
+                                "opensslv.h")) {
+        die "can't find OpenSSL opensslv.h include\n";
+    }
+    if (!-f File::Spec->catfile($openssl_path, "out32dll", "libeay32.lib")) {
+        die "can't find OpenSSL libeay32.lib library\n";
+    }
+    if (!-f File::Spec->catfile($openssl_path, "out32dll", "libeay32.dll")) {
+        die "can't find OpenSSL libeay32.dll DLL\n";
+    }
+    my $openssl_inc = File::Spec->catdir($openssl_path, "inc32");
+    my $openssl_libdir = File::Spec->catdir($openssl_path, "out32dll");
+    my $openssl_lib = File::Spec->catfile($openssl_libdir, "libeay32.lib");
+    my $openssl_dll = File::Spec->catfile($openssl_libdir, "libeay32.dll");
+
+    $configcond{"OPENSSL"} = 1;
+    $configdefd{"USE_OPENSSL"} = "OPENSSL";
+    $configvar{"OPENSSL_PATH"} = "$openssl_path";
+    $configinc{"OPENSSL_INC"} = "$openssl_inc";
+    $configlib{"OPENSSL_LIB"} = "$openssl_lib";
+    $configdll{"OPENSSL_DLL"} = "$openssl_dll";
+    if (-f File::Spec->catfile($openssl_inc, "openssl", "dsa.h")) {
+        $configdefh{"HAVE_OPENSSL_DSA"} = 1;
+    } elsif ($verbose) {
+        print "OpenSSL DSA support is disabled\n";
+    }
+}
+
+# check OpenSSL
+if ($use_openssl eq "yes") {
+    if ($verbose) {
+        print "checking whether linking with OpenSSL works\n";
+    }
+    my $dll = $configdll{"OPENSSL_DLL"};
+    my $ret = `copy "$dll" .`;
+    if ($? != 0) {
+        die "Can't copy OpenSSL DLL to working directory: $ret\n";
+    }
+    open F, ">testossl.c" || die $!;
+    print F << 'EOF';
+#include <openssl/err.h>
+
+int
+main(void)
+{
+        ERR_clear_error();
+        return(0);
+}
+EOF
+    close F;
+    my $include = $configinc{"OPENSSL_INC"};
+    my $library = $configlib{"OPENSSL_LIB"};
+    $compret = `cl /nologo /MD /I "$include" testossl.c "$library"`;
+    if (grep { -f and -x } ".\\testossl.exe") {
+        `.\\testossl.exe`;
+        if ($? != 0) {
+            die "OpenSSL test failed\n";
+        }
+    } else {
+        die "can't compile OpenSSL test: $compret\n";
+    }
+}
+
+# check OpenSSL version
+if ($use_openssl eq "yes") {
+    if ($verbose) {
+        printf "checking OpenSSL library version\n";
+    }
+    open F, ">testosslv.c" || die $!;
+    print F << 'EOF';
+#include <stdio.h>
+#include <openssl/opensslv.h>
+
+int main() {
+        if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL &&
+             OPENSSL_VERSION_NUMBER < 0x00908000L) ||
+             OPENSSL_VERSION_NUMBER >= 0x0090804fL)
+                return (0);
+        printf("\n\nFound   OPENSSL_VERSION_NUMBER %#010x\n",
+               OPENSSL_VERSION_NUMBER);
+        printf("Require OPENSSL_VERSION_NUMBER 0x009070cf or greater (0.9.7l)\n"
+               "Require OPENSSL_VERSION_NUMBER 0x0090804f or greater (0.9.8d)\n\n");
+        return (1);
+}
+EOF
+    close F;
+    my $include = $configinc{"OPENSSL_INC"};
+    my $library = $configlib{"OPENSSL_LIB"};
+    $compret = `cl /nologo /MD /I "$include" testosslv.c "$library"`;
+    if (grep { -f and -x } ".\\testosslv.exe") {
+        `.\\testosslv.exe`;
+        if ($? != 0) {
+            die "OpenSSL version test failed\n";
+        }
+    } else {
+        die "can't compile OpenSSL version test: $compret\n";
+    }
+}
+
+# check EVP_sha256 / EVP_sha384 / EVP_sha512
+
+if ($use_openssl eq "yes") {
+    if ($verbose) {
+        printf "checking for EVP_sha256\n";
+    }
+    open F, ">testsha256.c" || die $!;
+    print F << 'EOF';
+extern void *EVP_sha256();
+
+int main() {
+        return EVP_sha256() != 0;
+}
+EOF
+    close F;
+    my $library = $configlib{"OPENSSL_LIB"};
+    $compret = `cl /nologo /MD testsha256.c "$library"`;
+    if (grep { -f and -x } ".\\testsha256.exe") {
+        `.\\testsha256.exe`;
+        if ($? == 0) {
+            if ($verbose) {
+                print "EVP_sha256 test failed: disabling EVP_sha256\n";
+            }
+            $use_ecdsa = "no";
+        } else {
+            $configdefh{"HAVE_EVP_SHA256"} = 1;
+        }
+    } else {
+        if ($verbose) {
+            print "can't compile EVP_sha256 test: $compret\n";
+            print "disabling EVP_sha256\n";
+        }
+        $use_ecdsa = "no";
+    }
+
+    if ($verbose) {
+        printf "checking for EVP_sha384\n";
+    }
+    open F, ">testsha384.c" || die $!;
+    print F << 'EOF';
+extern void *EVP_sha384();
+
+int main() {
+        return EVP_sha384() != 0;
+}
+EOF
+    close F;
+    $compret = `cl /nologo /MD testsha384.c "$library"`;
+    if (grep { -f and -x } ".\\testsha384.exe") {
+        `.\\testsha384.exe`;
+        if ($? == 0) {
+            if ($verbose) {
+                print "EVP_sha384 test failed: disabling EVP_sha384\n";
+            }
+            $use_ecdsa = "no";
+        } else {
+            $configdefh{"HAVE_EVP_SHA384"} = 1;
+        }
+    } else {
+        if ($verbose) {
+            print "can't compile EVP_sha384 test: $compret\n";
+            print "disabling EVP_sha384\n";
+        }
+        $use_ecdsa = "no";
+    }
+
+    if ($verbose) {
+        printf "checking for EVP_sha512\n";
+    }
+    open F, ">testsha512.c" || die $!;
+    print F << 'EOF';
+extern void *EVP_sha512();
+
+int main() {
+        return EVP_sha512() != 0;
+}
+EOF
+    close F;
+    $compret = `cl /nologo /MD testsha512.c "$library"`;
+    if (grep { -f and -x } ".\\testsha512.exe") {
+        `.\\testsha512.exe`;
+        if ($? == 0) {
+            if ($verbose) {
+                print "EVP_sha512 test failed: disabling EVP_sha512\n";
+            }
+        } else {
+            $configdefh{"HAVE_EVP_SHA512"} = 1;
+        }
+    } else {
+        if ($verbose) {
+            print "can't compile EVP_sha512 test: $compret\n";
+            print "disabling EVP_sha512\n";
+        }
+    }
+}
+
+# with-ecdsa
+if ($use_openssl eq "no") {
+    $use_ecdsa = "no";
+}
+if ($use_ecdsa eq "auto") {
+    if ($verbose) {
+        print "checking for OpenSSL ECDSA support\n";
+    }
+    open F, ">testecdsa.c" || die $!;
+    print F << 'EOF';
+#include <openssl/ecdsa.h>
+#include <openssl/objects.h>
+
+int
+main(void)
+{
+        EC_KEY *ec256, *ec384;
+
+        ec256 = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+        ec384 = EC_KEY_new_by_curve_name(NID_secp384r1);
+        if (ec256 == NULL || ec384 == NULL)
+                return (2);
+        return (0);
+}
+EOF
+    close F;
+    my $include = $configinc{"OPENSSL_INC"};
+    my $library = $configlib{"OPENSSL_LIB"};
+    $compret = `cl /nologo /MD /I "$include" testecdsa.c "$library"`;
+    if (grep { -f and -x } ".\\testecdsa.exe") {
+        `.\\testecdsa.exe`;
+        if ($? != 0) {
+            if ($verbose) {
+                print "ECDSA test failed: disabling ECDSA\n";
+            }
+            $use_ecdsa = "no";
+        }
+    } else {
+        if ($verbose) {
+            print "can't compile ECDSA test: $compret\n";
+            print "disabling ECDSA\n";
+        }
+    $use_ecdsa = "no";
+    }
+}
+
+if ($use_ecdsa ne "no") {
+    $use_ecdsa = "yes";
+    $configdefh{"HAVE_OPENSSL_ECDSA"} = 1;
+}
+
+# with-gost
+if ($use_openssl eq "no") {
+    $use_gost = "no";
+}
+if ($use_gost eq "auto") {
+    if ($verbose) {
+        print "checking for OpenSSL GOST support\n";
+    }
+    open F, ">testgost.c" || die $!;
+    print F << 'EOF';
+#include <openssl/conf.h>
+#include <openssl/engine.h>
+
+int
+main(void)
+{
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+        ENGINE *e;
+        EC_KEY *ek;
+
+        ek = NULL;
+        OPENSSL_config(NULL);
+
+        e = ENGINE_by_id("gost");
+        if (e == NULL)
+                return (1);
+        if (ENGINE_init(e) <= 0)
+                return (1);
+        return (0);
+#else
+        return (1);
+#endif
+}
+EOF
+    close F;
+    my $include = $configinc{"OPENSSL_INC"};
+    my $library = $configlib{"OPENSSL_LIB"};
+    $compret = `cl /nologo /MD /I "$include" testgost.c "$library"`;
+    if (grep { -f and -x } ".\\testgost.exe") {
+        `.\\testgost.exe`;
+        if ($? != 0) {
+            if ($verbose) {
+                print "GOST test failed: disabling GOST\n";
+            }
+            $use_gost = "no";
+        }
+    } else {
+        if ($verbose) {
+            print "can't compile GOST test: $compret\n";
+            print "disabling GOST\n";
+        }
+    $use_gost = "no";
+    }
+}
+
+if ($use_gost ne "no") {
+    $use_gost = "yes";
+    $configdefh{"HAVE_OPENSSL_GOST"} = 1;
+}
+
+# enable-openssl-hash
+if ($enable_openssl_hash eq "yes") {
+    if ($use_openssl eq "no") {
+        die "No OpenSSL for hash functions\n";
+    }
+    $configdefp{"ISC_PLATFORM_OPENSSLHASH"} = 1;
+}
+
+# with-pkcs11
+if ($use_pkcs11 ne "no") {
+    $configcond{"PKCS11"} = 1;
+    $configdefd{"USE_PKCS11"} = "USE_PKCS11";
+    $configvar{"PKCS11_TOOLS"} = "pkcs11";
+    $configdefd{"PK11_LIB_LOCATION"} = "PK11_LIB_LOCATION=\"$pkcs11_path\"";
+}
+
+# with-gssapi
+if ($use_gssapi eq "no") {
+    if ($verbose) {
+        print "gssapi library is disabled\n";
+    }
+} else {
+    $gssapi_path = File::Spec->rel2abs($gssapi_path);
+    if ($verbose) {
+        print "checking for gssapi directory at \"$gssapi_path\"\n";
+    }
+    $configcond{"GSSAPI"} = 1;
+    $configdefd{"USE_GSSAPI"} = "GSSAPI";
+    if (!-f File::Spec->catfile($gssapi_path, "include",
+                                "gssapi", "gssapi.h")) {
+        die "can't find gssapi.h include\n";
+    }
+    if (!-f File::Spec->catfile($gssapi_path, "include",
+                                "gssapi", "gssapi_krb5.h")) {
+        die "can't find gssapi_krb5.h include\n";
+    }
+    if (!-f File::Spec->catfile($gssapi_path, "include",
+                                "krb5", "krb5.h")) {
+        die "can't find krb5.h include\n";
+    }
+    $configinc{"GSSAPI_INC"} = File::Spec->catdir($gssapi_path, "include");
+    my $bits = "32";
+    my $gssapi_lib;
+    my $krb5_lib;
+    if ($want_win32 eq "yes") {
+        $bits = "32";
+        if (!-f File::Spec->catfile($gssapi_path, "lib", "i386",
+                                    "gssapi${bits}.lib")) {
+            die "can't find gssapi${bits}.lib library\n";
+        }
+        $gssapi_lib = File::Spec->catfile($gssapi_path, "lib", "i386",
+                                          "gssapi${bits}.lib");
+        if (!-f File::Spec->catfile($gssapi_path, "lib", "i386",
+                                    "krb5_${bits}.lib")) {
+            die "can't find krb5_${bits}.lib library\n";
+        }
+        $krb5_lib = File::Spec->catfile($gssapi_path, "lib", "i386",
+                                             "krb5_${bits}.lib");
+    } elsif ($want_x64 eq "yes") {
+        $bits = "64";
+        if (!-f File::Spec->catfile($gssapi_path, "lib", "amd64",
+                                    "gssapi${bits}.lib")) {
+            die "can't find gssapi${bits}.lib library\n";
+        }
+        $gssapi_lib = File::Spec->catfile($gssapi_path, "lib", "amd64",
+                                             "gssapi${bits}.lib");
+        if (!-f File::Spec->catfile($gssapi_path, "lib", "amd64",
+                                    "krb5_${bits}.lib")) {
+            die "can't find krb5_${bits}.lib library\n";
+        }
+        $krb5_lib = File::Spec->catfile($gssapi_path, "lib", "amd64",
+                                        "krb5_${bits}.lib");
+    } else {
+        die "can't happen: no choice between Win32 and x64\n";
+    }
+    if (!-f File::Spec->catfile($gssapi_path, "bin", "gssapi${bits}.dll")) {
+        die "can't find gssapi${bits}.dll DLL\n";
+    }
+    if (!-f File::Spec->catfile($gssapi_path, "bin", "krb5_${bits}.dll")) {
+        die "can't find krb5_${bits}.dll DLL\n";
+    }
+    if (!-f File::Spec->catfile($gssapi_path, "bin", "comerr${bits}.dll")) {
+        die "can't find comerr${bits}.dll DLL\n";
+    }
+    if (!-f File::Spec->catfile($gssapi_path, "bin", "k5sprt${bits}.dll")) {
+        die "can't find k5sprt${bits}.dll DLL\n";
+    }
+    if (!-f File::Spec->catfile($gssapi_path, "bin", "wshelp${bits}.dll")) {
+        die "can't find wshelp${bits}.dll DLL\n";
+    }
+    $configlib{"GSSAPI_LIB"} = "$gssapi_lib";
+    $configlib{"KRB5_LIB"} = "$krb5_lib";
+    my $gssapi_dll = File::Spec->catfile($gssapi_path, "bin",
+                                         "gssapi${bits}.dll");
+    $configdll{"GSSAPI_DLL"} = "$gssapi_dll";
+    my $krb5_dll = File::Spec->catfile($gssapi_path, "bin",
+                                         "krb5_${bits}.dll");
+    $configdll{"KRB5_DLL"} = "$krb5_dll";
+    my $comerr_dll = File::Spec->catfile($gssapi_path, "bin",
+                                         "comerr${bits}.dll");
+    $configdll{"COMERR_DLL"} = "$comerr_dll";
+    my $k5sprt_dll = File::Spec->catfile($gssapi_path, "bin",
+                                         "k5sprt${bits}.dll");
+    $configdll{"K5SPRT_DLL"} = "$k5sprt_dll";
+    my $wshelp_dll = File::Spec->catfile($gssapi_path, "bin",
+                                         "wshelp${bits}.dll");
+    $configdll{"WSHELP_DLL"} = "$wshelp_dll";
+}
+
+# enable-isc-spnego
+if ($use_gssapi ne "yes") {
+    $enable_isc_spnego = "no";
+} elsif ($enable_isc_spnego eq "yes") {
+    if ($use_gssapi eq "no") {
+        die "No GSSAPI for SPNEGO\n";
+    }
+    $configdefd{"USE_ISC_SPNEGO"} = "USE_ISC_SPNEGO";
+}
+
+# with-geoip
+if ($use_geoip eq "no") {
+    if ($verbose) {
+        print "geoip library is disabled\n";
+    }
+} else {
+    $configcond{"GEOIP"} = 1;
+    $geoip_path = File::Spec->rel2abs($geoip_path);
+    if ($verbose) {
+        print "checking for geoip directory at \"$geoip_path\"\n";
+    }
+    if (!-f File::Spec->catfile($geoip_path, "GeoIP.h")) {
+        die "can't find GeoIP.h include\n";
+    }
+    if (!-f File::Spec->catfile($geoip_path, "GeoIP.lib")) {
+        die "can't find Geoip.lib library\n";
+    }
+    if (!-f File::Spec->catfile($geoip_path, "GeoIP.dll")) {
+        die "can't find Geoip.dll DLL\n";
+    }
+    $configinc{"GEOIP_INC"} = "$geoip_path";
+    my $geoip_lib = File::Spec->catfile($geoip_path, "GeoIP.lib");
+    $configlib{"GEOIP_LIB"} = "$geoip_lib";
+    my $geoip_dll = File::Spec->catfile($geoip_path, "GeoIP.dll");
+    $configdll{"GEOIP_DLL"} = "$geoip_dll";
+
+    if ($verbose) {
+        print "checking for GeoIP support\n";
+    }
+    my $ret = `copy "$geoip_dll" .`;
+    if ($? != 0) {
+        die "Can't copy GeoIP DLL to working directory: $ret\n";
+    }
+    open F, ">testgeoip.c" || die $!;
+    print F << 'EOF';
+extern void *GeoIP_open();
+
+int main() {
+        return GeoIP_open != 0;
+}
+EOF
+    close F;
+    $compret = `cl /nologo /MD testgeoip.c "$geoip_lib"`;
+    if (grep { -f and -x } ".\\testgeoip.exe") {
+        `.\\testgeoip.exe`;
+        if ($? == 0) {
+            die "GeoIP test failed\n";
+        }
+    } else {
+        die "can't compile GeoIP test: $compret\n";
+    }
+    $configdefh{"HAVE_GEOIP"} = 1;
+
+    if ($verbose) {
+        print "checking for GeoIP Country IPv6 support\n";
+    }
+    my $geoip_inc = qq(/I "$geoip_path");
+    my $geoip_libs = qq("$geoip_lib" ws2_32.lib);
+    open F, ">testgeoip1.c" || die $!;
+    print F << 'EOF';
+#include <GeoIP.h>
+
+struct in6_addr in6;
+int flag = 1;
+
+int main() {
+        if (flag)
+                return 1;
+        return GeoIP_country_name_by_ipnum_v6(NULL, in6) != NULL;
+}
+EOF
+    close F;
+    $compret = `cl /nologo $geoip_inc /MD testgeoip1.c $geoip_libs`;
+    if (grep { -f and -x } ".\\testgeoip1.exe") {
+        `.\\testgeoip1.exe`;
+        if ($? == 0) {
+            die "GeoIP Country IPv6 test failed\n";
+        }
+    } else {
+        die "can't compile GeoIP Country IPv6 test: $compret\n";
+    }
+    $configdefh{"HAVE_GEOIP_V6"} = 1;
+
+    if ($verbose) {
+        print "checking for GeoIP City IPv6 support\n";
+    }
+    open F, ">testgeoip2.c" || die $!;
+    print F << 'EOF';
+#include <GeoIP.h>
+#include <GeoIPCity.h>
+
+struct in6_addr in6;
+int i = GEOIP_CITY_EDITION_REV0_V6;
+int flag = 1;
+
+int main() {
+        if (flag)
+                return 1;
+        return GeoIP_record_by_ipnum_v6(NULL, in6) != NULL;
+}
+EOF
+    close F;
+    $compret = `cl /nologo $geoip_inc /MD testgeoip2.c $geoip_libs`;
+    if (grep { -f and -x } ".\\testgeoip2.exe") {
+        `.\\testgeoip2.exe`;
+        if ($? == 0) {
+            die "GeoIP City IPv6 test failed\n";
+        }
+    } else {
+        die "can't compile GeoIP City IPv6 test: $compret\n";
+    }
+    $configdefh{"HAVE_GEOIP_CITY_V6"} = 1;
+}
+
+# with-readline
+if ($use_readline eq "no") {
+    if ($verbose) {
+        print "readline library is disabled\n";
+    }
+} else {
+    $readline_path = File::Spec->rel2abs($readline_path);
+    if ($verbose) {
+        print "checking for readline directory at \"$readline_path\"\n";
+    }
+    if (!-f File::Spec->catfile($readline_path, "readline", "readline.h")) {
+        die "can't find readline.h include\n";
+    }
+    if (!-f File::Spec->catfile($readline_path, "readline", "readline.lib")) {
+        die "can't find readline.lib library\n";
+    }
+    $configdefh{"HAVE_READLINE"} = 1;
+    $configinc{"READLINE_INC"} = "$readline_path";
+    my $readline_lib = File::Spec->catfile($readline_path,
+                                           "readline", "readline.lib");
+    $configlib{"READLINE_LIB"} = "$readline_lib";
+    if (-f File::Spec->catfile($readline_path, "readline", "readlineD.lib")) {
+        my $readline_libd = File::Spec->catfile($readline_path,
+                                                "readline", "readlineD.lib");
+        $configlib{"READLINE_LIBD"} = "$readline_libd";
+    } else {
+        $configlib{"READLINE_LIBD"} = "$readline_lib";
+    }
+}
+
+# with-idn (including with-iconv)
+if ($use_idn eq "no") {
+    if ($verbose) {
+        print "IDN kit is disabled\n";
+    }
+} else {
+    $idn_path = File::Spec->rel2abs($idn_path);
+    if ($verbose) {
+        print "checking for IDN kit directory at \"$idn_path\"\n";
+    }
+    if (!-f File::Spec->catfile($idn_path, "idn", "api.h")) {
+        die "can't find idn\\api.h include\n";
+    }
+    if (!-f File::Spec->catfile($idn_path, "idn", "idnkit.lib")) {
+        die "can't find idnkit.lib library\n";
+    }
+    if (!-f File::Spec->catfile($idn_path, "idn", "idnkit.dll")) {
+        die "can't find idnkit.dll DLL\n";
+    }
+    $configcond{"IDNKIT"} = 1;
+    $configdefh{"WITH_IDN"} = 1;
+    $configinc{"IDN_INC"} = "$idn_path";
+    my $idn_lib = File::Spec->catfile($idn_path, "idn", "idnkit.lib");
+    $configlib{"IDN_LIB"} = "$idn_lib";
+    my $idn_dll = File::Spec->catfile($idn_path, "idn", "idnkit.dll");
+    $configdll{"IDN_DLL"} = "$idn_dll";
+    if ($iconv_path eq " --idn-- ") {
+        my $iconv_dll = File::Spec->catfile($idn_path, "idn", "iconv.dll");
+        $configdll{"ICONV_DLL"} = "$iconv_dll";
+    } else {
+        my $iconv_dll =File::Spec->catfile($iconv_path, "iconv.dll");
+        $configdll{"ICONV_DLL"} = "$iconv_dll";
+    }
+}
+
+# with-libxml2
+if ($use_libxml2 eq "no") {
+    if ($verbose) {
+        print "libxml2 library is disabled\n";
+    }
+} elsif ($use_libxml2 eq "auto") {
+    if ($verbose) {
+        print "checking for a libxml2 built directory at sibling root\n";
+    }
+    opendir DIR, $libxml2_path || die "No Directory: $!\n";
+    my @dirlist = grep (/^libxml2-[0-9]+\.[0-9]+\.[0-9]+[a-z]*/i,
+                        readdir(DIR));
+    closedir(DIR);
+
+    # Make sure we have something
+    if (scalar(@dirlist) == 0) {
+        die "can't find a libxml2 at sibling root\n";
+    }
+    # Now see if we have a directory or just a file.
+    # Make sure we are case insensitive
+    my $file;
+    foreach $file (sort {uc($b) cmp uc($a)} @dirlist) {
+        if (-f File::Spec->catfile($libxml2_path,
+                                   $file,
+                                   "include\\libxml",
+                                   "xmlversion.h")) {
+            $libxml2_path = File::Spec->catdir($libxml2_path, $file);
+            $use_libxml2 = "yes";
+            last;
+        }
+    }
+
+    # If we have one use it otherwise report the error
+    if ($use_libxml2 eq "auto") {
+        die "can't find a libxml2 built directory at sibling root\n";
+    }
+}
+# falls into (so no else)
+if ($use_libxml2 eq "yes") {
+    $libxml2_path = File::Spec->rel2abs($libxml2_path);
+    if ($verbose) {
+        print "checking for libxml2 built directory at \"$libxml2_path\"\n";
+    }
+    if (!-f File::Spec->catfile($libxml2_path,
+                                "include\\libxml",
+                                "xmlversion.h")) {
+        die "can't find libxml2 xmlversion.h include\n";
+    }
+    if (!-f File::Spec->catfile($libxml2_path,
+                                "win32\\bin.msvc",
+                                "libxml2.lib")) {
+        die "can't find Libxml2 libxml2.lib library\n";
+    }
+    if (!-f File::Spec->catfile($libxml2_path,
+                                "win32\\bin.msvc",
+                                "libxml2.dll")) {
+        die "can't find Libxml2 DLL\n";
+    }
+    $configcond{"LIBXML2"} = 1;
+    $configdefh{"HAVE_LIBXML2"} = 1;
+    my $libxml2_inc = File::Spec->catdir($libxml2_path, "include");
+    $configinc{"LIBXML2_INC"} = "$libxml2_inc";
+    my $libxml2_libdir = File::Spec->catdir($libxml2_path, "win32\\bin.msvc");
+    my $libxml2_lib = File::Spec->catfile($libxml2_libdir, "libxml2.lib");
+    $configlib{"LIBXML2_LIB"} = "$libxml2_lib";
+    my $libxml2_dll = File::Spec->catfile($libxml2_libdir, "libxml2.dll");
+    $configdll{"LIBXML2_DLL"} = "$libxml2_dll";
+}
+
+# with-python
+if ($use_python eq "no") {
+    if ($verbose) {
+        print "python is disabled\n";
+    }
+} elsif ($use_python eq "auto") {
+    if ($verbose) {
+        print "checking for python in path\n";
+    }
+    my $pythonret = `python -c "quit()" 2>&1`;
+    if ($? != 0) {
+        die "can't launch the python interpreter: $pythonret\n";
+    }
+    $use_python = "yes";
+}
+if ($use_python ne "no") {
+    if ($verbose) {
+        my $pythonret = `"$python_command" -c "quit()" 2>&1`;
+        if ($? != 0) {
+            print STDERR
+                "can't lanch the local python interpreter: $pythonret\n";
+        }
+    }
+    $configcond{"PYTHON"} = 1;
+    $configdefd{"USE_PYTHON"} = "USE_PYTHON";
+    $configvar{"PYTHON"} = "$python_command";
+    $configvar{"prefix"} = "C:\\Windows\\system32\\dns";
+}
+
+# with-vcredist
+$vcredist_path = File::Spec->rel2abs($vcredist_path);
+if (!grep { -f and -x } $vcredist_path) {
+    die "$vcredist_path is not correct\n";
+} else {
+    $configvar{"VCREDIST_PATH"} = "$vcredist_path";
+}
+
+# setup config.h with %configdefh
+
+sub setupconfigh {
+    my $line;
+    my @Lines;
+
+    open F, $configfilein || die $!;
+    @Lines = <F>;
+    close F;
+
+    foreach $line (@Lines) {
+        chomp $line;
+        if ($line =~ /^@([^@]+)\@$/) {
+            if (defined($configdefh{$1})) {
+                $line = "#define $1 $configdefh{$1}";
+            } else {
+                $line = "/* #undef $1 */";
+            }
+        }
+    }
+
+    open F, $configfileout || die $!;
+    if ($verbose) {
+        print "Setting up config.h\n";
+    }
+    foreach $line (@Lines) {
+        print F $line . "\n";
+    }
+    close F;
+}
+
+# setup platform.h with %configdefp
+
+sub setupplatformh {
+    my $line;
+    my @Lines;
+
+    open F, $platformfile . ".in" || die $!;
+    @Lines = <F>;
+    close F;
+
+    foreach $line (@Lines) {
+        chomp $line;
+        if ($line =~ /^@([^@]+)\@$/) {
+            if (defined($configdefp{$1})) {
+                $line = "#define $1 $configdefp{$1}";
+            } else {
+                $line = "/* #undef $1 */";
+            }
+        }
+    }
+
+    open F, ">" . $platformfile || die $!;
+    if ($verbose) {
+        print "Setting up platform.h\n";
+    }
+    foreach $line (@Lines) {
+        print F $line . "\n";
+    }
+    close F;
+}
+
+# escape spaces
+
+sub kw {
+    if ($_[0] =~ / /) {
+        return "\"$_[0]\"";
+    } else {
+        return "$_[0]";
+    }
+}
+
+# setup a file with %configcond stack and %config{var,defd,inc,lib,dll}
+
+sub setupfile {
+    my $line;
+    my @Linesin;
+    my @Linesout;
+    my $filename = $_[0];
+    my $cond;
+    my @conds;
+    my $pass = 1;
+    my @passes;
+    my $val;
+
+    open F, $filename . ".in" || die $!;
+    @Linesin = <F>;
+    close F;
+
+    foreach $line (@Linesin) {
+        chomp $line;
+        if ($line =~ /^\@IF (.*)$/) {
+            if (defined($cond)) {
+                unshift(@conds, $cond);
+                unshift(@passes, $pass);
+            }
+            $cond = $1;
+            if (defined($configcond{$cond})) {
+                # do nothing
+            } else {
+                $pass = 0;
+            }
+            next;
+        } elsif ($line =~ /^\@ELSE (.*)$/) {
+            if ($cond ne $1) {
+                die "\@ELSE $1 mismatch in $filename\n";
+            }
+            if (defined($configcond{$cond})) {
+                $pass = 0;
+            } else {
+                if (scalar(@conds) > 0) {
+                    $pass = $passes[0];
+                } else {
+                    $pass = 1;
+                }
+            }
+            next;
+        } elsif ($line =~ /^\@END (.*)$/) {
+            if ($cond ne $1) {
+                die "\@END $1 mismatch in $filename\n";
+            }
+            $cond = shift(@conds);
+            if (scalar(@passes) > 0) {
+                $pass = shift(@passes);
+            } else {
+                $pass = 1;
+            }
+            next;
+        }
+        if ($pass == 0) {
+            next;
+        }
+        while ($line =~ /@([^@ ]*)@/) {
+            if ($1 ~~ @substvar) {
+                if (defined($configvar{$1})) {
+                    $val = kw($configvar{$1});
+                    $line = "$`$val$'";
+                } else {
+                    $line = "$`$'";
+                }
+            } elsif ($1 ~~ @substdefd) {
+                if (defined($configdefd{$1})) {
+                    my $def = $configdefd{$1};
+                    $def =~ s/([\\ "])/\\$1/g;
+                    $line = qq($`/D "$def"$');
+                } else {
+                    $line = "$`$'";
+                }
+            } elsif ($1 ~~ @substinc) {
+                if (defined($configinc{$1})) {
+                    $line = qq($`/I "$configinc{$1}"$');
+                } else {
+                    $line = "$`$'";
+                }
+            } elsif ($1 ~~ @substlib) {
+                if (defined($configlib{$1})) {
+                    $val = kw($configlib{$1});
+                    $line = "$`$val$'";
+                } else {
+                    $line = "$`$'";
+                }
+            } elsif ($1 ~~ @substdll) {
+                if (defined($configdll{$1})) {
+                    $val = kw($configdll{$1});
+                    $line = "$`$val$'";
+                } else {
+                    $line = "$`$'";
+                }
+            } else {
+                die "unknown control $& in $filename\n";
+            }
+        }
+        push @Linesout, $line;
+    }
+
+    open F, ">" . $filename || die $!;
+    if ($verbose) {
+        print "Setting up $filename\n";
+    }
+    foreach $line (@Linesout) {
+        print F $line . "\n";
+    }
+    close F;
+}
+
+# setup a project with %configcond stack and %config{var,defd,inc,lib,dll}
+
+sub setupproject {
+    my $line;
+    my @Linesin;
+    my @Linesout;
+    my $projectname = $_[0];
+    my $cond;
+    my @conds;
+    my $pass = 1;
+    my @passes;
+    my $val;
+
+    open F, $projectname . ".in" || die $!;
+    @Linesin = <F>;
+    close F;
+
+    foreach $line (@Linesin) {
+        chomp $line;
+        if ($line =~ /^\@IF (.*)$/) {
+            if (defined($cond)) {
+                unshift(@conds, $cond);
+                unshift(@passes, $pass);
+            }
+            $cond = $1;
+            if (defined($configcond{$cond})) {
+                # do nothing
+            } else {
+                $pass = 0;
+            }
+            next;
+        } elsif ($line =~ /^\@ELSE (.*)$/) {
+            if ($cond ne $1) {
+                die "\@ELSE $1 mismatch in $projectname\n";
+            }
+            if (defined($configcond{$cond})) {
+                $pass = 0;
+            } else {
+                if (scalar(@conds) > 0) {
+                    $pass = $passes[0];
+                } else {
+                    $pass = 1;
+                }
+            }
+            next;
+        } elsif ($line =~ /^\@END (.*)$/) {
+            if ($cond ne $1) {
+                die "\@END $1 mismatch in $projectname\n";
+            }
+            $cond = shift(@conds);
+            if (scalar(@passes) > 0) {
+                $pass = shift(@passes);
+            } else {
+                $pass = 1;
+            }
+            next;
+        }
+        if ($pass == 0) {
+            next;
+        }
+        while ($line =~ /@([^@ ]*)@/) {
+            if ($1 ~~ @substvar) {
+                if (defined($configvar{$1})) {
+                    $val = kw($configvar{$1});
+                    $line = "$`$val$'";
+                } else {
+                    $line = "$`$'";
+                }
+            } elsif ($1 ~~ @substdefd) {
+                if (defined($configdefd{$1})) {
+                    $val = kw($configdefd{$1});
+                    $line = "$`$val;$'";
+                } else {
+                    $line = "$`$'";
+                }
+            } elsif ($1 ~~ @substinc) {
+                if (defined($configinc{$1})) {
+                    $val = kw($configinc{$1});
+                    $line = "$`$val;$'";
+                } else {
+                    $line = "$`$'";
+                }
+            } elsif ($1 ~~ @substlib) {
+                if (defined($configlib{$1})) {
+                    $val = kw($configlib{$1});
+                    $line = "$`$val;$'";
+                } else {
+                    $line = "$`$'";
+                }
+            } elsif ($1 ~~ @substdll) {
+                if (defined($configdll{$1})) {
+                    $val = kw($configdll{$1});
+                    $line = "$`$val$'";
+                } else {
+                    $line = "$`$'";
+                }
+            } else {
+                die "unknown control $& in $projectname\n";
+            }
+        }
+        push @Linesout, $line;
+    }
+
+    open F, ">" . $projectname || die $!;
+    if ($verbose) {
+        print "Setting up $projectname\n";
+    }
+    foreach $line (@Linesout) {
+        print F $line . "\n";
+    }
+    close F;
+}
+
+# make versions.h
+
+sub makeversion {
+    # List of directories with version files
+
+    my @dirlist = ("isc", "dns", "isccc", "isccfg", "lwres", "bind9");
+    my %LibMacros = (
+        "isc"    => "LIBISC_EXPORTS",
+        "dns"    => "LIBDNS_EXPORTS",
+        "isccc"  => "LIBISCCC_EXPORTS",
+        "isccfg" => "LIBISCCFG_EXPORTS",
+        "lwres"  => "LIBLWRES_EXPORTS",
+        "bind9"  => "LIBBIND9_EXPORTS");
+    my @VersionNames = ("LIBINTERFACE", "LIBREVISION", "LIBAGE");
+    my %Versions;
+    my $Version;
+    my %ApiVersions;
+    my $Mapapi;
+    my $versionfile = "versions.h";
+    my $versionpath = "..\\$versionfile";
+
+    my $data;
+    my $name;
+    my $value;
+
+    # First get the version information
+
+    open V, "..\\version" || die $!;
+    while (<V>) {
+        chomp;
+        ($data) = split(/\#/);
+        if ($data) {
+            ($name, $value) = split(/=/, $data);
+            ($name) = split(/\s+/, $name);
+            if ($name eq 'PRODUCT' || $name eq 'DESCRIPTION') {
+                ($value) =~ s/^["\s]+//;
+                ($value) =~ s/["\s]+$//;
+            } else {
+                ($value) = split(/\s+/, $value);
+            }
+            $Versions{$name} = $value;
+        }
+    }
+    close V;
+
+    # And the mapapi one
+
+    open M, "..\\lib\\dns\\mapapi" || die $!;
+    while (<M>) {
+        chomp;
+        ($data) = split(/\#/);
+        if ($data) {
+            ($name, $value) = split(/=/, $data);
+            ($name) = split(/\s+/, $name);
+            if ($name eq 'MAPAPI') {
+                ($value) =~ s/^["\s]+//;
+                ($value) =~ s/["\s]+$//;
+            } else {
+                ($value) = split(/\s+/, $value);
+            }
+            $Mapapi = $value;
+        }
+    }
+    close M;
+
+    # Now set up the output version file
+
+    my $ThisDate = scalar localtime();
+    open O, ">$versionpath" ||
+        die "Can't open output file $versionpath: $!\n";
+
+    # Standard Header
+
+    print O '/*
+ * Copyright (C) 2001  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+';
+
+    print O "/*\n";
+    print O " * $versionfile.";
+    print O "  Generated automatically by Configure.pl.\n";
+    print O " * Date generated: $ThisDate\n";
+    print O " */\n\n";
+
+    print O '
+#ifndef  VERSIONS_H
+#define VERSIONS_H 1
+
+';
+
+    $Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}";
+    if ($Versions{'PATCHVER'} != "") {
+        $Version = "$Version.$Versions{'PATCHVER'}";
+    }
+    $Version = "$Version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}";
+    if ($verbose) {
+        print "BIND Version: $Version\n";
+    }
+
+    print O "#define VERSION \"$Version\"\n";
+    print O "#define PRODUCT \"$Versions{'PRODUCT'}\"\n\n";
+    print O "#define DESCRIPTION \"$Versions{'DESCRIPTION'}\"\n\n";
+    print O
+        "#define MAJOR \"$Versions{'MAJORVER'}.$Versions{'MINORVER'}\"\n\n";
+    print O "#define MAPAPI \"$Mapapi\"\n\n";
+
+    my $dir;
+    my $apifile;
+    foreach $dir (@dirlist) {
+        $apifile = "..\\lib\\$dir\\api";
+        open A, $apifile || die $!;
+        while (<A>) {
+            chomp;
+            ($data) = split(/\#/);
+            if ($data) {
+                ($name, $value) = split(/=/, $data);
+                $name =~ s/\s+//;
+                $value =~ s/\s+//;
+                $ApiVersions{$name} = $value;
+            }
+        }
+        close A;
+
+        print O "\n#ifdef $LibMacros{$dir}\n";
+        foreach $name (@VersionNames) {
+            print O "#define $name\t$ApiVersions{$name}\n";
+        }
+        print O "#endif\n\n";
+    }
+
+    print O "#endif /* VERSIONS_H */\n";
+    close O;
+}
+
+# make srcid.h
+
+sub makesrcid {
+    my $data;
+    my $name;
+    my $value;
+    my $srcid = "unset";
+
+    open SOUT, ">..\\srcid.h" || die "cannot open srcid.h: $!\n";
+    if (open (SIN, "..\\srcid")) {
+      LOOP: while (<SIN>) {
+          chomp;
+          ($data) = split(/\#/);
+          if ($data) {
+              ($name, $value) = split(/=/, $data);
+              ($name) = split(/\s+/, $name);
+              ($value) = split(/\s+/, $value);
+              next LOOP if ($name != "SRCID");
+              $srcid = $value;
+          }
+        }
+        close SIN;
+    }
+
+    # Now set up the output version file
+
+    my $ThisDate = scalar localtime();
+
+    # Standard Header
+
+    print SOUT '/*
+ * Copyright (C) 2012  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+';
+
+    print SOUT "/*\n";
+    print SOUT " * srcid.h";
+    print SOUT " * Generated automatically by Configure.pl.\n";
+    print SOUT " * Date generated: $ThisDate\n";
+    print SOUT " */\n\n";
+
+    print SOUT '
+#ifndef  SRCID_H
+#define SRCID_H 1
+';
+
+    if ($verbose) {
+        print "BIND SRCID: $srcid\n";
+    }
+
+    print SOUT "#define SRCID\t\"$srcid\"\n";
+    print SOUT "#endif /* SRCID_H */\n";
+    close SOUT;
+}
+
+# Status
+
+if ($verbose) {
+    my $name;
+
+    print "Configuration Status\n";
+
+    print "\tconfig.h:\n";
+    foreach $name (@substdefh) {
+        if (defined($configdefh{$name})) {
+            print qq(\t\t$name defined to "$configdefh{$name}"\n);
+        } else {
+            printf qq(\t\t$name undefined\n);
+        }
+    }
+
+    print "\tplatform.h:\n";
+    foreach $name (@substdefp) {
+        if (defined($configdefp{$name})) {
+            print qq(\t\t$name defined to "$configdefp{$name}"\n);
+        } else {
+            printf qq(\t\t$name undefined\n);
+        }
+    }
+
+    print "\tconditions:\n";
+    foreach $name (@substcond) {
+        if (defined($configcond{$name})) {
+            print "\t\t$name is true\n";
+        } else {
+            print "\t\t$name is false\n";
+        }
+    }
+
+    print "\tsubstitutions:\n";
+    foreach $name (@substvar) {
+        if (defined($configvar{$name})) {
+            print qq(\t\t$name -> "$configvar{$name}"\n);
+        }
+    }
+
+    print "\tdefines:\n";
+    foreach $name (@substdefd) {
+        if (defined($configdefd{$name})) {
+            print qq(\t\t/D "$configdefd{$name}"\n);
+        }
+    }
+
+    print "\tincludes:\n";
+    foreach $name (@substinc) {
+        if (defined($configinc{$name})) {
+            print qq(\t\t/I "$configinc{$name}"\n);
+        }
+    }
+
+    print "\tlibraries:\n";
+    foreach $name (@substlib) {
+        if (defined($configlib{$name})) {
+            print "\t\t$configlib{$name}\n";
+        }
+    }
+
+    print "\tDLLs:\n";
+    foreach $name (@substdll) {
+        if (defined($configdll{$name})) {
+            print "\t\t$configdll{$name}\n";
+        }
+    }
+
+    print "\n";
+}
+
+# Setup
+if (($want_win32 eq "yes") || ($want_x64 eq "yes")) {
+    setupconfigh();
+
+    setupplatformh();
+
+    my $file;
+    foreach $file (@filelist) {
+        setupfile($file);
+    }
+
+    if (!$legacy_only) {
+        foreach $file (@projectlist) {
+            setupproject($file);
+        }
+    }
+
+    makeversion();
+
+    makesrcid();
+
+    print "Configured.\n";
+} else {
+    print "add win32 or x64 to commit configuration to build files\n";
+}
+
+exit 0;
+
+# Notes: Unix configure.in options
+#  --enable-developer partially supported
+#  --enable-newstats (9.9/9.9sub only)
+#  --enable-openssl-version-check included without a way to disable it
+#  --enable-openssl-hash supported
+#  --enable-threads included without a way to disable it
+#  --enable-backtrace backtrace included without a way to disable it
+#  --enable-symtable incompatible with DLLs (or libtool)
+#  --enable-exportlib TODO (obsolete)
+#  --enable-ipv6 included without a way to disable it
+#  --enable-atomic supported (renamed intrinsic)
+#  --enable-spnego support (part of GSSAPI)
+#  --enable-fixed-rrset supported
+#  --disable-rpz-nsip supported
+#  --disable-rpz-nsdname supported
+#  --enable-filter-aaaa supported
+#  --with-python supported
+#  --with-openssl supported
+#  --with-ecdsa supported
+#  --with-gost supported
+#  --with-pkcs11 supported
+#  --with-geoip supported
+#  --with-gssapi supported with MIT (K)erberos (f)or (W)indows
+#  --with-libxml2 supported
+#  --with-libjson not supported on WIN32 (package not available on WIN32)
+#  --with-purify ? (package available on WIN32 but for free?)
+#  --with-libtool not supported on WIN32 (never)
+#  --with-readline supported
+#  --with-idn support
+#  --with-[lib]iconv (part of IDN)
+#  --with-atf not supported on WIN32 (package not available on WIN32)
+#  --with-dlopen included without a way to disable it
+#  --with-dlz-* ?
+#
+# Notes: MSVC versions
+# MSVC 12.0 _MSC_VER == 1800 (VS 2013)
+# MSVC 11.0 _MSC_VER == 1700 (VS 2012)
+# MSVC 10.0 _MSC_VER == 1600 (VS 2010)
+# MSVC 9.0  _MSC_VER == 1500 (VS 2008)
+# MSVC 8.0  _MSC_VER == 1400 (VS 2005)
+# MSVC 7.1  _MSC_VER == 1310 (VS .NET 2003)
+# MSVC 7.0  _MSC_VER == 1300 (VS .NET (2002))
+# MSVC 6.0  _MSC_VER == 1200 (VS 6.0 (1998))
+# MSVC 5.0  _MSC_VER == 1100 (VS 97)
diff --git a/win32utils/GeoIP.diff b/win32utils/GeoIP.diff
new file mode 100644 (file)
index 0000000..bc9b6bc
--- /dev/null
@@ -0,0 +1,345 @@
+diff -ruN dists/GeoIP-1.5.1/libGeoIP/GeoIP.c dev/GeoIP-1.5.1/libGeoIP/GeoIP.c
+--- dists/GeoIP-1.5.1/libGeoIP/GeoIP.c 2013-03-23 03:26:09.000000000 +0100
++++ dev/GeoIP-1.5.1/libGeoIP/GeoIP.c   2013-07-19 16:56:58.000000000 +0200
+@@ -19,6 +19,7 @@
+  */
+ #include "GeoIP.h"
++#include "GeoIP_internal.h"
+ static geoipv6_t IPV6_NULL;
+@@ -44,6 +45,10 @@
+ #include <stdint.h>     /* For uint32_t */
+ #endif
++#if defined(_WIN32)
++#include "pread.h"
++#endif
++
+ #ifdef _UNUSED
+ #elif defined(__GNUC__)
+ #define _UNUSED __attribute__ ((unused))
+diff -ruN dists/GeoIP-1.5.1/libGeoIP/GeoIP.h dev/GeoIP-1.5.1/libGeoIP/GeoIP.h
+--- dists/GeoIP-1.5.1/libGeoIP/GeoIP.h 2013-03-23 03:26:09.000000000 +0100
++++ dev/GeoIP-1.5.1/libGeoIP/GeoIP.h   2013-07-19 16:53:33.000000000 +0200
+@@ -154,31 +154,33 @@
+       GEOIP_CORPORATE_SPEED = 3,
+ } GeoIPNetspeedValues;
++#ifdef GEOIP_EXPORTS
++#define GEOIP_API __declspec(dllexport)
++#define GEOIP_DATA __declspec(dllexport)
++#else
++#define GEOIP_DATA __declspec(dllimport)
++#define GEOIP_API
++#endif  /* GEOIP_EXPORTS */
++
+ extern char **GeoIPDBFileName;
+-extern const char * GeoIPDBDescription[NUM_DB_TYPES];
+-extern const char *GeoIPCountryDBFileName;
+-extern const char *GeoIPRegionDBFileName;
+-extern const char *GeoIPCityDBFileName;
+-extern const char *GeoIPOrgDBFileName;
+-extern const char *GeoIPISPDBFileName;
+-extern const char *GeoIPLocationADBFileName;
+-extern const char *GeoIPAccuracyRadiusFileName;
+-extern const char *GeoIPCityConfidenceFileName;
++extern GEOIP_DATA const char * GeoIPDBDescription[NUM_DB_TYPES];
++extern GEOIP_DATA const char *GeoIPCountryDBFileName;
++extern GEOIP_DATA const char *GeoIPRegionDBFileName;
++extern GEOIP_DATA const char *GeoIPCityDBFileName;
++extern GEOIP_DATA const char *GeoIPOrgDBFileName;
++extern GEOIP_DATA const char *GeoIPISPDBFileName;
++extern GEOIP_DATA const char *GeoIPLocationADBFileName;
++extern GEOIP_DATA const char *GeoIPAccuracyRadiusFileName;
++extern GEOIP_DATA const char *GeoIPCityConfidenceFileName;
+ extern char * GeoIP_custom_directory;
+ /* Warning: do not use those arrays as doing so may break your
+  * program with newer GeoIP versions */
+-extern const char GeoIP_country_code[255][3];
+-extern const char GeoIP_country_code3[255][4];
+-extern const char * GeoIP_country_name[255];
+-extern const char * GeoIP_utf8_country_name[255];
+-extern const char GeoIP_country_continent[255][3];
+-
+-#ifdef DLL
+-#define GEOIP_API __declspec(dllexport)
+-#else
+-#define GEOIP_API
+-#endif  /* DLL */
++extern GEOIP_DATA const char GeoIP_country_code[255][3];
++extern GEOIP_DATA const char GeoIP_country_code3[255][4];
++extern GEOIP_DATA const char * GeoIP_country_name[255];
++extern GEOIP_DATA const char * GeoIP_utf8_country_name[255];
++extern GEOIP_DATA const char GeoIP_country_continent[255][3];
+ GEOIP_API void GeoIP_setup_custom_directory(char *dir);
+ GEOIP_API GeoIP* GeoIP_open_type (int type, int flags);
+diff -ruN dists/GeoIP-1.5.1/libGeoIP/GeoIPCity.c dev/GeoIP-1.5.1/libGeoIP/GeoIPCity.c
+--- dists/GeoIP-1.5.1/libGeoIP/GeoIPCity.c     2013-03-23 03:26:09.000000000 +0100
++++ dev/GeoIP-1.5.1/libGeoIP/GeoIPCity.c       2013-07-19 15:41:05.000000000 +0200
+@@ -35,6 +35,10 @@
+ #include <stdint.h>   /* For uint32_t */
+ #endif
++#if defined(_WIN32)
++#include "pread.h"
++#endif
++
+ #ifndef HAVE_PREAD
+ #define pread(fd, buf, count, offset) \
+         ( \
+diff -ruN dists/GeoIP-1.5.1/libGeoIP/GeoIPCity.h dev/GeoIP-1.5.1/libGeoIP/GeoIPCity.h
+--- dists/GeoIP-1.5.1/libGeoIP/GeoIPCity.h     2013-03-23 03:26:09.000000000 +0100
++++ dev/GeoIP-1.5.1/libGeoIP/GeoIPCity.h       2013-07-19 16:23:58.000000000 +0200
+@@ -48,22 +48,22 @@
+         int netmask;  
+ } GeoIPRecord;
+-GeoIPRecord * GeoIP_record_by_ipnum (GeoIP* gi, unsigned long ipnum);
+-GeoIPRecord * GeoIP_record_by_addr (GeoIP* gi, const char *addr);
+-GeoIPRecord * GeoIP_record_by_name (GeoIP* gi, const char *host);
+-
+-GeoIPRecord * GeoIP_record_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum);
+-GeoIPRecord * GeoIP_record_by_addr_v6 (GeoIP* gi, const char *addr);
+-GeoIPRecord * GeoIP_record_by_name_v6 (GeoIP* gi, const char *host);
++GEOIP_API GeoIPRecord * GeoIP_record_by_ipnum (GeoIP* gi, unsigned long ipnum);
++GEOIP_API GeoIPRecord * GeoIP_record_by_addr (GeoIP* gi, const char *addr);
++GEOIP_API GeoIPRecord * GeoIP_record_by_name (GeoIP* gi, const char *host);
++
++GEOIP_API GeoIPRecord * GeoIP_record_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum);
++GEOIP_API GeoIPRecord * GeoIP_record_by_addr_v6 (GeoIP* gi, const char *addr);
++GEOIP_API GeoIPRecord * GeoIP_record_by_name_v6 (GeoIP* gi, const char *host);
+-int GeoIP_record_id_by_addr (GeoIP* gi, const char *addr);
+-int GeoIP_record_id_by_addr_v6 (GeoIP* gi, const char *addr);
++GEOIP_API int GeoIP_record_id_by_addr (GeoIP* gi, const char *addr);
++GEOIP_API int GeoIP_record_id_by_addr_v6 (GeoIP* gi, const char *addr);
+-int GeoIP_init_record_iter (GeoIP* gi);
++GEOIP_API int GeoIP_init_record_iter (GeoIP* gi);
+ /* returns 0 on success, 1 on failure */
+-int GeoIP_next_record (GeoIP* gi, GeoIPRecord **gir, int *record_iter);
++GEOIP_API int GeoIP_next_record (GeoIP* gi, GeoIPRecord **gir, int *record_iter);
+-void GeoIPRecord_delete (GeoIPRecord *gir);
++GEOIP_API void GeoIPRecord_delete (GeoIPRecord *gir);
+ /* NULL on failure otherwise a malloced string in utf8 */
+ /* char * GeoIP_iso_8859_1__utf8(const char *); */
+diff -ruN dists/GeoIP-1.5.1/libGeoIP/Makefile.vc dev/GeoIP-1.5.1/libGeoIP/Makefile.vc
+--- dists/GeoIP-1.5.1/libGeoIP/Makefile.vc     2013-03-23 03:26:09.000000000 +0100
++++ dev/GeoIP-1.5.1/libGeoIP/Makefile.vc       2013-07-19 16:47:45.000000000 +0200
+@@ -1,29 +1,42 @@
+ #NMAKE makefile for Windows developers. 
+-#Produces a static library (GeoIP.lib). 
++##Produces a static library (GeoIP.lib). 
++#Produces a DLL (GeoIP.dll) and library (GeoIP.lib).
+  
+ COMPILER=cl 
+  
+-CFLAGS=-DWIN32 -MD -nologo 
++CFLAGS=-DWIN32 -DGEOIP_EXPORTS -MD -nologo 
+  
+ GEOIPINC = -I..\libGeoIP 
+  
+-CC1 = $(COMPILER) $(CFLAGS) $(GEOIPINC) -DGEOIPDATADIR=\"$(GEOIPDATADIR)\" 
++CC1 = $(COMPILER) $(CFLAGS) $(GEOIPINC) -DGEOIPDATADIR=\"$(GEOIPDATADIR)\" -DPACKAGE_VERSION=\"1.5.1\"
+  
+-OBJS=GeoIP.obj GeoIPCity.obj regionName.obj md5.obj timeZone.obj
++LINKER=link
++
++LDFLAGS=/DLL /nologo /subsystem:console
++
++LD1 = $(LINKER) $(LDFLAGS)
++
++OBJS=GeoIP.obj GeoIPCity.obj GeoIP_depreciated.obj regionName.obj md5.obj timeZone.obj pread.obj
+  
+-EXTRA_LIBS= advapi32.lib wsock32.lib 
++EXTRA_LIBS= ws2_32.lib
+  
+ AR=lib 
+  
+-GeoIP.lib:  GeoIP.obj GeoIPCity.obj regionName.obj md5.obj timeZone.obj
+-   $(AR) -nologo $(OBJS) $(EXTRA_LIBS) /OUT:GeoIP.lib 
++#GeoIP.lib:  GeoIP.obj GeoIPCity.obj regionName.obj md5.obj timeZone.obj pread.obj
++#   $(AR) -nologo $(OBJS) $(EXTRA_LIBS) /OUT:GeoIP.lib 
+  
++GeoIP.dll GeoIP.lib: $(OBJS)
++   $(LD1) $(OBJS) $(EXTRA_LIBS) /out:GeoIP.dll /implib:GeoIP.lib
++
+ GeoIP.obj: GeoIP.c 
+    $(CC1) -c GeoIP.c $(GEOIPINC) 
+  
+ GeoIPCity.obj: GeoIPCity.c 
+    $(CC1) -c GeoIPCity.c $(GEOIPINC)
++GeoIP_depreciated.obj: GeoIP_depreciated.c 
++   $(CC1) -c GeoIP_depreciated.c $(GEOIPINC)
++
+ regionName.obj: regionName.c 
+    $(CC1) -c regionName.c $(GEOIPINC)
+@@ -32,3 +45,6 @@
+ timeZone.obj: timeZone.c 
+    $(CC1) -c timeZone.c $(GEOIPINC)
++
++pread.obj: pread.c 
++   $(CC1) -c pread.c $(GEOIPINC)
+diff -ruN dists/GeoIP-1.5.1/libGeoIP/pread.c dev/GeoIP-1.5.1/libGeoIP/pread.c
+--- dists/GeoIP-1.5.1/libGeoIP/pread.c 1970-01-01 01:00:00.000000000 +0100
++++ dev/GeoIP-1.5.1/libGeoIP/pread.c   2013-07-19 15:37:44.000000000 +0200
+@@ -0,0 +1,73 @@
++/*
++ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
++ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
++ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <windows.h>
++#include <io.h>
++
++#include "pread.h"
++
++CRITICAL_SECTION preadsc;
++
++#ifdef _WIN64
++int pread(int fd, void *buf, unsigned int nbyte, __int64 offset)
++{
++      int cc = -1;
++      __int64 prev = (__int64)-1L;
++
++      EnterCriticalSection(&preadsc);
++      prev = _lseeki64(fd, 0L, SEEK_CUR);
++      if (prev == (__int64)-1L)
++              goto done;
++      if (_lseeki64(fd, offset, SEEK_SET) != offset)
++              goto done;
++      cc = _read(fd, buf, nbyte);
++
++done:
++      if (prev != (__int64)-1L)
++              (void)_lseeki64(fd, prev, SEEK_SET);
++      LeaveCriticalSection(&preadsc);
++
++      return cc;
++}
++#else
++int pread(int fd, void *buf, unsigned int nbyte, long offset)
++{
++      int cc = -1;
++      long prev = -1L;
++
++      EnterCriticalSection(&preadsc);
++      prev = _lseek(fd, 0L, SEEK_CUR);
++      if (prev == -1L)
++              goto done;
++      if (_lseek(fd, offset, SEEK_SET) != offset)
++              goto done;
++      cc = _read(fd, buf, nbyte);
++
++done:
++      if (prev != -1L)
++              (void)_lseek(fd, prev, SEEK_SET);
++      LeaveCriticalSection(&preadsc);
++
++      return cc;
++}
++#endif
++
++BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved )
++{
++      if (fdwReason == DLL_PROCESS_ATTACH)
++              InitializeCriticalSection(&preadsc);
++      return TRUE;
++}
+diff -ruN dists/GeoIP-1.5.1/libGeoIP/pread.h dev/GeoIP-1.5.1/libGeoIP/pread.h
+--- dists/GeoIP-1.5.1/libGeoIP/pread.h 1970-01-01 01:00:00.000000000 +0100
++++ dev/GeoIP-1.5.1/libGeoIP/pread.h   2013-07-19 15:39:01.000000000 +0200
+@@ -0,0 +1,29 @@
++/*
++ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
++ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
++ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#ifdef _WIN64
++typedef __int64 ssize_t;
++
++int pread(int fd, void *buf, unsigned int nbyte, __int64 offset);
++#else
++typedef int ssize_t;
++
++int pread(int fd, void *buf, unsigned int nbyte, long offset);
++#endif
++
++#define HAVE_PREAD
++
++extern CRITICAL_SECTION preadsc;
+diff -ruN dists/GeoIP-1.5.1/libGeoIP/regionName.c dev/GeoIP-1.5.1/libGeoIP/regionName.c
+--- dists/GeoIP-1.5.1/libGeoIP/regionName.c    2013-03-23 03:26:09.000000000 +0100
++++ dev/GeoIP-1.5.1/libGeoIP/regionName.c      2013-07-19 16:37:56.000000000 +0200
+@@ -1,3 +1,5 @@
++#include "GeoIP.h"
++
+ #include <string.h>
+ #include <stdio.h>
+diff -ruN dists/GeoIP-1.5.1/libGeoIP/timeZone.c dev/GeoIP-1.5.1/libGeoIP/timeZone.c
+--- dists/GeoIP-1.5.1/libGeoIP/timeZone.c      2013-03-23 03:26:09.000000000 +0100
++++ dev/GeoIP-1.5.1/libGeoIP/timeZone.c        2013-07-19 17:22:44.000000000 +0200
+@@ -1,4 +1,7 @@
++#include "GeoIP.h"
++
+ #include <string.h> 
++
+ const char* GeoIP_time_zone_by_country_and_region(const char * country,const char * region) {
+   const char* timezone = NULL;
+   if (country == NULL) {
+diff -ruN dists/GeoIP-1.5.1/test/Makefile.vc dev/GeoIP-1.5.1/test/Makefile.vc
+--- dists/GeoIP-1.5.1/test/Makefile.vc 2013-03-23 03:26:09.000000000 +0100
++++ dev/GeoIP-1.5.1/test/Makefile.vc   2013-07-19 16:48:55.000000000 +0200
+@@ -9,7 +9,7 @@
+  
+ GEOIPINC = -I..\libGeoIP 
+  
+-CC1 = $(COMPILER) $(CFLAGS) $(GEOIPINC) 
++CC1 = $(COMPILER) $(CFLAGS) $(GEOIPINC) -DSRCDIR=\"../\"
+  
+ GEOIPLIB = ..\libGeoIP\GeoIP.lib 
+  
+diff -ruN dists/GeoIP-1.5.1/test/benchmark.c dev/GeoIP-1.5.1/test/benchmark.c
+--- dists/GeoIP-1.5.1/test/benchmark.c 2013-03-23 03:26:09.000000000 +0100
++++ dev/GeoIP-1.5.1/test/benchmark.c   2013-07-19 16:26:23.000000000 +0200
+@@ -81,7 +81,7 @@
+ void testgeoiporg(int flags, const char *msg, int numlookups)
+ {
+     GeoIP *i = NULL;
+-    GeoIPRegion *i3 = NULL;
++    char *i3 = NULL;
+     int i4 = 0;
+     int i2 = 0;
+     double t = 0;
diff --git a/win32utils/SetupLibs.bat b/win32utils/SetupLibs.bat
deleted file mode 100644 (file)
index bbc8050..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-echo off
-rem
-rem Copyright (C) 2007,2009  Internet Systems Consortium, Inc. ("ISC")
-rem 
-rem Permission to use, copy, modify, and distribute this software for any
-rem purpose with or without fee is hereby granted, provided that the above
-rem copyright notice and this permission notice appear in all copies.
-rem 
-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-rem PERFORMANCE OF THIS SOFTWARE.
-
-rem SetupLibs.bat
-rem This script copys the openssl and libxml2 dlls into place.
-rem This script may be modified by updateopenssl.pl and/or updatelibxml2.pl.
-
-echo Copying the OpenSSL DLL and LICENSE.
-
-copy ..\..\openssl-0.9.8l\out32dll\libeay32.dll ..\Build\Release\
-copy ..\..\openssl-0.9.8l\out32dll\libeay32.dll ..\Build\Debug\
-copy ..\..\openssl-0.9.8l\LICENSE ..\Build\Release\OpenSSL-LICENSE
-
-echo Copying the libxml DLL.
-
-copy ..\..\libxml2-2.7.3\win32\bin.msvc\libxml2.dll ..\Build\Release\
-copy ..\..\libxml2-2.7.3\win32\bin.msvc\libxml2.dll ..\Build\Debug\
-
-rem Done
diff --git a/win32utils/bind9.sln.in b/win32utils/bind9.sln.in
new file mode 100644 (file)
index 0000000..59acf4e
--- /dev/null
@@ -0,0 +1,778 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 11.00\r
+# Visual C++ Express 2010\r
+# BINDInstall must be the first project\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "..\bin\win32\BINDInstall\BINDInstall.vcxproj", "{190CC424-E8CC-46F2-9013-3152D6905118}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03}\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E}\r
+               {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0} = {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}\r
+@IF TESTS\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+@END TESTS\r
+               {723C65DA-A96C-4BA3-A34E-44F11CA346F9} = {723C65DA-A96C-4BA3-A34E-44F11CA346F9}\r
+               {7C8681A1-E3A8-470E-9EEF-16054D111A19} = {7C8681A1-E3A8-470E-9EEF-16054D111A19}\r
+               {39721F26-8B80-4AA9-9826-2AEF7322C3D5} = {39721F26-8B80-4AA9-9826-2AEF7322C3D5}\r
+               {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA}\r
+               {F938F9B8-D395-4A40-BEC7-0122D289C692} = {F938F9B8-D395-4A40-BEC7-0122D289C692}\r
+               {BA1048A8-6961-4A20-BE12-08BE20611C9D} = {BA1048A8-6961-4A20-BE12-08BE20611C9D}\r
+               {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5} = {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5}\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}\r
+               {0BF11E21-168C-4CAA-B784-429D126BBAE5} = {0BF11E21-168C-4CAA-B784-429D126BBAE5}\r
+               {205ED8A9-2E4C-41CC-9385-F3613402AA90} = {205ED8A9-2E4C-41CC-9385-F3613402AA90}\r
+               {17455DC6-5FBB-47C3-8F44-7DB574A188D3} = {17455DC6-5FBB-47C3-8F44-7DB574A188D3}\r
+               {6E6297F4-69D7-4533-85E1-BD17C30017C8} = {6E6297F4-69D7-4533-85E1-BD17C30017C8}\r
+               {D171F185-D3C2-4463-9CF3-ED1D0B1D6832} = {D171F185-D3C2-4463-9CF3-ED1D0B1D6832}\r
+               {03FB7588-C5A7-4572-968F-14F1206BC69C} = {03FB7588-C5A7-4572-968F-14F1206BC69C}\r
+               {FD653434-F1A8-44A9-85B2-A7468491DA6D} = {FD653434-F1A8-44A9-85B2-A7468491DA6D}\r
+               {91E60FDA-E48C-4DA0-92A2-97F963348E00} = {91E60FDA-E48C-4DA0-92A2-97F963348E00}\r
+               {B19042CE-D3D9-469B-BCD2-C3140150939A} = {B19042CE-D3D9-469B-BCD2-C3140150939A}\r
+               {4EE91023-94C3-48C0-B71C-5333B726C2EE} = {4EE91023-94C3-48C0-B71C-5333B726C2EE}\r
+               {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7} = {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7}\r
+               {70F2F0DF-665D-4444-A982-AEA31A861A22} = {70F2F0DF-665D-4444-A982-AEA31A861A22}\r
+               {C41266C7-E27E-4D60-9815-82D3B32BF82F} = {C41266C7-E27E-4D60-9815-82D3B32BF82F}\r
+               {2C1F7096-C5B5-48D4-846F-A7ACA454335D} = {2C1F7096-C5B5-48D4-846F-A7ACA454335D}\r
+               {03A96113-CB14-43AA-AEB2-48950E3915C5} = {03A96113-CB14-43AA-AEB2-48950E3915C5}\r
+               {66028555-7DD5-4016-B601-9EF9A1EE8BFA} = {66028555-7DD5-4016-B601-9EF9A1EE8BFA}\r
+               {64964B03-4815-41F0-9057-E766A94AF197} = {64964B03-4815-41F0-9057-E766A94AF197}\r
+               {1E2C1635-3093-4D59-80E7-4743AC10F22F} = {1E2C1635-3093-4D59-80E7-4743AC10F22F}\r
+               {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1} = {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1}\r
+@IF PKCS11\r
+               {5042D371-0402-4FA3-A52A-769708694422} = {5042D371-0402-4FA3-A52A-769708694422}\r
+               {C663B088-F7BC-4C8C-8D06-A76636EED651} = {C663B088-F7BC-4C8C-8D06-A76636EED651}\r
+               {5B3137E5-7E1F-49AA-8810-A09AA417D326} = {5B3137E5-7E1F-49AA-8810-A09AA417D326}\r
+@END PKCS11\r
+@IF TESTS\r
+@IF ATOMIC\r
+               {EC6ECB35-58C0-48EC-BAC9-9A652D9406C9} = {EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}\r
+@END ATOMIC\r
+               {E6338E67-3224-4E66-9463-7AD719DA9346} = {E6338E67-3224-4E66-9463-7AD719DA9346}\r
+               {EE9B94CF-7C33-4F3B-A674-FB756D422C54} = {EE9B94CF-7C33-4F3B-A674-FB756D422C54}\r
+               {5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E} = {5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E}\r
+               {627F32A9-267F-41CA-827C-1FD04DE20A56} = {627F32A9-267F-41CA-827C-1FD04DE20A56}\r
+               {14071120-84F6-4A6F-BF23-90EC5D0372CE} = {14071120-84F6-4A6F-BF23-90EC5D0372CE}\r
+               {124DC0D3-3096-41D2-B490-CE85E890FF33} = {124DC0D3-3096-41D2-B490-CE85E890FF33}\r
+               {39F714D4-FEFB-4E23-91DB-1F6FC80A98B5} = {39F714D4-FEFB-4E23-91DB-1F6FC80A98B5}\r
+               {66E58849-A764-44E4-8D32-7C1107246A26} = {66E58849-A764-44E4-8D32-7C1107246A26}\r
+               {351D3872-707B-46AD-8BC0-5A668B8C745B} = {351D3872-707B-46AD-8BC0-5A668B8C745B}\r
+               {2CB7B128-5954-4FAF-B5EA-501B23BB8054} = {2CB7B128-5954-4FAF-B5EA-501B23BB8054}\r
+               {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F} = {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}\r
+@END TESTS\r
+@IF XTESTS\r
+               {14751171-C40E-40EE-A2F0-37FFC3CCD4A2} = {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}\r
+               {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1} = {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}\r
+               {7705EEF6-6980-48F9-A045-699DAFE860C9} = {7705EEF6-6980-48F9-A045-699DAFE860C9}\r
+               {551561F6-4A2A-4824-8A34-A4AF0EB7C179} = {551561F6-4A2A-4824-8A34-A4AF0EB7C179}\r
+               {6200ED9D-CAB1-4C00-8D79-478F64A19B8F} = {6200ED9D-CAB1-4C00-8D79-478F64A19B8F}\r
+               {CC7340C1-CBAF-4145-969A-73AE960401D6} = {CC7340C1-CBAF-4145-969A-73AE960401D6}\r
+               {E55653C8-5501-4871-A97C-C926631F40F9} = {E55653C8-5501-4871-A97C-C926631F40F9}\r
+@END XTESTS\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen", "..\lib\dns\win32\gen.vcxproj", "{A3F71D12-F38A-4C77-8D87-8E8854CA74A1}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisc", "..\lib\isc\win32\libisc.vcxproj", "{3840E563-D180-4761-AA9C-E6155F02EAFF}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisccc", "..\lib\isccc\win32\libisccc.vcxproj", "{B556705F-1920-4400-878A-B259D3556047}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns", "..\lib\dns\win32\libdns.vcxproj", "{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libisccfg", "..\lib\isccfg\win32\libisccfg.vcxproj", "{B2DFA58C-6347-478E-81E8-01E06999D4F1}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbind9", "..\lib\bind9\win32\libbind9.vcxproj", "{E741C10B-B075-4206-9596-46765B665E03}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblwres", "..\lib\lwres\win32\liblwres.vcxproj", "{EBDB30A3-E8EB-4E1D-915E-06720600A84E}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bindevt", "..\lib\win32\bindevt\bindevt.vcxproj", "{0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+@IF TESTS\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtests", "..\lib\tests\win32\libtests.vcxproj", "{F6F08940-7597-4FEE-9CE0-E09A009C45A3}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+       EndProjectSection\r
+EndProject\r
+@END TESTS\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "named", "..\bin\named\win32\named.vcxproj", "{723C65DA-A96C-4BA3-A34E-44F11CA346F9}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03}\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rndcutil", "..\bin\rndc\win32\rndcutil.vcxproj", "{7C8681A1-E3A8-470E-9EEF-16054D111A19}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rndc", "..\bin\rndc\win32\rndc.vcxproj", "{39721F26-8B80-4AA9-9826-2AEF7322C3D5}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03}\r
+               {7C8681A1-E3A8-470E-9EEF-16054D111A19} = {7C8681A1-E3A8-470E-9EEF-16054D111A19}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dighost", "..\bin\dig\win32\dighost.vcxproj", "{140DE800-E552-43CC-B0C7-A33A92E368CA}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03}\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dig", "..\bin\dig\win32\dig.vcxproj", "{F938F9B8-D395-4A40-BEC7-0122D289C692}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03}\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E}\r
+               {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "host", "..\bin\dig\win32\host.vcxproj", "{BA1048A8-6961-4A20-BE12-08BE20611C9D}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03}\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E}\r
+               {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nslookup", "..\bin\dig\win32\nslookup.vcxproj", "{C15A6E1A-94CE-4686-99F9-6BC5FD623EB5}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03}\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E}\r
+               {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnssectool", "..\bin\dnssec\win32\dnssectool.vcxproj", "{2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keygen", "..\bin\dnssec\win32\keygen.vcxproj", "{0BF11E21-168C-4CAA-B784-429D126BBAE5}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signzone", "..\bin\dnssec\win32\signzone.vcxproj", "{205ED8A9-2E4C-41CC-9385-F3613402AA90}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keyfromlabel", "..\bin\dnssec\win32\keyfromlabel.vcxproj", "{17455DC6-5FBB-47C3-8F44-7DB574A188D3}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfromkey", "..\bin\dnssec\win32\dsfromkey.vcxproj", "{6E6297F4-69D7-4533-85E1-BD17C30017C8}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "revoke", "..\bin\dnssec\win32\revoke.vcxproj", "{D171F185-D3C2-4463-9CF3-ED1D0B1D6832}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settime", "..\bin\dnssec\win32\settime.vcxproj", "{03FB7588-C5A7-4572-968F-14F1206BC69C}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "verify", "..\bin\dnssec\win32\verify.vcxproj", "{FD653434-F1A8-44A9-85B2-A7468491DA6D}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70} = {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arpaname", "..\bin\tools\win32\arpaname.vcxproj", "{91E60FDA-E48C-4DA0-92A2-97F963348E00}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "journalprint", "..\bin\tools\win32\journalprint.vcxproj", "{B19042CE-D3D9-469B-BCD2-C3140150939A}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsec3hash", "..\bin\tools\win32\nsec3hash.vcxproj", "{4EE91023-94C3-48C0-B71C-5333B726C2EE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrandom", "..\bin\tools\win32\genrandom.vcxproj", "{B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ischmacfixup", "..\bin\tools\win32\ischmacfixup.vcxproj", "{70F2F0DF-665D-4444-A982-AEA31A861A22}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsupdate", "..\bin\nsupdate\win32\nsupdate.vcxproj", "{C41266C7-E27E-4D60-9815-82D3B32BF82F}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03}\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E} = {EBDB30A3-E8EB-4E1D-915E-06720600A84E}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checktool", "..\bin\check\win32\checktool.vcxproj", "{2C1F7096-C5B5-48D4-846F-A7ACA454335D}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkconf", "..\bin\check\win32\checkconf.vcxproj", "{03A96113-CB14-43AA-AEB2-48950E3915C5}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {E741C10B-B075-4206-9596-46765B665E03} = {E741C10B-B075-4206-9596-46765B665E03}\r
+               {2C1F7096-C5B5-48D4-846F-A7ACA454335D} = {2C1F7096-C5B5-48D4-846F-A7ACA454335D}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkzone", "..\bin\check\win32\checkzone.vcxproj", "{66028555-7DD5-4016-B601-9EF9A1EE8BFA}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {2C1F7096-C5B5-48D4-846F-A7ACA454335D} = {2C1F7096-C5B5-48D4-846F-A7ACA454335D}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "confgentool", "..\bin\confgen\win32\confgentool.vcxproj", "{64964B03-4815-41F0-9057-E766A94AF197}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rndcconfgen", "..\bin\confgen\win32\rndcconfgen.vcxproj", "{1E2C1635-3093-4D59-80E7-4743AC10F22F}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {64964B03-4815-41F0-9057-E766A94AF197} = {64964B03-4815-41F0-9057-E766A94AF197}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddnsconfgen", "..\bin\confgen\win32\ddnsconfgen.vcxproj", "{1EA4FC64-F33B-4A50-970A-EA052BBE9CF1}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+               {64964B03-4815-41F0-9057-E766A94AF197} = {64964B03-4815-41F0-9057-E766A94AF197}\r
+       EndProjectSection\r
+EndProject\r
+@IF PKCS11\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11keygen", "..\bin\pkcs11\win32\pk11keygen.vcxproj", "{5042D371-0402-4FA3-A52A-769708694422}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11list", "..\bin\pkcs11\win32\pk11list.vcxproj", "{C663B088-F7BC-4C8C-8D06-A76636EED651}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pk11destroy", "..\bin\pkcs11\win32\pk11destroy.vcxproj", "{5B3137E5-7E1F-49AA-8810-A09AA417D326}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+@END PKCS11\r
+@IF TESTS\r
+@IF ATOMIC\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_atomic", "..\bin\tests\atomic\win32\t_atomic.vcxproj", "{EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+@END ATOMIC\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_db", "..\bin\tests\db\win32\t_db.vcxproj", "{E6338E67-3224-4E66-9463-7AD719DA9346}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_dst", "..\bin\tests\dst\win32\t_dst.vcxproj", "{EE9B94CF-7C33-4F3B-A674-FB756D422C54}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+               {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7} = {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_master", "..\bin\tests\master\win32\t_master.vcxproj", "{5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_mem", "..\bin\tests\mem\win32\t_mem.vcxproj", "{627F32A9-267F-41CA-827C-1FD04DE20A56}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_hashes", "..\bin\tests\hashes\win32\t_hashes.vcxproj", "{14071120-84F6-4A6F-BF23-90EC5D0372CE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_names", "..\bin\tests\names\win32\t_names.vcxproj", "{124DC0D3-3096-41D2-B490-CE85E890FF33}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_rbt", "..\bin\tests\rbt\win32\t_rbt.vcxproj", "{39F714D4-FEFB-4E23-91DB-1F6FC80A98B5}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_resolver", "..\bin\tests\resolver\win32\t_resolver.vcxproj", "{66E58849-A764-44E4-8D32-7C1107246A26}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_sockaddr", "..\bin\tests\sockaddr\win32\t_sockaddr.vcxproj", "{351D3872-707B-46AD-8BC0-5A668B8C745B}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_tasks", "..\bin\tests\tasks\win32\t_tasks.vcxproj", "{2CB7B128-5954-4FAF-B5EA-501B23BB8054}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_timers", "..\bin\tests\timers\win32\t_timers.vcxproj", "{4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}\r
+       EndProjectSection\r
+EndProject\r
+@END TESTS\r
+@IF XTESTS\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "backtrace_test", "..\bin\tests\win32\backtrace_test.vcxproj", "{14751171-C40E-40EE-A2F0-37FFC3CCD4A2}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inter_test", "..\bin\tests\win32\inter_test.vcxproj", "{06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rwlock_test", "..\bin\tests\win32\rwlock_test.vcxproj", "{7705EEF6-6980-48F9-A045-699DAFE860C9}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shutdown_test", "..\bin\tests\win32\shutdown_test.vcxproj", "{551561F6-4A2A-4824-8A34-A4AF0EB7C179}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sock_test", "..\bin\tests\win32\sock_test.vcxproj", "{6200ED9D-CAB1-4C00-8D79-478F64A19B8F}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "task_test", "..\bin\tests\win32\task_test.vcxproj", "{CC7340C1-CBAF-4145-969A-73AE960401D6}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timer_test", "..\bin\tests\win32\timer_test.vcxproj", "{E55653C8-5501-4871-A97C-C926631F40F9}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}\r
+       EndProjectSection\r
+EndProject\r
+@END XTESTS\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|@PLATFORM@ = Debug|@PLATFORM@\r
+               Release|@PLATFORM@ = Release|@PLATFORM@\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {190CC424-E8CC-46F2-9013-3152D6905118}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {190CC424-E8CC-46F2-9013-3152D6905118}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {190CC424-E8CC-46F2-9013-3152D6905118}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {190CC424-E8CC-46F2-9013-3152D6905118}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}.Debug|@BUILD_PLATFORM@.ActiveCfg = Debug|@BUILD_PLATFORM@\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}.Debug|@BUILD_PLATFORM@.Build.0 = Debug|@BUILD_PLATFORM@\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}.Release|@BUILD_PLATFORM@.ActiveCfg = Release|@BUILD_PLATFORM@\r
+               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}.Release|@BUILD_PLATFORM@.Build.0 = Release|@BUILD_PLATFORM@\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {3840E563-D180-4761-AA9C-E6155F02EAFF}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {B556705F-1920-4400-878A-B259D3556047}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {B556705F-1920-4400-878A-B259D3556047}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {B556705F-1920-4400-878A-B259D3556047}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {B556705F-1920-4400-878A-B259D3556047}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {B2DFA58C-6347-478E-81E8-01E06999D4F1}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {E741C10B-B075-4206-9596-46765B665E03}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {E741C10B-B075-4206-9596-46765B665E03}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {E741C10B-B075-4206-9596-46765B665E03}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {E741C10B-B075-4206-9596-46765B665E03}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {EBDB30A3-E8EB-4E1D-915E-06720600A84E}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {0D745CD9-FC3B-49DC-99BE-1E6DF85593F0}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+@IF TESTS\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {F6F08940-7597-4FEE-9CE0-E09A009C45A3}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+@END TESTS\r
+               {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {723C65DA-A96C-4BA3-A34E-44F11CA346F9}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {7C8681A1-E3A8-470E-9EEF-16054D111A19}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {7C8681A1-E3A8-470E-9EEF-16054D111A19}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {7C8681A1-E3A8-470E-9EEF-16054D111A19}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {7C8681A1-E3A8-470E-9EEF-16054D111A19}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {39721F26-8B80-4AA9-9826-2AEF7322C3D5}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {39721F26-8B80-4AA9-9826-2AEF7322C3D5}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {39721F26-8B80-4AA9-9826-2AEF7322C3D5}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {39721F26-8B80-4AA9-9826-2AEF7322C3D5}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {140DE800-E552-43CC-B0C7-A33A92E368CA}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {140DE800-E552-43CC-B0C7-A33A92E368CA}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {140DE800-E552-43CC-B0C7-A33A92E368CA}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {140DE800-E552-43CC-B0C7-A33A92E368CA}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {F938F9B8-D395-4A40-BEC7-0122D289C692}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {F938F9B8-D395-4A40-BEC7-0122D289C692}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {F938F9B8-D395-4A40-BEC7-0122D289C692}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {F938F9B8-D395-4A40-BEC7-0122D289C692}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {BA1048A8-6961-4A20-BE12-08BE20611C9D}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {BA1048A8-6961-4A20-BE12-08BE20611C9D}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {BA1048A8-6961-4A20-BE12-08BE20611C9D}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {BA1048A8-6961-4A20-BE12-08BE20611C9D}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {C15A6E1A-94CE-4686-99F9-6BC5FD623EB5}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {2CB7DC75-023B-4AA3-AF3A-AE5046A4EE70}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {0BF11E21-168C-4CAA-B784-429D126BBAE5}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {0BF11E21-168C-4CAA-B784-429D126BBAE5}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {0BF11E21-168C-4CAA-B784-429D126BBAE5}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {0BF11E21-168C-4CAA-B784-429D126BBAE5}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {205ED8A9-2E4C-41CC-9385-F3613402AA90}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {205ED8A9-2E4C-41CC-9385-F3613402AA90}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {205ED8A9-2E4C-41CC-9385-F3613402AA90}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {205ED8A9-2E4C-41CC-9385-F3613402AA90}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {17455DC6-5FBB-47C3-8F44-7DB574A188D3}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {17455DC6-5FBB-47C3-8F44-7DB574A188D3}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {17455DC6-5FBB-47C3-8F44-7DB574A188D3}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {17455DC6-5FBB-47C3-8F44-7DB574A188D3}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {6E6297F4-69D7-4533-85E1-BD17C30017C8}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {6E6297F4-69D7-4533-85E1-BD17C30017C8}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {6E6297F4-69D7-4533-85E1-BD17C30017C8}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {6E6297F4-69D7-4533-85E1-BD17C30017C8}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {D171F185-D3C2-4463-9CF3-ED1D0B1D6832}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {D171F185-D3C2-4463-9CF3-ED1D0B1D6832}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {D171F185-D3C2-4463-9CF3-ED1D0B1D6832}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {D171F185-D3C2-4463-9CF3-ED1D0B1D6832}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {03FB7588-C5A7-4572-968F-14F1206BC69C}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {03FB7588-C5A7-4572-968F-14F1206BC69C}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {03FB7588-C5A7-4572-968F-14F1206BC69C}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {03FB7588-C5A7-4572-968F-14F1206BC69C}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {FD653434-F1A8-44A9-85B2-A7468491DA6D}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {FD653434-F1A8-44A9-85B2-A7468491DA6D}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {FD653434-F1A8-44A9-85B2-A7468491DA6D}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {FD653434-F1A8-44A9-85B2-A7468491DA6D}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {91E60FDA-E48C-4DA0-92A2-97F963348E00}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {91E60FDA-E48C-4DA0-92A2-97F963348E00}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {91E60FDA-E48C-4DA0-92A2-97F963348E00}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {91E60FDA-E48C-4DA0-92A2-97F963348E00}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {B19042CE-D3D9-469B-BCD2-C3140150939A}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {B19042CE-D3D9-469B-BCD2-C3140150939A}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {B19042CE-D3D9-469B-BCD2-C3140150939A}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {B19042CE-D3D9-469B-BCD2-C3140150939A}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {4EE91023-94C3-48C0-B71C-5333B726C2EE}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {4EE91023-94C3-48C0-B71C-5333B726C2EE}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {4EE91023-94C3-48C0-B71C-5333B726C2EE}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {4EE91023-94C3-48C0-B71C-5333B726C2EE}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {70F2F0DF-665D-4444-A982-AEA31A861A22}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {70F2F0DF-665D-4444-A982-AEA31A861A22}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {70F2F0DF-665D-4444-A982-AEA31A861A22}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {70F2F0DF-665D-4444-A982-AEA31A861A22}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {C41266C7-E27E-4D60-9815-82D3B32BF82F}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {C41266C7-E27E-4D60-9815-82D3B32BF82F}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {C41266C7-E27E-4D60-9815-82D3B32BF82F}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {C41266C7-E27E-4D60-9815-82D3B32BF82F}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {2C1F7096-C5B5-48D4-846F-A7ACA454335D}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {2C1F7096-C5B5-48D4-846F-A7ACA454335D}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {2C1F7096-C5B5-48D4-846F-A7ACA454335D}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {2C1F7096-C5B5-48D4-846F-A7ACA454335D}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {03A96113-CB14-43AA-AEB2-48950E3915C5}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {03A96113-CB14-43AA-AEB2-48950E3915C5}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {03A96113-CB14-43AA-AEB2-48950E3915C5}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {03A96113-CB14-43AA-AEB2-48950E3915C5}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {66028555-7DD5-4016-B601-9EF9A1EE8BFA}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {66028555-7DD5-4016-B601-9EF9A1EE8BFA}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {66028555-7DD5-4016-B601-9EF9A1EE8BFA}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {66028555-7DD5-4016-B601-9EF9A1EE8BFA}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {64964B03-4815-41F0-9057-E766A94AF197}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {64964B03-4815-41F0-9057-E766A94AF197}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {64964B03-4815-41F0-9057-E766A94AF197}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {64964B03-4815-41F0-9057-E766A94AF197}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {1E2C1635-3093-4D59-80E7-4743AC10F22F}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {1E2C1635-3093-4D59-80E7-4743AC10F22F}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {1E2C1635-3093-4D59-80E7-4743AC10F22F}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {1E2C1635-3093-4D59-80E7-4743AC10F22F}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {1EA4FC64-F33B-4A50-970A-EA052BBE9CF1}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+@IF PKCS11\r
+               {5042D371-0402-4FA3-A52A-769708694422}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {5042D371-0402-4FA3-A52A-769708694422}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {5042D371-0402-4FA3-A52A-769708694422}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {5042D371-0402-4FA3-A52A-769708694422}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {C663B088-F7BC-4C8C-8D06-A76636EED651}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {C663B088-F7BC-4C8C-8D06-A76636EED651}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {C663B088-F7BC-4C8C-8D06-A76636EED651}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {C663B088-F7BC-4C8C-8D06-A76636EED651}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {5B3137E5-7E1F-49AA-8810-A09AA417D326}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {5B3137E5-7E1F-49AA-8810-A09AA417D326}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {5B3137E5-7E1F-49AA-8810-A09AA417D326}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {5B3137E5-7E1F-49AA-8810-A09AA417D326}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+@END PKCS11\r
+@IF TESTS\r
+@IF ATOMIC\r
+               {EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+@END ATOMIC\r
+               {E6338E67-3224-4E66-9463-7AD719DA9346}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {E6338E67-3224-4E66-9463-7AD719DA9346}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {E6338E67-3224-4E66-9463-7AD719DA9346}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {E6338E67-3224-4E66-9463-7AD719DA9346}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {EE9B94CF-7C33-4F3B-A674-FB756D422C54}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {EE9B94CF-7C33-4F3B-A674-FB756D422C54}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {EE9B94CF-7C33-4F3B-A674-FB756D422C54}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {EE9B94CF-7C33-4F3B-A674-FB756D422C54}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {627F32A9-267F-41CA-827C-1FD04DE20A56}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {627F32A9-267F-41CA-827C-1FD04DE20A56}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {627F32A9-267F-41CA-827C-1FD04DE20A56}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {627F32A9-267F-41CA-827C-1FD04DE20A56}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {14071120-84F6-4A6F-BF23-90EC5D0372CE}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {14071120-84F6-4A6F-BF23-90EC5D0372CE}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {14071120-84F6-4A6F-BF23-90EC5D0372CE}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {14071120-84F6-4A6F-BF23-90EC5D0372CE}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {124DC0D3-3096-41D2-B490-CE85E890FF33}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {124DC0D3-3096-41D2-B490-CE85E890FF33}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {124DC0D3-3096-41D2-B490-CE85E890FF33}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {124DC0D3-3096-41D2-B490-CE85E890FF33}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {39F714D4-FEFB-4E23-91DB-1F6FC80A98B5}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {39F714D4-FEFB-4E23-91DB-1F6FC80A98B5}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {39F714D4-FEFB-4E23-91DB-1F6FC80A98B5}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {39F714D4-FEFB-4E23-91DB-1F6FC80A98B5}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {66E58849-A764-44E4-8D32-7C1107246A26}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {66E58849-A764-44E4-8D32-7C1107246A26}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {66E58849-A764-44E4-8D32-7C1107246A26}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {66E58849-A764-44E4-8D32-7C1107246A26}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {351D3872-707B-46AD-8BC0-5A668B8C745B}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {351D3872-707B-46AD-8BC0-5A668B8C745B}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {351D3872-707B-46AD-8BC0-5A668B8C745B}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {351D3872-707B-46AD-8BC0-5A668B8C745B}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {2CB7B128-5954-4FAF-B5EA-501B23BB8054}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {2CB7B128-5954-4FAF-B5EA-501B23BB8054}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {2CB7B128-5954-4FAF-B5EA-501B23BB8054}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {2CB7B128-5954-4FAF-B5EA-501B23BB8054}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {4E6F5A7C-89AA-4259-99DB-F89DAE418B3F}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+@END TESTS\r
+@IF XTESTS\r
+               {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {14751171-C40E-40EE-A2F0-37FFC3CCD4A2}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {06AA5F16-7121-4C3A-91EF-AFC3BF3B8CE1}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {7705EEF6-6980-48F9-A045-699DAFE860C9}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {7705EEF6-6980-48F9-A045-699DAFE860C9}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {7705EEF6-6980-48F9-A045-699DAFE860C9}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {7705EEF6-6980-48F9-A045-699DAFE860C9}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {551561F6-4A2A-4824-8A34-A4AF0EB7C179}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {551561F6-4A2A-4824-8A34-A4AF0EB7C179}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {551561F6-4A2A-4824-8A34-A4AF0EB7C179}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {551561F6-4A2A-4824-8A34-A4AF0EB7C179}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {6200ED9D-CAB1-4C00-8D79-478F64A19B8F}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {6200ED9D-CAB1-4C00-8D79-478F64A19B8F}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {6200ED9D-CAB1-4C00-8D79-478F64A19B8F}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {6200ED9D-CAB1-4C00-8D79-478F64A19B8F}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {CC7340C1-CBAF-4145-969A-73AE960401D6}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {CC7340C1-CBAF-4145-969A-73AE960401D6}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {CC7340C1-CBAF-4145-969A-73AE960401D6}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {CC7340C1-CBAF-4145-969A-73AE960401D6}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+               {E55653C8-5501-4871-A97C-C926631F40F9}.Debug|@PLATFORM@.ActiveCfg = Debug|@PLATFORM@\r
+               {E55653C8-5501-4871-A97C-C926631F40F9}.Debug|@PLATFORM@.Build.0 = Debug|@PLATFORM@\r
+               {E55653C8-5501-4871-A97C-C926631F40F9}.Release|@PLATFORM@.ActiveCfg = Release|@PLATFORM@\r
+               {E55653C8-5501-4871-A97C-C926631F40F9}.Release|@PLATFORM@.Build.0 = Release|@PLATFORM@\r
+@END XTESTS\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/win32utils/build.txt b/win32utils/build.txt
new file mode 100644 (file)
index 0000000..4665610
--- /dev/null
@@ -0,0 +1,181 @@
+Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
+       BIND 9.10 for Win32 Source Build Instructions.  11-Jul-2013
+
+Building BIND 9.10 on Windows XP/Vista/7/8 or server 2003/2008/2008R2
+has the following prerequisites:
+
+1) You need to install Perl for Windows.  ActivePerl
+(http://www.activestate.com/) and Strawberry Perl
+(http://www.strawberryperl.com) have both been tested and found
+to work.
+
+2) OpenSSL (http://www.openssl.org) must be downloaded and built on
+the system on which you are building BIND.
+
+3) If you wish to use the statistics channel, LibXML2
+(ftp://xmlsoft.org/libxml2) must be downloaded and built on
+the system on which you are building BIND.
+
+4) Optional external packages (not used by default)
+
+If you wish to use IP geolocation, GeoIP API and database must be
+downloaded, patched and built on the system on which you are building
+BIND.
+
+If you wish to use readline, the readline library must be downloaded
+and built on the system on which you are building BIND.
+
+5) The BIND Installer (BINDInstall) includes a copy of the
+redistributable runtime object vcredist_x86.exe (or vcredist_x64.exe),
+which is included with Visual Studio and can be downloaded from
+Microsoft.  This file must be in place prior to running the build
+setup script.
+
+Step 1: Download and build OpenSSL
+
+  OpenSSL is required for DNSSEC. If you wish to build BIND 9 without
+  DNSSEC support, skip to step 2.
+
+  Download and untar the OpenSSL sources from http://www.openssl.org/.
+  Extract them at in the same directory in which you extracted the BIND 9
+  source:  If BIND 9 is in \build\bind-9.10.0, for instance, OpenSSL should
+  be in \build\openssl-1.0.1e (subject to version number changes).
+
+  Note: Building OpenSSL requires that you install Perl as it uses it
+  during its build process. The following commands work as of
+  openssl-1.0.1e, but you should check the OpenSSL distribution to see
+  if the build instructions in the INSTALL.W32 (or INSTALL.W64) file
+  have changed, in particular for the assembler options:
+
+    cd openssl-1.0.1e
+    perl Configure --prefix=c:/openssl enable-static-engine VC-WIN32
+    ms\do_ms
+    nmake /f ms\ntdll.mak
+
+  For 64 bit build, replace VC-WIN32 by VC-WIN64A.
+  The enable-static-engine is needed when an OpenSSL engine will be
+  used, so with GOST support (configured by default) and/or PKCS #11
+  support.
+
+  If you wish to use PKCS #11 to control a cryptographic hardware
+  service module, please see "PKCS #11 (Cryptoki) support" in chapter 4
+  of the BIND 9 Administrator Reference Guide.  You will need to apply
+  the patch in bind9\bin\pkcs11\openssl-1.0.1e-patch (this can be done
+  using the Cygwin 'patch' utility) and add --pk11-libname and
+  --pk11-flavor to the Configure command above.
+
+Step 2: Download and build LibXML2
+
+  LibXML2 is required to use the statistics channel. If you wish to
+  build BIND 9 without support for this feature, skip to step 3.
+
+  Download and untar the libxml2 sources from ftp://xmlsoft.org/libxml2.
+  Extract them in the same directory in which you extracted the BIND 9
+  source:  If BIND 9 is in \build\bind-9.10.0, for instance, libxml2 should
+  be in \build\libxml2-2.7.7 (subject to version number changes).
+
+  Now build libxml2, and copy the resulting files into the include and lib
+  directories:
+
+   cd libxml2-2.7.7\win32
+   cscript configure.js compiler=msvc vcmanifest=yes static=yes \
+        debug=no iconv=no
+   nmake /f Makefile.msvc libxml
+
+Step 3: Download and build optional external packages (GeoIP, readline)
+
+  3a) GeoIP is required to use IP geolocation. If you wish to build
+  BIND 9 without support for this feature, skip to step 3b. The URL is:
+  http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.5.1.tar.gz
+
+  The current (version 1.5.1) GeoIP does not build a suitable
+  DLL with safe threading. The GeoIP.diff file:
+   - fixes WIN32 building support
+   - makes pread() safe in a multi-threaded system
+   - changes the Makefile.vc to build a DLL in place of a static
+    library (BTW this is required by the previous point)
+
+  3b) The readline library adds command-line editing in nslookup and
+  nsupdate.  If you wish to build BIND 9 without support for this feature,
+  skip to step 4.
+
+  Because the original GNU source for the readline library has no WIN32
+  support, it will be necessary to download a version of the static
+  readline library source that is ready to be built by Visual Studio.
+  One such version is available at:
+  http://gpsim.sourceforge.net/gpsimWin32/packages/readline-5.2-20061112-src.zip
+
+Step 4: Make the redistributable runtime object available
+
+  Check that the Microsoft redistributable object (vcredist_x86.exe or
+  vcredist_x64.exe) is available to the build.  The file may be placed
+  in the directory in which the BIND 9 source was extracted (for
+  instance, if BIND 9 is in \build\bind-9.10.0, the redistributable
+  may be placed in \build\vcredist_x86.exe).  Or, the path to the file
+  can be specified via the VCREDIST_PATH environment variable, or via
+  the "with-vcredist=PATH" option to the configuration script (see
+  step 4).
+
+Step 5: Configuring the BIND build
+
+  From the command prompt, cd to the win32utils directory under
+  the BIND 9 root:
+
+    cd bind-9.10.0\win32utils
+
+  In this directory, you can prepare the Windows build by running:
+
+    perl Configure <options> win32
+
+  For 64 bit:
+
+    perl Configure <options> x64
+
+  This will set up all the files needed for building BIND 9 according
+  to the given options.  To see the available options, run:
+
+    perl Configure help
+
+  To remove all files generated by Configure, run:
+
+    perl Configure clean
+
+Step 5: Building BIND
+
+  To build using 'nmake' or older versions of Visual Studio (e.g.
+  VS 2005 and 2008), go to the legacy subdirectory:
+
+    cd legacy
+
+  and follow the instructions in win32-build.txt. Note that
+  only 32 bit builds are supported in this mode.
+
+  To build using the Visual Studio GUI (VS 2010 and 2012): open the bind9.sln
+  solution file; this will load the project files for all of the BIND 9
+  libraries and applications.  Select "Build->Batch Build", click "Select
+  All", then click "Build".
+
+  To build using MSBuild (VS 2010 and 2012): call MSBuild on the
+  bind9.sln solution file:
+
+    msbuild /t:Build /p:Configuration=Release && \
+    msbuild /t:Build /p:Configuration=Debug
+
+Step 6: Install
+
+  Installation is accomplished by running the BINDInstall program. All
+  DLL's are copied to the system32 area and all applications (including
+  BINDInstall which may be necessary for uninstalling BIND 9) to the
+  dns/bin directory.  If BIND 8 has previously been installed on the system
+  it must be uninstalled first by running it's own BINDInstall program.
+  The BIND 9 installer does not yet do this.
+
+  Note: BINDInstall.exe requires the MFC (Microsoft Foundation Class).
+  This is only distributed with non-free (i.e., not "Express") versions of
+  Visual Studio. The other BIND 9 libraries and applications do not have
+  this dependency.
+
+Please report bugs, whether in the process of building the application
+or in BIND 9 itself, to bind9-bugs@isc.org.
diff --git a/win32utils/dnsheadergen.bat b/win32utils/dnsheadergen.bat
deleted file mode 100644 (file)
index 09422fe..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-echo off
-rem
-rem Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-rem Copyright (C) 2001-2002  Internet Software Consortium.
-rem 
-rem Permission to use, copy, modify, and distribute this software for any
-rem purpose with or without fee is hereby granted, provided that the above
-rem copyright notice and this permission notice appear in all copies.
-rem 
-rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-rem PERFORMANCE OF THIS SOFTWARE.
-
-cd ..\lib\dns
-cd win32
-nmake /nologo /f gen.mak CFG="gen - Win32 Release"  NO_EXTERNAL_DEPS="1"
-cd ..
-gen -s . -t > include/dns/enumtype.h
-gen -s . -c > include/dns/enumclass.h
-gen -s . -i -P ./rdata/rdatastructpre.h -S ./rdata/rdatastructsuf.h > include/dns/rdatastruct.h
-gen -s . > code.h
-cd ..\..\win32utils
similarity index 52%
rename from win32utils/BINDBuild.dsw
rename to win32utils/legacy/BINDBuild.dsw.in
index 1bcfa7349096c4a4c9555b60c2892b15b3ad4e7a..7aa51e2a13a99bd49989be67daa28f1aee878bb4 100644 (file)
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 \r
 ###############################################################################\r
 \r
-Project: "BINDInstall"="..\bin\win32\BINDInstall\BINDInstall.dsp" - Package Owner=<4>\r
+Project: "BINDInstall"="..\..\bin\win32\BINDInstall\BINDInstall.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -15,7 +15,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "bindevt"="..\lib\win32\bindevt\bindevt.dsp" - Package Owner=<4>\r
+Project: "libisc"="..\..\lib\isc\win32\libisc.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -27,7 +27,209 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "dig"="..\bin\dig\win32\dig.dsp" - Package Owner=<4>\r
+Project: "libisccc"="..\..\lib\isccc\win32\libisccc.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "libdns"="..\..\lib\dns\win32\libdns.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "libisccfg"="..\..\lib\isccfg\win32\libisccfg.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisccc\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "libbind9"="..\..\lib\bind9\win32\libbind9.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisccfg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisccc\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "liblwres"="..\..\lib\lwres\win32\liblwres.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "bindevt"="..\..\lib\win32\bindevt\bindevt.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+@IF TESTS\r
+Project: "libtests"="..\..\lib\tests\win32\libtests.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+}}}\r
+\r
+@END TESTS\r
+###############################################################################\r
+\r
+Project: "named"="..\..\bin\named\win32\named.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisccc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisccfg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name liblwres\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libbind9\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "rndcutil"="..\..\bin\rndc\win32\rndcutil.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "rndc"="..\..\bin\rndc\win32\rndc.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisccc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisccfg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libbind9\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name rndcutil\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "dighost"="..\..\bin\dig\win32\dighost.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "dig"="..\..\bin\dig\win32\dig.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -60,7 +262,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "dighost"="..\bin\dig\win32\dighost.dsp" - Package Owner=<4>\r
+Project: "host"="..\..\bin\dig\win32\host.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -68,11 +270,32 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libbind9\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name liblwres\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisccfg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisccc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name dighost\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "host"="..\bin\dig\win32\host.dsp" - Package Owner=<4>\r
+Project: "nslookup"="..\..\bin\dig\win32\nslookup.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -105,7 +328,19 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "dsfromkey"="..\bin\dnssec\win32\dsfromkey.dsp" - Package Owner=<4>\r
+Project: "dnssectool"="..\..\bin\dnssec\win32\dnssectool.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "keygen"="..\..\bin\dnssec\win32\keygen.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -126,7 +361,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "revoke"="..\bin\dnssec\win32\revoke.dsp" - Package Owner=<4>\r
+Project: "signzone"="..\..\bin\dnssec\win32\signzone.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -147,7 +382,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "settime"="..\bin\dnssec\win32\settime.dsp" - Package Owner=<4>\r
+Project: "importkey"="..\..\bin\dnssec\win32\importkey.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -168,7 +403,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "keygen"="..\bin\dnssec\win32\keygen.dsp" - Package Owner=<4>\r
+Project: "keyfromlabel"="..\..\bin\dnssec\win32\keyfromlabel.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -189,7 +424,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "libbind9"="..\lib\bind9\win32\libbind9.dsp" - Package Owner=<4>\r
+Project: "dsfromkey"="..\..\bin\dnssec\win32\dsfromkey.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -204,16 +439,13 @@ Package=<4>
     Project_Dep_Name libisc\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccfg\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name libisccc\r
+    Project_Dep_Name dnssectool\r
     End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "libdns"="..\lib\dns\win32\libdns.dsp" - Package Owner=<4>\r
+Project: "revoke"="..\..\bin\dnssec\win32\revoke.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -221,14 +453,20 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libisc\r
     End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name dnssectool\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "libisc"="..\lib\isc\win32\libisc.dsp" - Package Owner=<4>\r
+Project: "settime"="..\..\bin\dnssec\win32\settime.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -236,11 +474,20 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name dnssectool\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "libisccc"="..\lib\isccc\win32\libisccc.dsp" - Package Owner=<4>\r
+Project: "arpaname"="..\..\bin\tools\win32\arpaname.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -255,7 +502,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "libisccfg"="..\lib\isccfg\win32\libisccfg.dsp" - Package Owner=<4>\r
+Project: "journalprint"="..\..\bin\tools\win32\journalprint.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -263,20 +510,50 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libisc\r
     End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "nsec3hash"="..\..\bin\tools\win32\nsec3hash.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
     Begin Project Dependency\r
     Project_Dep_Name libdns\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccc\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "genrandom"="..\..\bin\tools\win32\genrandom.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
     End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "liblwres"="..\lib\lwres\win32\liblwres.dsp" - Package Owner=<4>\r
+Project: "ischmacfixup"="..\..\bin\tools\win32\ischmacfixup.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -284,11 +561,14 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "named"="..\bin\named\win32\named.dsp" - Package Owner=<4>\r
+Project: "nsupdate"="..\..\bin\nsupdate\win32\nsupdate.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -303,22 +583,34 @@ Package=<4>
     Project_Dep_Name libisc\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccc\r
+    Project_Dep_Name libbind9\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccfg\r
+    Project_Dep_Name liblwres\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name liblwres\r
+    Project_Dep_Name libisccfg\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libbind9\r
+    Project_Dep_Name libisccc\r
     End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "namedcheckconf"="..\bin\check\win32\namedcheckconf.dsp" - Package Owner=<4>\r
+Project: "checktool"="..\..\bin\check\win32\checktool.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "checkconf"="..\..\bin\check\win32\checkconf.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -348,7 +640,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "namedcheckzone"="..\bin\check\win32\namedcheckzone.dsp" - Package Owner=<4>\r
+Project: "checkzone"="..\..\bin\check\win32\checkzone.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -375,7 +667,19 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "nslookup"="..\bin\dig\win32\nslookup.dsp" - Package Owner=<4>\r
+Project: "confgentool"="..\..\bin\confgen\win32\confgentool.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "rndcconfgen"="..\..\bin\confgen\win32\rndcconfgen.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -383,32 +687,29 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name libdns\r
-    End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libisc\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libbind9\r
+    Project_Dep_Name libisccc\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name liblwres\r
+    Project_Dep_Name libisccfg\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccfg\r
+    Project_Dep_Name libbind9\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccc\r
+    Project_Dep_Name libdns\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name dighost\r
+    Project_Dep_Name confgentool\r
     End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "nsupdate"="..\bin\nsupdate\win32\nsupdate.dsp" - Package Owner=<4>\r
+Project: "ddnsconfgen"="..\..\bin\confgen\win32\ddnsconfgen.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -417,28 +718,80 @@ Package=<5>
 Package=<4>\r
 {{{\r
     Begin Project Dependency\r
-    Project_Dep_Name libdns\r
+    Project_Dep_Name libisc\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisc\r
+    Project_Dep_Name libdns\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libbind9\r
+    Project_Dep_Name confgentool\r
     End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+@IF PKCS11\r
+\r
+Project: "pk11keygen"="..\..\bin\pkcs11\win32\pk11keygen.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "pk11list"="..\..\bin\pkcs11\win32\pk11list.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "pk11destroy"="..\..\bin\pkcs11\win32\pk11destroy.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+@END PKCS11\r
+###############################################################################\r
+@IF TESTS\r
+@IF ATOMIC\r
+Project: "t_atomic"="..\..\bin\tests\atomic\win32\t_atomic.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
     Begin Project Dependency\r
-    Project_Dep_Name liblwres\r
+    Project_Dep_Name libtests\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccfg\r
+    Project_Dep_Name libdns\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccc\r
+    Project_Dep_Name libisc\r
     End Project Dependency\r
 }}}\r
 \r
+@END ATOMIC\r
 ###############################################################################\r
 \r
-Project: "rndc"="..\bin\rndc\win32\rndc.dsp" - Package Owner=<4>\r
+Project: "t_db"="..\..\bin\tests\db\win32\t_db.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -447,28 +800,21 @@ Package=<5>
 Package=<4>\r
 {{{\r
     Begin Project Dependency\r
-    Project_Dep_Name libisc\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name libisccc\r
+    Project_Dep_Name libtests\r
     End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libisccfg\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libbind9\r
-    End Project Dependency\r
-    Begin Project Dependency\r
     Project_Dep_Name libdns\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name rndcutil\r
+    Project_Dep_Name libisc\r
     End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
-\r
-Project: "rndcconfgen"="..\bin\confgen\win32\rndcconfgen.dsp" - Package Owner=<4>\r
+Project: "t_dst"="..\..\bin\tests\dst\win32\t_dst.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -477,28 +823,38 @@ Package=<5>
 Package=<4>\r
 {{{\r
     Begin Project Dependency\r
-    Project_Dep_Name libisc\r
+    Project_Dep_Name libtests\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccc\r
+    Project_Dep_Name libdns\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisccfg\r
+    Project_Dep_Name libisc\r
     End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+Project: "t_master"="..\..\bin\tests\master\win32\t_master.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
     Begin Project Dependency\r
-    Project_Dep_Name libbind9\r
+    Project_Dep_Name libtests\r
     End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libdns\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name confgentool\r
+    Project_Dep_Name libisc\r
     End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
-\r
-Project: "ddnsconfgen"="..\bin\confgen\win32\ddnsconfgen.dsp" - Package Owner=<4>\r
+Project: "t_mem"="..\..\bin\tests\mem\win32\t_mem.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -507,19 +863,15 @@ Package=<5>
 Package=<4>\r
 {{{\r
     Begin Project Dependency\r
-    Project_Dep_Name libisc\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name libdns\r
+    Project_Dep_Name libtests\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name confgentool\r
+    Project_Dep_Name libisc\r
     End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
-\r
-Project: "signzone"="..\bin\dnssec\win32\signzone.dsp" - Package Owner=<4>\r
+Project: "t_hashes"="..\..\bin\tests\hashes\win32\t_hashes.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -528,19 +880,15 @@ Package=<5>
 Package=<4>\r
 {{{\r
     Begin Project Dependency\r
-    Project_Dep_Name libdns\r
+    Project_Dep_Name libtests\r
     End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libisc\r
     End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name dnssectool\r
-    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
-\r
-Project: "keyfromlabel"="..\bin\dnssec\win32\keyfromlabel.dsp" - Package Owner=<4>\r
+Project: "t_names"="..\..\bin\tests\names\win32\t_names.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -549,19 +897,18 @@ Package=<5>
 Package=<4>\r
 {{{\r
     Begin Project Dependency\r
-    Project_Dep_Name libdns\r
+    Project_Dep_Name libtests\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name libisc\r
+    Project_Dep_Name libdns\r
     End Project Dependency\r
     Begin Project Dependency\r
-    Project_Dep_Name dnssectool\r
+    Project_Dep_Name libisc\r
     End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
-\r
-Project: "dnssectool"="..\bin\dnssec\win32\dnssectool.dsp" - Package Owner=<4>\r
+Project: "t_rbt"="..\..\bin\tests\rbt\win32\t_rbt.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -569,11 +916,19 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libtests\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
-\r
-Project: "rndcutil"="..\bin\rndc\win32\rndcutil.dsp" - Package Owner=<4>\r
+Project: "t_resolver"="..\..\bin\tests\resolver\win32\t_resolver.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -581,11 +936,19 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libtests\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
-\r
-Project: "confgentool"="..\bin\confgen\win32\confgentool.dsp" - Package Owner=<4>\r
+Project: "t_sockaddr"="..\..\bin\tests\sockaddr\win32\t_sockaddr.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -593,11 +956,16 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libtests\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
-\r
-Project: "checktool"="..\bin\check\win32\checktool.dsp" - Package Owner=<4>\r
+Project: "t_tasks"="..\..\bin\tests\tasks\win32\t_tasks.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -605,11 +973,16 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libtests\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
-\r
-Project: "pk11keygen"="..\bin\pkcs11\win32\pk11keygen.dsp" - Package Owner=<4>\r
+Project: "t_timers"="..\..\bin\tests\timers\win32\t_timers.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -617,11 +990,19 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libtests\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
 }}}\r
 \r
+@END TESTS\r
 ###############################################################################\r
+@IF XTESTS\r
 \r
-Project: "pk11list"="..\bin\pkcs11\win32\pk11list.dsp" - Package Owner=<4>\r
+Project: "backtrace_test"="..\..\bin\tests\win32\backtrace_test.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -629,11 +1010,14 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "pk11destroy"="..\bin\pkcs11\win32\pk11destroy.dsp" - Package Owner=<4>\r
+Project: "inter_test"="..\..\bin\tests\win32\inter_test.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -641,11 +1025,14 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
 \r
-Project: "arpaname"="..\bin\tools\win32\arpaname.dsp" - Package Owner=<4>\r
+Project: "rwlock_test"="..\..\bin\tests\win32\rwlock_test.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -660,7 +1047,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "genrandom"="..\bin\tools\win32\genrandom.dsp" - Package Owner=<4>\r
+Project: "shutdown_test"="..\..\bin\tests\win32\shutdown_test.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -675,7 +1062,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "journalprint"="..\bin\tools\win32\journalprint.dsp" - Package Owner=<4>\r
+Project: "sock_test"="..\..\bin\tests\win32\sock_test.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -683,9 +1070,6 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name libdns\r
-    End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libisc\r
     End Project Dependency\r
@@ -693,7 +1077,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "nsec3hash"="..\bin\tools\win32\nsec3hash.dsp" - Package Owner=<4>\r
+Project: "task_test"="..\..\bin\tests\win32\task_test.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -701,9 +1085,6 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name libdns\r
-    End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libisc\r
     End Project Dependency\r
@@ -711,7 +1092,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "ischmacfixup"="..\bin\tools\win32\ischmacfixup.dsp" - Package Owner=<4>\r
+Project: "timer_test"="..\..\bin\tests\win32\timer_test.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -724,6 +1105,7 @@ Package=<4>
     End Project Dependency\r
 }}}\r
 \r
+@END XTESTS\r
 ###############################################################################\r
 \r
 Global:\r
diff --git a/win32utils/legacy/BuildAll.bat.in b/win32utils/legacy/BuildAll.bat.in
new file mode 100644 (file)
index 0000000..b5aa505
--- /dev/null
@@ -0,0 +1,220 @@
+echo off
+rem
+rem Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+rem Copyright (C) 2001-2002  Internet Software Consortium.
+rem
+rem Permission to use, copy, modify, and distribute this software for any
+rem purpose with or without fee is hereby granted, provided that the above
+rem copyright notice and this permission notice appear in all copies.
+rem 
+rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+rem PERFORMANCE OF THIS SOFTWARE.
+
+rem BuildAll.bat
+rem This script sets up the files necessary ready to build BIND 9
+rem and then builds all of the binaries that make up the installation kit.
+rem This requires perl to be installed on the system.
+
+rem IMPORTANT NOTE:
+rem OpenSSL is a prerequisite for building and running this release of
+rem BIND 9. You must fetch the OpenSSL sources yourself from
+rem http://www.OpenSSL.org/ and compile it yourself.  The code must reside
+rem at the same level as the bind 9.2.0 source tree and it's top-level
+rem directory be named openssl-0.9.6k. This restriction will be lifted in
+rem a future release of BIND 9 for Windows NT/2000/XP.
+
+echo Setting up the BIND files required for the build
+
+rem Setup the files
+call BuildSetup.bat
+
+echo Build all of the Library files
+
+cd ..\..\lib
+
+cd isc\win32
+nmake /nologo -f libisc.mak CFG="libisc - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd dns\win32
+nmake /nologo -f libdns.mak CFG="libdns - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd isccfg\win32
+nmake /nologo -f libisccfg.mak CFG="libisccfg - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd isccc\win32
+nmake /nologo -f libisccc.mak CFG="libisccc - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd bind9\win32
+nmake /nologo -f libbind9.mak CFG="libbind9 - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd lwres\win32
+nmake /nologo -f liblwres.mak CFG="liblwres - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+@IF TESTS
+cd tests\win32
+nmake /nologo -f libtests.mak CFG="libtests - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+@END TESTS
+
+rem This is the DLL required for the event Viewer
+
+cd win32\bindevt
+nmake /nologo -f bindevt.mak CFG="bindevt - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd ..
+
+echo Now build the apps
+
+cd bin
+
+cd named\win32
+nmake /nologo -f named.mak CFG="named - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+
+cd ..\..
+
+cd rndc\win32
+nmake /nologo -f rndc.mak CFG="rndc - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+
+cd ..\..
+
+cd confgen\win32
+nmake /nologo -f rndcconfgen.mak CFG="rndcconfgen - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f ddnsconfgen.mak CFG="ddnsconfgen - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+
+cd ..\..
+
+cd dig\win32
+nmake /nologo -f dig.mak CFG="dig - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo /nologo -f host.mak CFG="host - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f nslookup.mak CFG="nslookup - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd nsupdate\win32
+nmake /nologo -f nsupdate.mak CFG="nsupdate - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd check\win32
+nmake /nologo -f checkconf.mak CFG="checkconf - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f checkzone.mak CFG="checkzone - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd dnssec\win32
+nmake /nologo -f keygen.mak CFG="keygen - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f signzone.mak CFG="signzone - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f dsfromkey.mak CFG="dsfromkey - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f keyfromlabel.mak CFG="keyfromlabel - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f revoke.mak CFG="revoke - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f settime.mak CFG="settime - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f importkey.mak CFG="importkey - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+@IF PKCS11
+cd pkcs11\win32
+nmake /nologo -f pk11keygen.mak CFG="pk11keygen - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f pk11list.mak CFG="pk11list - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f pk11destroy.mak CFG="pk11destroy - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+@END PKCS11
+
+cd tools\win32
+nmake /nologo -f arpaname.mak CFG="arpaname - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f genrandom.mak CFG="genrandom - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f nsec3hash.mak CFG="nsec3hash - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f journalprint.mak CFG="journalprint - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f ischmacfixup.mak CFG="ischmacfixup - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+@IF TESTS
+cd tests
+@IF ATOMIC
+cd atomic\win32
+nmake /nologo -f t_atomic.mak CFG="t_atomic - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+@END ATOMIC
+
+cd db\win32
+nmake /nologo -f t_db.mak CFG="t_db - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd dst\win32
+nmake /nologo -f t_dst.mak CFG="t_dst - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd master\win32
+nmake /nologo -f t_master.mak CFG="t_master - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd mem\win32
+nmake /nologo -f t_mem.mak CFG="t_mem - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd hashes\win32
+nmake /nologo -f t_hashes.mak CFG="t_hashes - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd names\win32
+nmake /nologo -f t_names.mak CFG="t_names - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd rbt\win32
+nmake /nologo -f t_rbt.mak CFG="t_rbt - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd resolver\win32
+nmake /nologo -f t_resolver.mak CFG="t_resolver - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd sockaddr\win32
+nmake /nologo -f t_sockaddr.mak CFG="t_sockaddr - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd tasks\win32
+nmake /nologo -f t_tasks.mak CFG="t_tasks - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd timers\win32
+nmake /nologo -f t_timers.mak CFG="t_timers - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd ..
+@END TESTS
+
+@IF XTESTS
+cd tests\win32
+nmake /nologo -f backtrace_test.mak CFG="backtrace_test - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f inter_test.mak CFG="inter_test - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f rwlock_test.mak CFG="rwlock_test - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f shutdown_test.mak CFG="shutdown_test - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f sock_test.mak CFG="sock_test - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f task_test.mak CFG="task_test - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f timer_test.mak CFG="timer_test - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+@END XTESTS
+
+rem This is the BIND 9 Installer
+
+cd win32\BINDInstall
+nmake /nologo -f BINDInstall.mak CFG="BINDInstall - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..\..
+
+cd ..
+
+cd win32utils\legacy
+
+call BuildPost.bat
+
+echo Done.
+
+rem exit here.
similarity index 57%
rename from win32utils/BuildPost.bat
rename to win32utils/legacy/BuildPost.bat.in
index 06d6d9853909f0cf6209ba2ba54d0b77f94545fd..f0ed62cd05c9e0f14c9e2cb29fbe29ed57f633bb 100644 (file)
@@ -19,9 +19,18 @@ rem This script does the final stages if BINDBuild.dsw is used.
 
 echo Copying named-checkzone.exe to named-compilezone.exe
 
-copy /Y ..\Build\Release\named-checkzone.exe ..\Build\Release\named-compilezone.exe
-if exist ..\Build\Debug\named-checkzone.exe copy /Y ..\Build\Debug\named-checkzone.exe ..\Build\Debug\named-compilezone.exe
-if exist ..\Build\Debug\named-checkzone.ilk copy /Y ..\Build\Debug\named-checkzone.ilk ..\Build\Debug\named-compilezone.ilk
+copy /Y ..\..\Build\Release\named-checkzone.exe ..\..\Build\Release\named-compilezone.exe
+if exist ..\..\Build\Debug\named-checkzone.exe copy /Y ..\..\Build\Debug\named-checkzone.exe ..\..\Build\Debug\named-compilezone.exe
+if exist ..\..\Build\Debug\named-checkzone.ilk copy /Y ..\..\Build\Debug\named-checkzone.ilk ..\..\Build\Debug\named-compilezone.ilk
+
+@IF PYTHON
+echo Copying python scripts
+
+copy /Y ..\..\bin\python\dnssec-checkds.py ..\..\Build\Release\dnssec-checkds.py
+copy /Y ..\..\bin\python\dnssec-checkds.py ..\..\Build\Debug\dnssec-checkds.py
+copy /Y ..\..\bin\python\dnssec-coverage.py ..\..\Build\Release\dnssec-coverage.py
+copy /Y ..\..\bin\python\dnssec-coverage.py ..\..\Build\Debug\dnssec-coverage.py
+@END PYTHON
 
 echo Done.
 
diff --git a/win32utils/legacy/BuildSetup.bat.in b/win32utils/legacy/BuildSetup.bat.in
new file mode 100644 (file)
index 0000000..5da4d37
--- /dev/null
@@ -0,0 +1,159 @@
+echo off
+rem
+rem Copyright (C) 2004,2005  Internet Systems Consortium, Inc. ("ISC")
+rem Copyright (C) 2001-2002  Internet Software Consortium.
+rem 
+rem Permission to use, copy, modify, and distribute this software for any
+rem purpose with or without fee is hereby granted, provided that the above
+rem copyright notice and this permission notice appear in all copies.
+rem 
+rem THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+rem REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+rem AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+rem INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+rem LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+rem OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+rem PERFORMANCE OF THIS SOFTWARE.
+
+rem BuildSetup.bat
+rem This script sets up the files necessary ready to build BIND 9.
+rem This requires perl to be installed on the system.
+
+echo Generate header files for lib/dns
+
+cd ..\..\lib\dns
+cd win32
+nmake /nologo /f gen.mak CFG="gen - @PLATFORM@ Release"  NO_EXTERNAL_DEPS="1"
+cd ..
+gen -s . -t > include/dns/enumtype.h
+gen -s . -c > include/dns/enumclass.h
+gen -s . -i -P ./rdata/rdatastructpre.h -S ./rdata/rdatastructsuf.h > include/dns/rdatastruct.h
+gen -s . > code.h
+cd ..\..\win32utils\legacy
+
+rem Make sure that the Build directories are there.
+
+if NOT Exist ..\..\Build mkdir ..\..\Build
+if NOT Exist ..\..\Build\Release mkdir ..\..\Build\Release
+if NOT Exist ..\..\Build\Debug mkdir ..\..\Build\Debug
+
+echo Copying the ARM and the Installation Notes.
+
+copy ..\..\COPYRIGHT ..\..\Build\Release
+copy ..\..\README ..\..\Build\Release
+copy ..\..\HISTORY ..\..\Build\Release
+copy ..\readme1st.txt ..\..\Build\Release
+copy ..\index.html ..\..\Build\Release
+copy ..\..\doc\arm\*.html ..\..\Build\Release
+copy ..\..\doc\arm\Bv9ARM.pdf ..\..\Build\Release
+copy ..\..\CHANGES ..\..\Build\Release
+if Exist ..\CHANGES.SE copy ..\CHANGES.SE ..\Build\Release
+copy ..\..\FAQ ..\..\Build\Release
+
+echo Copying the standalone manual pages.
+
+copy ..\..\bin\named\named.html ..\..\Build\Release
+copy ..\..\bin\rndc\*.html ..\..\Build\Release
+copy ..\..\bin\confgen\*.html ..\..\Build\Release
+copy ..\..\bin\dig\*.html ..\..\Build\Release
+copy ..\..\bin\nsupdate\*.html ..\..\Build\Release
+copy ..\..\bin\check\*.html ..\..\Build\Release
+copy ..\..\bin\dnssec\dnssec-keygen.html ..\..\Build\Release
+copy ..\..\bin\dnssec\dnssec-signzone.html ..\..\Build\Release
+copy ..\..\bin\dnssec\dnssec-dsfromkey.html ..\..\Build\Release
+copy ..\..\bin\dnssec\dnssec-keyfromlabel.html ..\..\Build\Release
+copy ..\..\bin\dnssec\dnssec-settime.html ..\..\Build\Release
+copy ..\..\bin\dnssec\dnssec-revoke.html ..\..\Build\Release
+copy ..\..\bin\dnssec\dnssec-verify.html ..\..\Build\Release
+copy ..\..\bin\dnssec\dnssec-importkey.html ..\..\Build\Release
+copy ..\..\bin\pkcs11\pkcs11-keygen.html ..\..\Build\Release
+copy ..\..\bin\pkcs11\pkcs11-list.html ..\..\Build\Release
+copy ..\..\bin\pkcs11\pkcs11-destroy.html ..\..\Build\Release
+
+echo Copying the migration notes.
+
+copy ..\..\doc\misc\migration ..\..\Build\Release
+copy ..\..\doc\misc\migration-4to9 ..\..\Build\Release
+
+@IF OPENSSL
+echo Copying the OpenSSL DLL and LICENSE.
+
+copy @OPENSSL_DLL@ ..\..\Build\Release\
+copy @OPENSSL_DLL@ ..\..\Build\Debug\
+copy @OPENSSL_PATH@\LICENSE ..\..\Build\Release\OpenSSL-LICENSE
+@END OPENSSL
+
+@IF LIBXML2
+echo Copying the libxml DLL.
+
+copy @LIBXML2_DLL@ ..\..\Build\Release\
+copy @LIBXML2_DLL@ ..\..\Build\Debug\
+@END LIBXML2
+
+@IF GSSAPI
+echo Copying the GSSAPI and KRB5 DLLs.
+
+copy @GSSAPI_DLL@ ..\..\Build\Release\
+copy @GSSAPI_DLL@ ..\..\Build\Debug\
+copy @KRB5_DLL@ ..\..\Build\Release\
+copy @KRB5_DLL@ ..\..\Build\Debug\
+copy @COMERR_DLL@ ..\..\Build\Release\
+copy @COMERR_DLL@ ..\..\Build\Debug\
+copy @K5SPRT_DLL@ ..\..\Build\Release\
+copy @K5SPRT_DLL@ ..\..\Build\Debug\
+copy @WSHELP_DLL@ ..\..\Build\Release\
+copy @WSHELP_DLL@ ..\..\Build\Debug\
+@END GSSAPI
+
+@IF GEOIP
+echo Copying the GeoIP DLL.
+
+copy @GEOIP_DLL@ ..\..\Build\Release\
+copy @GEOIP_DLL@ ..\..\Build\Debug\
+@END GEOIP
+
+@IF IDNKIT
+echo Copying the IDN kit DLL.
+
+copy @IDN_DLL@ ..\Build\Release\
+copy @IDN_DLL@ ..\Build\Debug\
+copy @ICONV_DLL@ ..\Build\Release\
+copy @ICONV_DLL@ ..\Build\Debug\
+@END IDNKIT
+
+echo Copying the redistributable runtime object.
+
+rem
+rem Use /Y so we always have the current version of the installer.
+rem
+
+copy /Y @VCREDIST_PATH@ ..\..\Build\Release\
+copy /Y @VCREDIST_PATH@ ..\..\Build\Debug\
+
+@IF TESTS
+cd ..\..\bin\tests\dst
+copy "Kdh.+002+18602.key.in" "Kdh.+002+18602.key"
+copy "Kdh.+002+18602.private.in" "Kdh.+002+18602.private"
+copy "Kdh.+002+48957.key.in" "Kdh.+002+48957.key"
+copy "Kdh.+002+48957.private.in" "Kdh.+002+48957.private"
+copy "Ktest.+001+00002.key.in" "Ktest.+001+00002.key"
+copy "Ktest.+001+54622.key.in" "Ktest.+001+54622.key"
+copy "Ktest.+001+54622.private.in" "Ktest.+001+54622.private"
+copy "Ktest.+003+23616.key.in" "Ktest.+003+23616.key"
+copy "Ktest.+003+23616.private.in" "Ktest.+003+23616.private"
+copy "Ktest.+003+49667.key.in" "Ktest.+003+49667.key"
+copy dst_2_data.in dst_2_data
+copy t2_data_1.in t2_data_1
+copy t2_data_2.in t2_data_2
+copy t2_dsasig.in t2_dsasig
+copy t2_rsasig.in t2_rsasig
+cd ..\..\..\win32utils\legacy
+@END TESTS
+
+echo Running Message Compiler
+
+cd ..\..\lib\win32\bindevt
+mc bindevt.mc
+cd ..\..\..\win32utils\legacy
+
+rem Done
diff --git a/win32utils/legacy/win32-build.txt b/win32utils/legacy/win32-build.txt
new file mode 100644 (file)
index 0000000..0a01934
--- /dev/null
@@ -0,0 +1,105 @@
+Copyright (C) 2004, 2005, 2008, 2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2001, 2002  Internet Software Consortium.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
+$Id$
+
+       *legacy* BIND 9.10 for Win32 Source Build Instructions.  24-June-2013
+
+Building BIND 9.10 on Windows XP/Vista/7/8 or server 2003/2008/2008R2
+has the following prerequisites:
+
+1) Perl, 2) Visual C++ redistributable object, 3) OpenSSL, and optionally
+4) LibXML2 and 5) GeoIP.  See ..\build.txt for more details on these
+prerequisites.
+
+If you want to build using Visual C++ 6.0, you'll need some extra
+files that are to be found in the Platform SDK (which you will need
+to install), namely:
+
+iphlpapi.h
+iptypes.h
+ipexport.h
+iphlpapi.lib
+
+You'll also need an updated Iprtrmib.h - using the VC++6.0 one will
+get you some compilation errors. You can just overwrite the old one if
+you're not using it for any purposes, and maybe keep a backup of it. 
+
+You can copy the header files under VC98\INCLUDE and the library file
+under VC98\LIB. I think you can also put them in a separate directory
+and add it to the include search list, but I don't know if that can be
+made persistent. 
+
+For building on VC++ 7.0 or more recent, no extra files are required. 
+
+The instructions assume a Visual C++ 6.0 compiler with Visual Studio
+and Visual Studio Service Pack 3 or later. It may build and work with
+earlier versions but it has not been tested. The binaries may be built
+and run on any of the following platforms: NT 4.0 Workstation (SP3 or
+later), NT 4.0 Server (SP3 or later), Windows 2000 Professional (SP1
+or later), Windows 2000 Server or any kind (SP1 or later), Windows XP,
+Windows 2003 Server, Windows Vista, Windows 2008 Server, Windows 7,
+Windows 2008 R2 Server, Windows 8, Windows 2012 Server (untested), and
+further (untested as not yet available). It will NOT build or run on
+Windows 95, Windows 98, etc., or Windows RT platforms.
+
+Step 5: Building BIND
+
+From the command prompt cd to the win32utils\legacy directory under
+the BIND9 root:
+
+  cd bind-9.10.0\win32utils\legacy
+
+If you wish to use nmake from VC++ 6.0 or more recent, run
+the BuildAll.bat file:
+
+  BuildAll
+
+This will do the following:
+1) Build the gen application in the lib/dns directory.
+2) Run the gen application and build the required lib/dns header
+   files.
+3) Create the Build/Release subdirectory under the root of the BIND
+   source tree which will hold the binaries being built.
+4) Build the libraries, named, application tools like dig, rndc
+   dnssec tools, installer, checkconf and checkzones programs,
+   BIND 9 Installer.
+5) Copies the release notes and the OpenSSL DLL to the BUILD/Release
+   directory.
+6) Copies the BIND 9 ARM HTML files and the application HTML files
+   to the Build\Release area.
+
+If you wish to use the Visual Studio GUI for building, you can just
+run the BuildSetup.bat file:
+
+  BuildSetup
+  
+This will create or find and copy into place several files which are
+necessary for the build to proceed.  It also locates and copies into place
+the DLLs for OpenSSL and libxml2.
+
+Use BINDBuild.dsw (also located in the win32utils\legacy directory) to
+open the workspace for all of the BIND9 libraries and applications. If
+needed Visual Studio will update the workspace (aka solution) and
+project files. Note it is known to give slightly incorrect files on VS
+2010 or more recent, for instance BINDInstall is not compiled to use
+DLLs.  Finally select "Build->Batch Build", click "Select All", then
+click "Build".
+
+After the build has completed, run the BuildPost.bat file:
+
+  BuildPost
+
+...which does post-build processing.
+
+Installation is accomplished by running the BINDInstall program. All DLL's
+are copied to the system32 area and all applications (including BINDInstall
+which may be necessary for uninstalling BIND 9) to the dns/bin directory.
+If BIND 8 has previously been installed on the system it must be uninstalled
+first by running it's own BINDInstall program.  The BIND 9 installer does
+not yet do this.
+
+All bugs found, whether in the process of building the application or
+running BIND or the tools should be reported to the bind9 bugs email
+account at bind9-bugs@isc.org.
diff --git a/win32utils/makesrcid.pl b/win32utils/makesrcid.pl
deleted file mode 100644 (file)
index f46fe47..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id$ 
-
-# This script converts the SRCID information in ../srcid into a srcid.h
-# file, defining SRCID, which can be included by config.h.
-
-open (SRCIDH, ">../srcid.h") or die "cannot open srcid.h: $!";
-
-my $srcid = "unset";
-
-if (open (SRCIDFILE, "../srcid")) {
-    LOOP: while (<SRCIDFILE>) {
-       chomp;
-       ($data) = split(/\#/);
-       if($data) {
-               ($name, $value) = split(/=/,$data);
-               ($name) = split(/\s+/, $name);
-               ($value) = split(/\s+/, $value);
-                next LOOP if ($name != "SRCID");
-               $srcid = $value;
-       }
-    }
-    close(SRCIDFILE);
-}
-
-# Now set up the output version file
-
-$ThisDate = scalar localtime();
-
-#Standard Header
-
-print SRCIDH '/*
- * Copyright (C) 2012  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-';
-
-print SRCIDH "/*\n";
-print SRCIDH " * srcid.h";
-print SRCIDH " * Generated automatically by makesrcid.pl.\n";
-print SRCIDH " * Date generated: $ThisDate\n";
-print SRCIDH " */\n\n";
-
-print SRCIDH '
-#ifndef  SRCID_H
-#define SRCID_H 1
-';
-
-print "BIND SRCID: $srcid\n";
-
-print SRCIDH "#define SRCID\t\"$srcid\"\n";
-print SRCIDH "#endif /* SRCID_H */\n";
-close SRCIDH;
diff --git a/win32utils/makeversion.pl b/win32utils/makeversion.pl
deleted file mode 100644 (file)
index 17ffb8c..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (C) 2004, 2007, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2001  Internet Software Consortium.
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id$ 
-
-# This script takes the version information from the version file located
-# at the root of the source tree and the api files in each library directory
-# and writes the resulting information into a version.h file that the build
-# process uses to build the executable code.
-# This program was written by PDM. danny.mayer@nominum.com 1-Jul-2001.
-
-# List of directories with version files
-@dirlist = ("isc","dns","isccc","isccfg","lwres","bind9");
-$LibMacros{"isc"} = "LIBISC_EXPORTS";
-$LibMacros{"dns"} = "LIBDNS_EXPORTS";
-$LibMacros{"isccc"} = "LIBISCCC_EXPORTS";
-$LibMacros{"isccfg"} = "LIBISCCFG_EXPORTS";
-$LibMacros{"lwres"} = "LIBLWRES_EXPORTS";
-$LibMacros{"bind9"} = "LIBBIND9_EXPORTS";
-
-
-@VersionNames = ("LIBINTERFACE", "LIBREVISION", "LIBAGE");
-$versionfile = "versions.h";
-$versionpath = "../$versionfile";
-
-#
-# First get the version information
-#
-open (VERSIONFILE, "../version");
-while (<VERSIONFILE>) {
-       chomp;
-       ($data) = split(/\#/);
-       if($data) {
-               ($name, $value) = split(/=/,$data);
-               ($name) = split(/\s+/, $name);
-                if ($name eq 'PRODUCT' || $name eq 'DESCRIPTION') {
-                        ($value) =~ s/^["\s]+//;
-                        ($value) =~ s/["\s]+$//;
-                } else {
-                        ($value) = split(/\s+/, $value);
-                }
-               $Versions{$name} = $value;
-       }
-}
-close(VERSIONFILE);
-
-# Now set up the output version file
-
-$ThisDate = scalar localtime();
-open (OUTVERSIONFILE, ">$versionpath") ||
-      die "Can't open output file $versionpath: $!";
-
-#Standard Header
-
-print OUTVERSIONFILE '/*
- * Copyright (C) 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-';
-
-print OUTVERSIONFILE "/*\n";
-print OUTVERSIONFILE " * $versionfile.";
-print OUTVERSIONFILE "  Generated automatically by makeversion.pl.\n";
-print OUTVERSIONFILE " * Date generated: $ThisDate\n";
-print OUTVERSIONFILE " */\n\n";
-
-print OUTVERSIONFILE '
-#ifndef  VERSIONS_H
-#define VERSIONS_H 1
-
-';
-
-if ($Versions{'PATCHVER'} != "") {
-$Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}.$Versions{'PATCHVER'}";
-} else {
-       $Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}";
-}
-$Version = "$Version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}";
-print "BIND Version: $Version\n";
-
-print OUTVERSIONFILE "#define VERSION \"$Version\"\n";
-print OUTVERSIONFILE "#define PRODUCT \"$Versions{'PRODUCT'}\"\n\n";
-print OUTVERSIONFILE "#define DESCRIPTION \"$Versions{'DESCRIPTION'}\"\n\n";
-
-foreach $dir (@dirlist) {
-       $apifile = "../lib/$dir/api";
-       open (APIVERSION, $apifile);
-       while (<APIVERSION>) {
-               chomp;
-               ($data) = split(/\#/);
-               if ($data) {
-                       ($name, $value) = split(/=/, $data);
-                       $name =~ s/\s+//;
-                       $value =~ s/\s+//;
-                        $ApiVersions{$name} = $value;
-               }
-       }
-
-       print OUTVERSIONFILE "\n#ifdef $LibMacros{$dir}\n";
-       foreach $name (@VersionNames) {
-               print OUTVERSIONFILE "#define $name\t$ApiVersions{$name}\n";
-       }
-       print OUTVERSIONFILE "#endif\n\n";
-}
-
-print OUTVERSIONFILE "#endif /* VERSIONS_H */\n";
-close OUTVERSIONFILE;
-
-
diff --git a/win32utils/setpk11provider.pl b/win32utils/setpk11provider.pl
deleted file mode 100644 (file)
index a11f7ef..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (C) 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id$
-
-# setpk11provider.pl
-# This script sets the PKCS#11 provider name in the build scripts.
-#
-# for instance: setpk11provider.pl bp201w32HSM
-#
-
-if ($#ARGV != 0) {
-       die "Usage: perl setpk11provider.pl <pkcs11_provider_dll_name>\n"
-}
-
-my $provider=$ARGV[0];
-
-$provider =~ s|\.[dD][lL][lL]$||;
-
-# List of files that need to be updated
-@filelist = ("../bin/pkcs11/win32//pk11keygen.mak",
-             "../bin/pkcs11/win32//pk11keygen.dsp",
-            "../bin/pkcs11/win32//pk11list.mak",
-             "../bin/pkcs11/win32//pk11list.dsp",
-            "../bin/pkcs11/win32//pk11destroy.mak",
-             "../bin/pkcs11/win32//pk11destroy.dsp");
-
-# function to replace the provider define
-sub updatefile {
-        my($filename, $substr, $line);
-        my(@Lines);
-
-        $filename = $_[0];
-        $substr   = $_[1];
-
-        open (RFILE, $filename) || die "Can't open file $filename: $!";
-        @Lines = <RFILE>;
-        close (RFILE);
-
-        # Replace the string
-        foreach $line (@Lines) {
-                $line =~ s/unknown_provider/$substr/gi;
-        }
-        #update the file
-        open (RFILE, ">$filename") || die "Can't open file $filename: $!";
-        foreach $line (@Lines) {
-               print RFILE $line;
-        }
-        close(RFILE);
-}
-
-# update config.h to define or undefine USE_PKCS11
-sub updateconfig {
-   my($havexml, $substr, $line);
-   my(@Lines);
-
-   $havexml = $_[0];
-
-   open (RFILE, "../config.h") || die "Can't open config.h";
-   @Lines = <RFILE>;
-   close (RFILE);
-
-   foreach $line (@Lines) {
-      if ($havexml) {
-         $line =~ s/^.*#undef USE_PKCS11.*$/define USE_PKCS11 1/;
-      } else {
-         $line =~ s/^#define USE_PKCS11 .*$/\/\* #undef USE_PKCS11 \*\//;
-      }
-   }
-
-   open (RFILE, ">../config.h") || die "Can't open config.h";
-   print "Updating file ../config.h\n";
-   foreach $line (@Lines) {
-      print RFILE $line;
-   }
-   close(RFILE);
-}
-
-#Update the list of files
-if ($provider ne 0) {
-   $ind = 0;
-   print "Provider is $provider\n";
-   foreach $file (@filelist) {
-        print "Updating file $file\n";
-       updatefile($file, $provider);
-       $ind++;
-   }
-   updateconfig(1);
-} else {
-   updateconfig(0);
-}
-
diff --git a/win32utils/updatelibxml2.pl b/win32utils/updatelibxml2.pl
deleted file mode 100644 (file)
index 9cdcf20..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (C) 2009, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id$
-
-# updatelibxml2.pl
-# This script locates the latest version of libxml2 in the grandparent
-# directory and updates the build scripts to use that version.
-# Copied from updateopenssl.pl.
-#
-# Path and directory
-$path = "..\\..\\";
-
-# List of files that need to be updated with the actual version of the
-# libxml2 directory
-@filelist = ("SetupLibs.bat",
-             "../lib/dns/win32/libdns.mak",
-             "../lib/dns/win32/libdns.dsp",
-             "../bin/check/win32/checktool.dsp",
-             "../bin/check/win32/namedcheckconf.dsp",
-             "../bin/check/win32/namedcheckconf.mak",
-             "../bin/check/win32/namedcheckzone.dsp",
-             "../bin/check/win32/namedcheckzone.mak",
-             "../bin/confgen/win32/confgentool.dsp",
-             "../bin/confgen/win32/ddnsconfgen.dsp",
-             "../bin/confgen/win32/ddnsconfgen.mak",
-             "../bin/confgen/win32/rndcconfgen.dsp",
-             "../bin/confgen/win32/rndcconfgen.mak",
-             "../bin/dig/win32/dig.dsp",
-             "../bin/dig/win32/dig.mak",
-             "../bin/dig/win32/dighost.dsp",
-             "../bin/dig/win32/host.dsp",
-             "../bin/dig/win32/host.mak",
-             "../bin/dig/win32/nslookup.dsp",
-             "../bin/dig/win32/nslookup.mak",
-             "../bin/dnssec/win32/dnssectool.dsp",
-             "../bin/dnssec/win32/dsfromkey.dsp",
-             "../bin/dnssec/win32/dsfromkey.mak",
-             "../bin/dnssec/win32/keyfromlabel.dsp",
-             "../bin/dnssec/win32/keyfromlabel.mak",
-             "../bin/dnssec/win32/keygen.dsp",
-             "../bin/dnssec/win32/keygen.mak",
-             "../bin/dnssec/win32/revoke.dsp",
-             "../bin/dnssec/win32/revoke.mak",
-             "../bin/dnssec/win32/settime.dsp",
-             "../bin/dnssec/win32/settime.mak",
-             "../bin/dnssec/win32/signzone.dsp",
-             "../bin/dnssec/win32/signzone.mak",
-             "../bin/named/win32/named.dsp",
-             "../bin/named/win32/named.mak",
-             "../bin/nsupdate/win32/nsupdate.dsp",
-             "../bin/nsupdate/win32/nsupdate.mak",
-             "../bin/rndc/win32/rndc.dsp",
-             "../bin/rndc/win32/rndc.mak",
-             "../bin/tools/win32/journalprint.dsp",
-             "../bin/tools/win32/journalprint.mak",
-             "../lib/bind9/win32/libbind9.dsp",
-             "../lib/bind9/win32/libbind9.mak",
-             "../lib/dns/win32/libdns.dsp",
-             "../lib/dns/win32/libdns.mak",
-             "../lib/isc/win32/libisc.dsp",
-             "../lib/isc/win32/libisc.mak",
-            "../lib/isc/win32/libisc.def",
-             "../lib/isccc/win32/libisccc.dsp",
-             "../lib/isccc/win32/libisccc.mak",
-             "../lib/isccfg/win32/libisccfg.dsp",
-             "../lib/isccfg/win32/libisccfg.mak");
-
-# Locate the libxml2 directory
-$substr = getdirectory();
-if ($substr eq 0) {
-     print "No directory found\n";
-}
-else {
-     print "Found $substr directory\n";
-}
-
-if ($substr ne 0) {
-   #Update the list of files
-   $ind = 0;
-   updateconfig(1);
-   foreach $file (@filelist) {
-      print "Updating file $file\n";
-      updatefile($file, $substr, 1);
-      $ind++;
-   }
-}
-else {
-   #Update the configuration to reflect libxml2 being absent
-   $ind = 0;
-   updateconfig(0);
-   foreach $file (@filelist) {
-      print "Updating file $file\n";
-      updatefile($file, $substr, 0);
-      $ind++;
-   }
-}
-
-# Function to find the libxml2 directory
-sub getdirectory {
-    my(@namelist);
-    my($file, $name);
-    my($cnt);
-    opendir(DIR,$path) || return (0);
-    @namelist = grep (/^libxml2-[0-9]+\.[0-9]+\.[0-9]+[a-z]*$/i, readdir(DIR));
-    closedir(DIR);
-
-    # Make sure we have something
-    if (scalar(@namelist) == 0) {
-        return (0);
-    }
-    # Now see if we have a directory or just a file.
-    # Make sure we are case insensitive
-    foreach $file (sort {uc($a) cmp uc($b)} @namelist) {
-        if (-d $path.$file) {
-           $name = $file;
-        }
-    }
-
-    # If we have one use it otherwise report the error
-    # Note that we are only interested in the last one
-    # since the sort should have taken care of getting
-    # the latest
-    if (defined($name)) {
-        return ($name);
-    }
-    else {
-        return (0);
-    }
-}
-
-# function to replace the libxml2 directory name with the latest one
-sub updatefile {
-        my($filename, $substr, $line);
-        my(@Lines);
-
-        $filename = $_[0];
-        $substr   = $_[1];
-        $havexml  = $_[2];
-
-        open (RFILE, $filename) || die "Can't open file $filename: $!";
-        @Lines = <RFILE>;
-        close (RFILE);
-
-        # Replace the string
-        foreach $line (@Lines) {
-           if ($havexml) {
-              $line =~ s/libxml2-[0-9]+\.[0-9]+\.[0-9]+[a-z]*/$substr/gi;
-             if ($filename =~ /\.mak$/) {
-                $line =~ s/^# (LIBXML=.*\/libxml2\.lib.*)$/\1/;
-             } elsif ($filename =~ /\.dsp$/ ) {
-                 $line =~ s/^!MESSAGE (LIBXML=.*\/libxml2\.lib.*)$/\1/;
-                 $line =~ s/^!MESSAGE (# ADD LINK32 .*\/libxml2\.lib.*)$/\1/;
-             }
-             $line =~ s/^; (isc_socketmgr_renderxml)$/\1/;
-             $line =~ s/^; (isc_mem_renderxml)$/\1/;
-             $line =~ s/^; (isc_taskmgr_renderxml)$/\1/;
-           } else {
-             if ($filename =~ /\.mak$/) {
-                $line =~ s/^(LIBXML=.*\/libxml2.lib.*)$/# \1/i;
-             } elsif ($filename =~ /\.dsp$/ ) {
-                 $line =~ s/^(# ADD LINK32 .*\/libxml2.lib.*)$/!MESSAGE \1/i;
-                 $line =~ s/^(LIBXML=.*\/libxml2.lib.*)$/!MESSAGE \1/i;
-             }
-             $line =~ s/^(isc_socketmgr_renderxml)$/; \1/;
-             $line =~ s/^(isc_mem_renderxml)$/; \1/;
-             $line =~ s/^(isc_taskmgr_renderxml)$/; \1/;
-           }
-        }
-
-        #update the file
-        open (RFILE, ">$filename") || die "Can't open file $filename: $!";
-        foreach $line (@Lines) {
-           print RFILE $line;
-        }
-        close(RFILE);
-}
-
-# update config.h to define or undefine HAVE_LIBXML2
-sub updateconfig {
-   my($havexml, $substr, $line);
-   my(@Lines);
-
-   $havexml = $_[0];
-
-   open (RFILE, "../config.h") || die "Can't open config.h";
-   @Lines = <RFILE>;
-   close (RFILE);
-
-   foreach $line (@Lines) {
-      if ($havexml) {
-         $line =~ s/^.*#undef HAVE_LIBXML2.*$/define HAVE_LIBXML2 1/;
-      } else {
-         $line =~ s/^#define HAVE_LIBXML2 .*$/\/\* #undef HAVE_LIBXML2 \*\//;
-      }
-   }
-
-   open (RFILE, ">../config.h") || die "Can't open config.h";
-   print "Updating file ../config.h\n";
-   foreach $line (@Lines) {
-      print RFILE $line;
-   }
-   close(RFILE);
-}
diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl
deleted file mode 100644 (file)
index 3d3f8a3..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (C) 2006, 2007, 2009, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id$
-
-# updateopenssl.pl
-# This script locates the latest version of OpenSSL in the grandparent
-# directory and updates the build scripts to use that version.
-#
-# Path and directory
-$path = "..\\..\\";
-
-# List of files that need to be updated with the actual version of the
-# openssl directory
-@filelist = ("SetupLibs.bat",
-            "../lib/dns/win32/libdns.mak",
-             "../lib/dns/win32/libdns.dsp",
-            "../bin/named/win32/named.mak",
-            "../bin/named/win32/named.dsp");
-
-# Locate the openssl directory
-$substr = getdirectory();
-if ($substr eq 0) {
-     print "No directory found\n";
-}
-else {
-     print "Found $substr directory\n";
-}
-#Update the list of files
-if ($substr ne 0) {
-   $ind = 0;
-   foreach $file (@filelist) {
-        print "Updating file $file\n";
-       updatefile($file, $substr);
-       $ind++;
-   }
-}
-
-# Function to find the
-sub getdirectory {
-    my(@namelist);
-    my($file, $name);
-    my($cnt);
-    opendir(DIR,$path) || die "No Directory: $!";
-    @namelist = grep (/^openssl-[0-9]+\.[0-9]+\.[0-9]+[a-z]{0,1}$/i, readdir(DIR));
-    closedir(DIR);
-
-    # Make sure we have something
-    if (scalar(@namelist) == 0) {
-        return (0);
-    }
-    # Now see if we have a directory or just a file.
-    # Make sure we are case insensitive
-    foreach $file (sort {uc($a) cmp uc($b)} @namelist) {
-        if (-d $path.$file) {
-           $name = $file;
-        }
-    }
-
-    # If we have one use it otherwise report the error
-    # Note that we are only interested in the last one
-    # since the sort should have taken care of getting
-    # the latest
-    if (defined($name)) {
-        return ($name);
-    }
-    else {
-        return (0);
-    }
-}
-
-# function to replace the openssl directory name with the latest one
-sub updatefile {
-        my($filename, $substr, $line);
-        my(@Lines);
-
-        $filename = $_[0];
-        $substr   = $_[1];
-
-        open (RFILE, $filename) || die "Can't open file $filename: $!";
-        @Lines = <RFILE>;
-        close (RFILE);
-
-        # Replace the string
-        foreach $line (@Lines) {
-                $line =~ s/openssl-[0-9]+\.[0-9]+\.[0-9]+[a-z]{0,1}/$substr/gi;
-        }
-        #update the file
-        open (RFILE, ">$filename") || die "Can't open file $filename: $!";
-        foreach $line (@Lines) {
-               print RFILE $line;
-        }
-        close(RFILE);
-}
-
diff --git a/win32utils/win32-build.txt b/win32utils/win32-build.txt
deleted file mode 100644 (file)
index 0ea90c5..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-Copyright (C) 2004, 2005, 2008, 2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
-Copyright (C) 2001, 2002  Internet Software Consortium.
-See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
-
-$Id$
-
-       BIND 9.8 for Win32 Source Build Instructions.  24-June-2013
-
-Building BIND 9.8 on Windows XP/2003/2008 has the following prerequisites:
-
-1) You need to install Perl for Windows.  ActivePerl
-(http://www.activestate.com/) and Strawberry Perl
-(http://www.strawberryperl.com) have both been tested and found
-to work.
-
-2) OpenSSL (http://www.openssl.org) needs to be downloaded and built
-on the system on which you are building BIND.
-
-3) If you wish to use the statistics channel, LibXML2
-(ftp://xmlsoft.org/libxml2) needs to be downloaded and built on
-the system on which you are building BIND.  (If you do not wish
-to use the statistics channel, remove HAVE_LIBXML2 from config.h.win32.)
-
-4) The BIND Installer (BINDInstall) includes a copy of the
-redistributable runtime object vcredist_x86.exe, which is included
-with Visual Studio and can be downloaded from Microsoft.  This file
-must be in place prior to running the build setup script.
-
-5) If you want to build using Visual C++ 6.0, you'll need some extra
-files that are to be found in the Platform SDK (which you will need
-to install), namely:
-
-iphlpapi.h
-iptypes.h
-ipexport.h
-iphlpapi.lib
-
-You'll also need an updated Iprtrmib.h - using the VC++6.0 one will
-get you some compilation errors. You can just overwrite the old one if
-you're not using it for any purposes, and maybe keep a backup of it. 
-
-You can copy the header files under VC98\INCLUDE and the library file
-under VC98\LIB. I think you can also put them in a separate directory
-and add it to the include search list, but I don't know if that can be
-made persistent. 
-
-For building on VC++ 7.0 no extra files are required. 
-
-The instructions assume a Visual C++ 6.0 compiler with Visual Studio and
-Visual Studio Service Pack 3 or later. It may build and work with earlier
-versions but it has not been tested. The binaries may be built and run on
-any of the following platforms: NT 4.0 Workstation (SP3 or later), NT 4.0
-Server (SP3 or later), Windows 2000 Professional (SP1 or later),
-Windows 2000 Server or any kind (SP1 or later), Windows XP, Windows 2003
-Server. It will NOT build or run on Windows 95, Windows 98, etc. platforms.
-
-Step 1: Download and build OpenSSL
-
-Download and untar the OpenSSL sources from http://www.openssl.org/.
-Extract them at in the same directory in which you extracted the BIND9
-source:  If BIND9 is in \build\bind-9.7.0, for instance, OpenSSL should be
-in \build\openssl-0.9.8l (subject to version number changes).
-
-Note: Building OpenSSL requires that you install Perl as it uses
-it during its build process. The following commands work as of
-openssl-0.9.8l, but you should check the OpenSSL distribution 
-to see if the build instructions have changed:
-
-  cd openssl-0.9.8l
-  perl Configure VC-WIN32 --prefix=c:/openssl
-  ms\do_masm
-  nmake /f ms\ntdll.mak
-
-If you wish to use PKCS #11 to control a cryptographic hardware service
-module, please see bind9\README.pkcs11.  You will need to apply the patch
-in bind9\bin\pkcs11\openssl-0.9.8l-patch (this can be done using the Cygwin
-'patch' utility) and add --pk11-libname and --pk11-flavor to the Configure
-command above.
-
-Step 2: Download and build libxml2
-
-Download and untar the libxml2 sources from ftp://xmlsoft.org/libxml2.
-Extract them at in the same directory in which you extracted the BIND9
-source:  If BIND9 is in \build\bind-9.7.0, for instance, libxml2 should
-be in \build\libxml2-2.7.3 (subject to version number changes).
-
-Now build libxml2, and copy the resulting files into the include and lib
-directories:
-
- cd libxml2-2.7.3\win32
- cscript configure.js compiler=msvc vcmanifest=yes static=yes debug=no iconv=no
- nmake /f Makefile.msvc libxml
-
-Step 3: Building BIND
-
-You must build openssl and libxml2 first. 
-
-From the command prompt cd to the win32utils directory under
-the BIND9 root:
-
-  cd bind-9.8.0\win32utils
-
-Text files used by the Windows build should be in DOS format.
-If for some reason they aren't, this can be corrected by running:
-
-  perl todos.pl
-
-If you wish to use PKCS #11 to control a cryptographic hardware service
-module, set the path to the PKCS #11 provider library:
-
-  perl setpk11provider.pl <DLL path>
-
-If using VC++ 6.0, run the BuildAll.bat file:
-
-  BuildAll
-
-This will do the following:
-1) copy config.h.win32 to config.h in the root.
-2) create the versions.h file in the root.
-3) Build the gen application in the lib/dns directory.
-4) Run the gen application and build the required lib/dns header
-   files.
-5) Create the Build/Release subdirectory under the root of the BIND
-   source tree which will hold the binaries being built.
-6) Build the libraries, named, application tools like dig, rndc
-   dnssec tools, installer, checkconf and checkzones programs,
-   BIND 9 Installer.
-7) Copies the release notes and the OpenSSL DLL to the BUILD/Release
-   directory.
-8) Copies the BIND 9 ARM HTML files and the application HTML files
-   to the Build\Release area.
-
-If you wish to use the Visual Studio GUI for building, you can just
-run the BuildSetup.bat file:
-
-  BuildSetup
-  
-This will create or find and copy into place several files which are
-necessary for the build to proceed.  It also locates and copies into place
-the DLLs for OpenSSL and libxml2.
-
-Use BINDBuild.dsw (also located in the win32utils directory) to open the
-workspace for all of the BIND9 libraries and applications.  Select
-"Build->Batch Build", click "Select All", then click "Build".
-
-After the build has completed, run the BuildPost.bat file:
-
-  BuildPost
-
-...which does post-build processing.
-
-Installation is accomplished by running the BINDInstall program. All DLL's
-are copied to the system32 area and all applications (including BINDInstall
-which may be necessary for uninstalling BIND 9) to the dns/bin directory.
-If BIND 8 has previously been installed on the system it must be uninstalled
-first by running it's own BINDInstall program.  The BIND 9 installer does
-not yet do this.
-
-All bugs found, whether in the process of building the application or
-running BIND or the tools should be reported to the bind9 bugs email
-account at bind9-bugs@isc.org.