head	1.133;
access;
symbols
	core-8-5-9:1.117.2.2
	core-8-5-8:1.117.2.2
	macosx-cocoa-merge:1.127
	macosx-cocoa-premerge:1.127
	macosx-carbon-freeze:1.127
	core-8-5-7:1.117.2.1
	core-8-5-6:1.117.2.1
	core-8-6-b1:1.126
	core-8-6-a3:1.124
	core-8-5-5:1.117.2.1
	core-8-6-a2:1.123
	core-8-5-4:1.117
	core-8-5-3:1.117
	core-8-6-a1:1.123
	core-8-4-19:1.67.2.18
	core-8-5-branch:1.117.0.2
	core-8-5-2:1.117
	core-8-4-18:1.67.2.18
	core-8-5-1:1.116
	core-8-4-17:1.67.2.18
	core-8-5-0:1.116
	core-8-5-b3:1.113
	core-8-5-b2:1.112
	core-8-4-16:1.67.2.18
	core-8-5-b1:1.107
	core-stablilizer-merge:1.103
	core-stabilizer-branch:1.103.0.2
	core-stabilizer-merge:1.117
	core-8-4-15:1.67.2.17
	core-8-5-a6:1.101
	core-8-5-a5:1.95
	core-8-4-14:1.67.2.17
	core-8-5-a4:1.92
	core-8-4-13:1.67.2.13
	core-8-4-12:1.67.2.12
	core-8-4-11:1.67.2.9
	core-8-5-a3:1.89
	core-8-4-10:1.67.2.9
	core-8-4-9-branch:1.67.2.8.0.2
	core-8-5-a2:1.88
	core-8-4-9:1.67.2.8
	core-8-4-8:1.67.2.8
	core-8-4-7:1.67.2.6
	core-8-5-a1:1.82
	core-8-4-6:1.67.2.5
	core-8-4-5:1.67.2.5
	mistachkin-dev-branch:1.73.0.2
	core-8-4-4:1.67.2.3
	core-8-4-3:1.67.2.3
	core-8-4-branch:1.67.0.2
	core-8-4-2:1.67
	core-8-4-1:1.63
	core-8-3-5:1.33.2.4
	core-8-4-0:1.63
	macosx-8-4-merge-2002-08-31-trunk:1.63
	macosx-8-4-premerge-2002-08-31-branch:1.42.2.2
	macosx-8-4-premerge-2002-08-31-trunk:1.63
	macosx-8-4-merge-2002-08-30-branch:1.42.2.2
	macosx-8-4-merge-2002-08-30-trunk:1.63
	macosx-8-4-merge-2002-08-20-branch:1.42.2.2
	macosx-8-4-merge-2002-08-20-trunk:1.63
	core-8-4-b2:1.62
	core-8-4-b1:1.62
	macosx-premerge-6-9-02:1.42
	core-8-4-a4:1.51
	core-8-3-4:1.33.2.2
	macosx-8-4-branch:1.42.0.2
	macosx-8-4-branchpoint:1.42
	core-8-4-a3:1.40
	core-8-3-3:1.33.2.1
	dgp-privates-into-namespace:1.39.0.4
	tclpro-1-5-0:1.33
	core-8-4-win-speedup:1.39.0.2
	core-8-4-a2:1.39
	tclpro-1-4-1:1.33
	tclpro-1-4-0:1.33
	core-8-3-2:1.33
	ajuba-ajuba2-2-1-base:1.33
	ajuba-ajuba2-2-0:1.33
	core-8-4-a1:1.34
	core-8-3-1-branch:1.33.0.2
	core-8-3-1:1.33
	scriptics-sc-2-0-b5:1.32
	scriptics-sc-2-0-fixed:1.32
	scriptics-sc-2-0-b2:1.32
	scriptics-sc-2-0-b1:1.32
	core-8-3-0:1.32
	core-8-3-b2:1.30
	core-8-3-b1:1.30
	scriptics-sc-1-1:1.27
	scriptics-sc-1-1-b1:1.27
	core-8-2-3:1.27
	scriptics-sc-1-1-branch:1.27.0.8
	scriptics-sc-1-1-base:1.27
	scriptics-sc-1-0:1.27
	scriptics-sc-1-0-branch:1.27.0.6
	scriptics-sc-1-0-base:1.27
	core-8-2-2:1.27
	core-8-2-1:1.27
	scriptics-bc-1-0-b1:1.27
	core-8-2-1-branch:1.27.0.4
	scriptics-tclpro-1-3-0:1.27
	core-8-2-0:1.27
	core-8-2-b3-branch:1.27.0.2
	core-8-2-b3-base:1.27
	scriptics-tclpro-1-3-b4:1.27
	core-8-2-b2:1.27
	scriptics-tclpro-1-3-b3:1.26
	core-8-2-b1:1.26
	scriptics-tclpro-1-3-b2:1.24
	merge-to-mainline-5/21/99:1.24
	scriptics-tclpro-1-3-b2-branch:1.24.0.4
	core-8-1-1:1.24
	scriptics-tclpro-1-3-b1:1.24
	core-8-1-1-base:1.24
	core-8-1-0:1.24
	merge-to-mainline-4-29-99:1.24
	merge-to-mainline-4-23-99:1.24
	core-8-1-branch-old:1.1.0.4
	core-8-0-6-branch:1.21.0.2
	core-8-0-6-base:1.21
	core-8-0-5:1.18.2.1
	core-8-1-b3:1.1.4.21
	core-8-1-b2:1.1.4.17
	dev-8-1-stubs-branch:1.1.4.13.0.2
	dev-stubs-branch:1.19.0.2
	scriptics-tclpro-1-2:1.18.2.1
	scriptics-tclpro-1-2-b2:1.18.2.1
	core-8-1-merge-2/10/99:1.18
	core-8-0-5-branch:1.18.0.2
	core-8-0-5-base:1.18
	scriptics-tclpro-1-2-b1:1.17
	scriptics-tclpro-1-2-a1:1.17
	core-8-1-b1:1.1.4.6
	core-8-0-4:1.17
	core-8-1-a2:1.1.4.1
	core-8-0-2:1.1
	core-8-0-3:1.14;
locks; strict;
comment	@# @;


1.133
date	2010.10.11.21.50.46;	author nijtmans;	state Exp;
branches;
next	1.132;

1.132
date	2010.10.11.12.27.32;	author nijtmans;	state Exp;
branches;
next	1.131;

1.131
date	2010.09.09.14.59.24;	author nijtmans;	state Exp;
branches;
next	1.130;

1.130
date	2010.03.12.15.23.39;	author nijtmans;	state Exp;
branches;
next	1.129;

1.129
date	2009.12.12.00.02.36;	author nijtmans;	state Exp;
branches;
next	1.128;

1.128
date	2009.11.22.00.40.21;	author patthoyts;	state Exp;
branches;
next	1.127;

1.127
date	2008.12.28.13.08.39;	author dkf;	state Exp;
branches;
next	1.126;

1.126
date	2008.10.19.21.22.36;	author patthoyts;	state Exp;
branches;
next	1.125;

1.125
date	2008.10.18.14.22.22;	author dkf;	state Exp;
branches;
next	1.124;

1.124
date	2008.08.25.11.44.04;	author dkf;	state Exp;
branches;
next	1.123;

1.123
date	2008.06.13.05.46.09;	author mistachkin;	state Exp;
branches;
next	1.122;

1.122
date	2008.05.15.00.06.19;	author patthoyts;	state Exp;
branches;
next	1.121;

1.121
date	2008.04.20.19.57.03;	author patthoyts;	state Exp;
branches;
next	1.120;

1.120
date	2008.04.03.17.04.55;	author patthoyts;	state Exp;
branches;
next	1.119;

1.119
date	2008.04.02.14.39.36;	author patthoyts;	state Exp;
branches;
next	1.118;

1.118
date	2008.04.02.04.30.44;	author dgp;	state Exp;
branches;
next	1.117;

1.117
date	2008.03.18.06.59.04;	author jenglish;	state Exp;
branches
	1.117.2.1;
next	1.116;

1.116
date	2007.12.14.02.19.42;	author patthoyts;	state Exp;
branches;
next	1.115;

1.115
date	2007.12.13.15.28.52;	author dgp;	state Exp;
branches;
next	1.114;

1.114
date	2007.11.28.02.05.24;	author patthoyts;	state Exp;
branches;
next	1.113;

1.113
date	2007.11.17.21.47.02;	author patthoyts;	state Exp;
branches;
next	1.112;

1.112
date	2007.10.17.20.53.06;	author davygrvy;	state Exp;
branches;
next	1.111;

1.111
date	2007.10.16.21.24.05;	author davygrvy;	state Exp;
branches;
next	1.110;

1.110
date	2007.10.12.19.01.07;	author patthoyts;	state Exp;
branches;
next	1.109;

1.109
date	2007.10.12.18.56.33;	author patthoyts;	state Exp;
branches;
next	1.108;

1.108
date	2007.10.12.14.14.54;	author patthoyts;	state Exp;
branches;
next	1.107;

1.107
date	2007.09.18.16.12.19;	author dgp;	state Exp;
branches;
next	1.106;

1.106
date	2007.09.17.22.40.25;	author patthoyts;	state Exp;
branches;
next	1.105;

1.105
date	2007.09.12.17.10.39;	author andreas_kupries;	state Exp;
branches;
next	1.104;

1.104
date	2007.09.11.17.46.42;	author dgp;	state Exp;
branches;
next	1.103;

1.103
date	2007.05.15.23.20.17;	author patthoyts;	state Exp;
branches
	1.103.2.1;
next	1.102;

1.102
date	2007.05.14.20.58.31;	author dgp;	state Exp;
branches;
next	1.101;

1.101
date	2007.02.28.05.26.37;	author chengyemao;	state Exp;
branches;
next	1.100;

1.100
date	2007.02.09.06.54.33;	author mistachkin;	state Exp;
branches;
next	1.99;

1.99
date	2007.01.19.09.00.30;	author mistachkin;	state Exp;
branches;
next	1.98;

1.98
date	2006.11.03.11.22.22;	author patthoyts;	state Exp;
branches;
next	1.97;

1.97
date	2006.10.31.22.26.19;	author patthoyts;	state Exp;
branches;
next	1.96;

1.96
date	2006.10.31.14.45.04;	author patthoyts;	state Exp;
branches;
next	1.95;

1.95
date	2006.10.19.00.48.25;	author patthoyts;	state Exp;
branches;
next	1.94;

1.94
date	2006.09.27.18.43.35;	author andreas_kupries;	state Exp;
branches;
next	1.93;

1.93
date	2006.09.22.19.02.08;	author andreas_kupries;	state Exp;
branches;
next	1.92;

1.92
date	2005.12.09.00.48.54;	author das;	state Exp;
branches;
next	1.91;

1.91
date	2005.12.08.22.14.15;	author hobbs;	state Exp;
branches;
next	1.90;

1.90
date	2005.12.08.20.25.42;	author hobbs;	state Exp;
branches;
next	1.89;

1.89
date	2005.03.08.21.55.49;	author hobbs;	state Exp;
branches;
next	1.88;

1.88
date	2004.11.26.20.53.26;	author davygrvy;	state Exp;
branches;
next	1.87;

1.87
date	2004.10.27.00.56.33;	author davygrvy;	state Exp;
branches;
next	1.86;

1.86
date	2004.09.16.17.52.08;	author davygrvy;	state Exp;
branches;
next	1.85;

1.85
date	2004.09.10.12.32.24;	author vincentdarley;	state Exp;
branches;
next	1.84;

1.84
date	2004.09.06.13.45.37;	author patthoyts;	state Exp;
branches;
next	1.83;

1.83
date	2004.03.09.03.35.08;	author davygrvy;	state Exp;
branches;
next	1.82;

1.82
date	2004.02.08.01.38.03;	author davygrvy;	state Exp;
branches;
next	1.81;

1.81
date	2004.02.01.10.41.18;	author davygrvy;	state Exp;
branches;
next	1.80;

1.80
date	2004.01.15.21.46.22;	author davygrvy;	state Exp;
branches;
next	1.79;

1.79
date	2004.01.13.13.43.36;	author vincentdarley;	state Exp;
branches;
next	1.78;

1.78
date	2004.01.13.02.01.39;	author davygrvy;	state Exp;
branches;
next	1.77;

1.77
date	2003.12.23.02.59.12;	author davygrvy;	state Exp;
branches;
next	1.76;

1.76
date	2003.11.17.02.15.32;	author dgp;	state Exp;
branches;
next	1.75;

1.75
date	2003.11.16.06.07.00;	author davygrvy;	state Exp;
branches;
next	1.74;

1.74
date	2003.10.14.15.35.52;	author patthoyts;	state Exp;
branches;
next	1.73;

1.73
date	2003.09.26.23.59.26;	author patthoyts;	state Exp;
branches;
next	1.72;

1.72
date	2003.08.25.20.35.59;	author davygrvy;	state Exp;
branches;
next	1.71;

1.71
date	2003.05.13.14.15.08;	author vincentdarley;	state Exp;
branches;
next	1.70;

1.70
date	2003.03.23.02.17.44;	author kennykb;	state Exp;
branches;
next	1.69;

1.69
date	2003.03.11.23.31.55;	author kennykb;	state Exp;
branches;
next	1.68;

1.68
date	2003.03.04.23.50.49;	author dgp;	state Exp;
branches;
next	1.67;

1.67
date	2003.02.14.20.30.36;	author davygrvy;	state Exp;
branches
	1.67.2.1;
next	1.66;

1.66
date	2002.12.10.22.06.40;	author davygrvy;	state Exp;
branches;
next	1.65;

1.65
date	2002.11.04.07.49.43;	author davygrvy;	state Exp;
branches;
next	1.64;

1.64
date	2002.11.01.18.33.54;	author andreas_kupries;	state Exp;
branches;
next	1.63;

1.63
date	2002.08.14.15.31.21;	author vincentdarley;	state Exp;
branches;
next	1.62;

1.62
date	2002.06.21.23.09.54;	author hobbs;	state Exp;
branches;
next	1.61;

1.61
date	2002.06.18.23.51.46;	author dkf;	state Exp;
branches;
next	1.60;

1.60
date	2002.06.10.22.45.51;	author davygrvy;	state Exp;
branches;
next	1.59;

1.59
date	2002.05.08.02.22.37;	author davygrvy;	state Exp;
branches;
next	1.58;

1.58
date	2002.03.29.04.14.40;	author davygrvy;	state Exp;
branches;
next	1.57;

1.57
date	2002.03.29.03.55.24;	author davygrvy;	state Exp;
branches;
next	1.56;

1.56
date	2002.03.29.01.27.50;	author davygrvy;	state Exp;
branches;
next	1.55;

1.55
date	2002.03.29.01.18.36;	author davygrvy;	state Exp;
branches;
next	1.54;

1.54
date	2002.03.28.23.29.44;	author davygrvy;	state Exp;
branches;
next	1.53;

1.53
date	2002.03.28.23.23.03;	author davygrvy;	state Exp;
branches;
next	1.52;

1.52
date	2002.03.21.17.48.54;	author davygrvy;	state Exp;
branches;
next	1.51;

1.51
date	2002.02.22.02.41.17;	author hobbs;	state Exp;
branches;
next	1.50;

1.50
date	2002.02.01.23.20.29;	author davygrvy;	state Exp;
branches;
next	1.49;

1.49
date	2001.12.03.10.42.31;	author davygrvy;	state Exp;
branches;
next	1.48;

1.48
date	2001.11.28.01.13.16;	author davygrvy;	state Exp;
branches;
next	1.47;

1.47
date	2001.11.16.10.24.53;	author davygrvy;	state Exp;
branches;
next	1.46;

1.46
date	2001.11.13.06.55.18;	author davygrvy;	state Exp;
branches;
next	1.45;

1.45
date	2001.11.13.04.26.48;	author davygrvy;	state Exp;
branches;
next	1.44;

1.44
date	2001.11.13.02.46.23;	author davygrvy;	state Exp;
branches;
next	1.43;

1.43
date	2001.11.10.00.58.16;	author hobbs;	state Exp;
branches;
next	1.42;

1.42
date	2001.10.12.13.30.32;	author tmh;	state Exp;
branches
	1.42.2.1;
next	1.41;

1.41
date	2001.10.01.21.04.37;	author hobbs;	state Exp;
branches;
next	1.40;

1.40
date	2001.03.30.23.50.17;	author hobbs;	state Exp;
branches;
next	1.39;

1.39
date	2000.11.03.01.16.30;	author hobbs;	state Exp;
branches
	1.39.2.1
	1.39.4.1;
next	1.38;

1.38
date	2000.10.31.01.28.26;	author davidg;	state Exp;
branches;
next	1.37;

1.37
date	2000.09.02.01.18.24;	author ericm;	state Exp;
branches;
next	1.36;

1.36
date	2000.08.06.00.10.56;	author hobbs;	state Exp;
branches;
next	1.35;

1.35
date	2000.07.20.15.20.52;	author ericm;	state Exp;
branches;
next	1.34;

1.34
date	2000.05.03.00.18.37;	author hobbs;	state Exp;
branches;
next	1.33;

1.33
date	2000.04.08.06.59.09;	author hobbs;	state Exp;
branches
	1.33.2.1;
next	1.32;

1.32
date	2000.02.10.02.54.23;	author hobbs;	state Exp;
branches;
next	1.31;

1.31
date	2000.02.08.11.31.49;	author hobbs;	state Exp;
branches;
next	1.30;

1.30
date	99.12.09.14.46.41;	author hobbs;	state Exp;
branches;
next	1.29;

1.29
date	99.10.29.03.58.39;	author hobbs;	state Exp;
branches;
next	1.28;

1.28
date	99.10.01.22.45.31;	author hobbs;	state Exp;
branches;
next	1.27;

1.27
date	99.07.31.02.31.57;	author redman;	state Exp;
branches;
next	1.26;

1.26
date	99.07.09.02.10.07;	author stanton;	state Exp;
branches;
next	1.25;

1.25
date	99.06.25.23.30.27;	author welch;	state Exp;
branches;
next	1.24;

1.24
date	99.04.21.21.53.32;	author rjohnson;	state Exp;
branches
	1.24.2.1;
next	1.23;

1.23
date	99.04.17.00.18.41;	author surles;	state Exp;
branches;
next	1.22;

1.22
date	99.04.16.01.51.48;	author stanton;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	99.04.16.01.25.56;	author stanton;	state Exp;
branches;
next	1.20;

1.20
date	99.03.10.07.04.46;	author stanton;	state Exp;
branches;
next	1.19;

1.19
date	99.02.12.00.51.12;	author stanton;	state Exp;
branches
	1.19.2.1;
next	1.18;

1.18
date	99.02.04.21.02.58;	author stanton;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	98.11.03.02.04.06;	author stanton;	state Exp;
branches;
next	1.16;

1.16
date	98.10.07.20.57.27;	author escoffon;	state Exp;
branches;
next	1.15;

1.15
date	98.09.30.22.09.23;	author escoffon;	state Exp;
branches;
next	1.14;

1.14
date	98.09.14.18.23.58;	author stanton;	state Exp;
branches;
next	1.13;

1.13
date	98.08.20.22.10.09;	author welch;	state Exp;
branches;
next	1.12;

1.12
date	98.08.12.18.41.59;	author suresh;	state Exp;
branches;
next	1.11;

1.11
date	98.08.06.16.47.10;	author welch;	state Exp;
branches;
next	1.10;

1.10
date	98.08.03.15.48.31;	author escoffon;	state Exp;
branches;
next	1.9;

1.9
date	98.07.30.12.34.55;	author escoffon;	state Exp;
branches;
next	1.8;

1.8
date	98.07.29.13.14.52;	author escoffon;	state Exp;
branches;
next	1.7;

1.7
date	98.07.28.17.42.20;	author welch;	state Exp;
branches;
next	1.6;

1.6
date	98.07.27.00.49.58;	author rjohnson;	state Exp;
branches;
next	1.5;

1.5
date	98.07.24.15.11.59;	author welch;	state Exp;
branches
	1.5.1.1;
next	1.4;

1.4
date	98.07.21.08.05.12;	author escoffon;	state Exp;
branches
	1.4.1.1
	1.4.2.1;
next	1.3;

1.3
date	98.07.20.16.06.53;	author escoffon;	state Exp;
branches;
next	1.2;

1.2
date	98.07.01.18.48.48;	author escoffon;	state Exp;
branches
	1.2.1.1;
next	1.1;

1.1
date	98.04.01.10.00.27;	author rjohnson;	state Exp;
branches
	1.1.1.1
	1.1.4.1;
next	;

1.1.1.1
date	98.07.06.15.11.05;	author welch;	state Exp;
branches;
next	;

1.1.4.1
date	98.09.29.00.26.05;	author stanton;	state Exp;
branches;
next	1.1.4.2;

1.1.4.2
date	98.09.30.02.19.26;	author stanton;	state Exp;
branches;
next	1.1.4.3;

1.1.4.3
date	98.10.06.03.27.36;	author stanton;	state Exp;
branches;
next	1.1.4.4;

1.1.4.4
date	98.10.06.20.34.11;	author stanton;	state Exp;
branches;
next	1.1.4.5;

1.1.4.5
date	98.11.25.21.16.42;	author stanton;	state Exp;
branches;
next	1.1.4.6;

1.1.4.6
date	98.12.11.01.31.04;	author stanton;	state Exp;
branches;
next	1.1.4.7;

1.1.4.7
date	99.02.11.04.13.50;	author stanton;	state Exp;
branches;
next	1.1.4.8;

1.1.4.8
date	99.02.12.00.52.06;	author stanton;	state Exp;
branches;
next	1.1.4.9;

1.1.4.9
date	99.02.12.01.09.03;	author stanton;	state Exp;
branches;
next	1.1.4.10;

1.1.4.10
date	99.02.26.02.24.45;	author redman;	state Exp;
branches;
next	1.1.4.11;

1.1.4.11
date	99.02.26.19.08.04;	author redman;	state Exp;
branches;
next	1.1.4.12;

1.1.4.12
date	99.03.09.01.34.50;	author lfb;	state Exp;
branches;
next	1.1.4.13;

1.1.4.13
date	99.03.09.02.48.44;	author lfb;	state Exp;
branches
	1.1.4.13.2.1;
next	1.1.4.14;

1.1.4.14
date	99.03.10.07.13.51;	author stanton;	state Exp;
branches;
next	1.1.4.15;

1.1.4.15
date	99.03.11.19.02.10;	author hershey;	state Exp;
branches;
next	1.1.4.16;

1.1.4.16
date	99.03.11.23.48.11;	author hershey;	state Exp;
branches;
next	1.1.4.17;

1.1.4.17
date	99.03.12.22.40.45;	author hershey;	state Exp;
branches;
next	1.1.4.18;

1.1.4.18
date	99.03.17.22.06.29;	author stanton;	state Exp;
branches;
next	1.1.4.19;

1.1.4.19
date	99.03.18.00.43.01;	author stanton;	state Exp;
branches;
next	1.1.4.20;

1.1.4.20
date	99.03.30.02.30.19;	author redman;	state Exp;
branches;
next	1.1.4.21;

1.1.4.21
date	99.04.01.21.58.52;	author redman;	state Exp;
branches;
next	;

1.1.4.13.2.1
date	99.03.09.17.50.38;	author redman;	state Exp;
branches;
next	;

1.2.1.1
date	98.07.24.15.11.02;	author welch;	state Exp;
branches;
next	;

1.4.1.1
date	98.07.24.13.57.01;	author rjohnson;	state Exp;
branches;
next	;

1.4.2.1
date	98.07.29.12.41.33;	author escoffon;	state Exp;
branches;
next	;

1.5.1.1
date	98.07.28.17.38.18;	author welch;	state Exp;
branches;
next	;

1.18.2.1
date	99.02.12.00.50.21;	author stanton;	state Exp;
branches;
next	;

1.19.2.1
date	99.03.06.00.07.07;	author redman;	state Exp;
branches;
next	1.19.2.2;

1.19.2.2
date	99.03.07.00.15.47;	author redman;	state Exp;
branches;
next	;

1.22.2.1
date	99.04.21.02.30.43;	author rjohnson;	state Exp;
branches;
next	1.22.2.2;

1.22.2.2
date	99.04.21.21.30.32;	author rjohnson;	state Exp;
branches;
next	;

1.24.2.1
date	99.05.14.02.19.15;	author stanton;	state Exp;
branches;
next	;

1.33.2.1
date	2001.04.04.07.57.18;	author hobbs;	state Exp;
branches;
next	1.33.2.2;

1.33.2.2
date	2001.10.03.22.04.53;	author hobbs;	state Exp;
branches;
next	1.33.2.3;

1.33.2.3
date	2002.04.10.17.57.26;	author davygrvy;	state Exp;
branches;
next	1.33.2.4;

1.33.2.4
date	2002.04.10.18.04.17;	author davygrvy;	state Exp;
branches;
next	;

1.39.2.1
date	2000.11.03.22.49.24;	author hobbs;	state Exp;
branches;
next	1.39.2.2;

1.39.2.2
date	2002.04.02.21.17.03;	author hobbs;	state Exp;
branches;
next	;

1.39.4.1
date	2001.07.03.20.01.10;	author dgp;	state Exp;
branches;
next	;

1.42.2.1
date	2002.06.10.05.38.27;	author wolfsuit;	state Exp;
branches;
next	1.42.2.2;

1.42.2.2
date	2002.08.20.20.27.18;	author das;	state Exp;
branches;
next	;

1.67.2.1
date	2003.03.11.23.48.26;	author kennykb;	state Exp;
branches;
next	1.67.2.2;

1.67.2.2
date	2003.03.13.16.41.48;	author kennykb;	state Exp;
branches;
next	1.67.2.3;

1.67.2.3
date	2003.03.23.02.25.21;	author kennykb;	state Exp;
branches;
next	1.67.2.4;

1.67.2.4
date	2003.11.16.06.02.13;	author davygrvy;	state Exp;
branches;
next	1.67.2.5;

1.67.2.5
date	2003.11.17.02.20.20;	author dgp;	state Exp;
branches;
next	1.67.2.6;

1.67.2.6
date	2004.05.10.08.30.30;	author patthoyts;	state Exp;
branches;
next	1.67.2.7;

1.67.2.7
date	2004.10.27.00.36.33;	author davygrvy;	state Exp;
branches;
next	1.67.2.8;

1.67.2.8
date	2004.10.29.11.52.42;	author patthoyts;	state Exp;
branches;
next	1.67.2.9;

1.67.2.9
date	2005.03.08.21.54.01;	author hobbs;	state Exp;
branches;
next	1.67.2.10;

1.67.2.10
date	2005.11.30.00.19.01;	author hobbs;	state Exp;
branches;
next	1.67.2.11;

1.67.2.11
date	2005.12.01.17.51.30;	author kennykb;	state Exp;
branches;
next	1.67.2.12;

1.67.2.12
date	2005.12.01.18.00.00;	author kennykb;	state Exp;
branches;
next	1.67.2.13;

1.67.2.13
date	2006.03.28.22.23.53;	author patthoyts;	state Exp;
branches;
next	1.67.2.14;

1.67.2.14
date	2006.06.14.23.52.01;	author patthoyts;	state Exp;
branches;
next	1.67.2.15;

1.67.2.15
date	2006.09.22.19.01.52;	author andreas_kupries;	state Exp;
branches;
next	1.67.2.16;

1.67.2.16
date	2006.09.25.17.28.21;	author andreas_kupries;	state Exp;
branches;
next	1.67.2.17;

1.67.2.17
date	2006.09.26.23.55.50;	author patthoyts;	state Exp;
branches;
next	1.67.2.18;

1.67.2.18
date	2007.09.11.00.13.07;	author patthoyts;	state Exp;
branches;
next	;

1.103.2.1
date	2007.09.11.18.32.36;	author dgp;	state Exp;
branches;
next	1.103.2.2;

1.103.2.2
date	2007.09.14.16.30.31;	author dgp;	state Exp;
branches;
next	1.103.2.3;

1.103.2.3
date	2007.10.15.18.38.41;	author dgp;	state Exp;
branches;
next	1.103.2.4;

1.103.2.4
date	2007.10.17.14.37.05;	author dgp;	state Exp;
branches;
next	1.103.2.5;

1.103.2.5
date	2007.10.19.14.35.35;	author dgp;	state Exp;
branches;
next	1.103.2.6;

1.103.2.6
date	2007.11.21.16.46.31;	author dgp;	state Exp;
branches;
next	1.103.2.7;

1.103.2.7
date	2007.11.28.20.33.16;	author dgp;	state Exp;
branches;
next	1.103.2.8;

1.103.2.8
date	2008.01.23.16.39.14;	author dgp;	state Exp;
branches;
next	1.103.2.9;

1.103.2.9
date	2008.03.26.20.09.33;	author dgp;	state Exp;
branches;
next	;

1.117.2.1
date	2008.10.10.18.55.31;	author dgp;	state Exp;
branches;
next	1.117.2.2;

1.117.2.2
date	2009.10.15.17.48.50;	author dgp;	state Exp;
branches;
next	;


desc
@@


1.133
log
@[FRQ 491789]: "setargv() doesn't support a unicode
cmdline" implemented for Tk on MSVC++
@
text
@#------------------------------------------------------------- -*- makefile -*-
# makefile.vc --
#
#	Microsoft Visual C++ makefile for use with nmake.exe v1.62+ (VC++ 5.0+)
#
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
# Copyright (c) 1998-2000 Ajuba Solutions.
# Copyright (c) 2001-2005 ActiveState Corporation.
# Copyright (c) 2001-2004 David Gravereaux.
# Copyright (c) 2003-2008 Pat Thoyts.
#
#------------------------------------------------------------------------------
# RCS: @@(#) $Id: makefile.vc,v 1.132 2010/10/11 12:27:32 nijtmans Exp $
#------------------------------------------------------------------------------

# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
# or with the MS Platform SDK (MSSDK). Visual Studio .NET 2003 and 2005 define
# VCINSTALLDIR instead.
!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(MSSDK) && !defined(VCINSTALLDIR)
MSG = ^
You need to run vcvars32.bat from Developer Studio or setenv.bat from the^
Platform SDK first to setup the environment.  Jump to this line to read^
the build instructions.
!error $(MSG)
!endif

#------------------------------------------------------------------------------
# HOW TO USE this makefile:
#
# 1)  It is now necessary to have MSVCDir, MSDevDir or MSSDK set in the
#     environment.  This is used as a check to see if vcvars32.bat had been
#     run prior to running nmake or during the installation of Microsoft
#     Visual C++, MSVCDir had been set globally and the PATH adjusted.
#     Either way is valid.
#
#     You'll need to run vcvars32.bat contained in the MsDev's vc(98)/bin
#     directory to setup the proper environment, if needed, for your
#     current setup.  This is a needed bootstrap requirement and allows the
#     swapping of different environments to be easier.
#
# 2)  To use the Platform SDK (not expressly needed), run setenv.bat after
#     vcvars32.bat according to the instructions for it.  This can also
#     turn on the 64-bit compiler, if your SDK has it.
#
# 3)  Targets are:
#	release  -- builds the core, the shell. (default)
#	core     -- Only builds the core.
#	all      -- builds everything.
#	test     -- builds and runs the test suite.
#	tktest   -- just builds the binaries for the test suite.
#	install  -- installs the built binaries and libraries to $(INSTALLDIR)
#		    as the root of the install tree.
#	cwish    -- builds a console version of wish.
#	clean    -- removes the contents of $(TMP_DIR)
#	hose     -- removes the contents of $(TMP_DIR) and $(OUT_DIR)
#	genstubs -- rebuilds the Stubs table and support files (dev only).
#	depend   -- Generates an accurate set of source dependancies for this
#		    makefile.  Helpful to avoid problems when the sources are
#		    refreshed and you rebuild, but can "overbuild" when common
#		    headers like tkInt.h just get small changes.
#	winhelp  -- builds the windows .hlp file for Tcl from the troff man
#		    files.
#
# 4)  Macros usable on the commandline:
#	TCLDIR=<path>
#		Sets the location for where to find the Tcl headers and
#		libraries.  The install point is assumed when not specified.
#		Tk does need the source directory, though.  Tk comes very close
#		to not needing the sources, but does, in fact, require them.
#
#	INSTALLDIR=<path>
#		Sets where to install Tcl from the built binaries.
#		C:\Progra~1\Tcl is assumed when not specified.
#
#	OPTS=static,msvcrt,linkexten,threads,symbols,profile,unchecked,none
#		Sets special options for the core.  The default is for none.
#		Any combination of the above may be used (comma separated).
#		'none' will over-ride everything to nothing.
#
#		static   = Builds a static library of the core instead of a
#			   dll.  The shell will be static (and large), as well.
#		msvcrt   = Effects the static option only to switch it from
#			   using libcmt(d) as the C runtime [by default] to
#			   msvcrt(d). This is useful for static embedding
#			   support.
#		staticpkg= Affects the static option only to switch wishXX.exe
#			   to have the dde and reg extension linked inside it.
#		threads  = Turns on full multithreading support.
#		thrdalloc = Use the thread allocator (shared global free pool)
#			   This is the default on threaded builds.
#		tclalloc  = Use the old non-thread allocator
#		symbols  = Adds symbols for step debugging.
#		profile  = Adds profiling hooks.  Map file is assumed.
#		loimpact = Adds a flag for how NT treats the heap to keep
#			   memory in use, low.  This is said to impact alloc
#			   performance.
#		unchecked= Allows a symbols build to not use the debug
#			   enabled runtime (msvcrt.dll not msvcrtd.dll
#			   or libcmt.lib not libcmtd.lib).
#               noxp     = If you do not have the uxtheme.h header then you
#                          cannot include support for XP themeing.
#		square   = Include the demo square widget.
#
#	STATS=memdbg,compdbg,none
#		Sets optional memory and bytecode compiler debugging code added
#		to the core.  The default is for none.  Any combination of the
#		above may be used (comma separated).  'none' will over-ride
#		everything to nothing.
#
#		memdbg   = Enables the debugging memory allocator.
#		compdbg  = Enables byte compilation logging.
#
#	CHECKS=nodep,fullwarn,none
#		Sets special macros for checking compatability.
#
#		nodep	 = Turns off compatability macros to ensure Tk isn't
#			    being built with deprecated functions.
#		fullwarn = Builds with full compiler and link warnings enabled.
#			    Very verbose.
#
#	MACHINE=(IX86|IA64|AMD64|ALPHA)
#		Set the machine type used for the compiler, linker, and
#		resource compiler.  This hook is needed to tell the tools
#		when alternate platforms are requested.  IX86 is the default
#		when not specified.
#
#	TMP_DIR=<path>
#	OUT_DIR=<path>
#		Hooks to allow the intermediate and output directories to be
#		changed.  $(OUT_DIR) is assumed to be
#		$(BINROOT)\(Release|Debug) based on if symbols are requested.
#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.
#
#	TESTPAT=<file>
#		Reads the tests requested to be run from this file.
#
# 5)  Examples:
#
#	Basic syntax of calling nmake looks like this:
#	nmake [-nologo] -f makefile.vc [target|macrodef [target|macrodef] [...]]
#
#                        Standard (no frills)
#       c:\tk_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
#       Setting environment for using Microsoft Visual C++ tools.
#       c:\tk_src\win\>nmake -f makefile.vc release
#       c:\tk_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
#
#                         Building for Win64
#       c:\tk_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
#       Setting environment for using Microsoft Visual C++ tools.
#       c:\tk_src\win\>c:\progra~1\platfo~1\setenv.bat /pre64 /RETAIL
#       Targeting Windows pre64 RETAIL
#       c:\tk_src\win\>nmake -f makefile.vc MACHINE=IA64
#
#------------------------------------------------------------------------------
#==============================================================================
###############################################################################


#    //==================================================================\\
#   >>[               -> Do not modify below this line. <-               ]<<
#   >>[  Please, use the commandline macros to modify how Tcl is built.  ]<<
#   >>[  If you need more features, send us a patch for more macros.     ]<<
#    \\==================================================================//


###############################################################################
#==============================================================================
#------------------------------------------------------------------------------

!if !exist("makefile.vc")
MSG = ^
You must run this makefile only from the directory it is in.^
Please `cd` to its location first.
!error $(MSG)
!endif

PROJECT	= tk
!include "rules.vc"

!if $(TCLINSTALL)
!message *** Warning: Tk requires the source distribution of Tcl to build from,
!message ***    at this time, sorry.  Please set the TCLDIR macro to point to the
!message ***    Tcl sources.
!endif

# Extra makefile options processing...
!if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]
HAVE_UXTHEME_H    = 1
TTK_SQUARE_WIDGET = 0
!else
!if [nmakehlp -f $(OPTS) "noxp"]
!message *** Exclude support for XP theme
HAVE_UXTHEME_H  = 0
!else
HAVE_UXTHEME_H  = 1
!endif
!if [nmakehlp -f "$(OPTS)" "square"]
!message *** Include ttk square demo widget
TTK_SQUARE_WIDGET   = 1
!else
TTK_SQUARE_WIDGET   = 0
!endif
!endif

STUBPREFIX = $(PROJECT)stub
WISHNAMEPREFIX = wish

BINROOT		= .
ROOT		= ..

TK_LIBRARY	= $(ROOT)\library

TKIMPLIB	= "$(OUT_DIR)\$(PROJECT)$(TK_VERSION)$(SUFX).lib"
TKLIBNAME	= $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)
TKLIB		= "$(OUT_DIR)\$(TKLIBNAME)"

TKSTUBLIBNAME	= $(STUBPREFIX)$(TK_VERSION).lib
TKSTUBLIB	= "$(OUT_DIR)\$(TKSTUBLIBNAME)"

WISH 		= "$(OUT_DIR)\$(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe"
WISHC 		= "$(OUT_DIR)\$(WISHNAMEPREFIX)c$(TK_VERSION)$(SUFX).exe"

TKTEST		= "$(OUT_DIR)\$(PROJECT)test.exe"
CAT32		= "$(OUT_DIR)\cat32.exe"

LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib
BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin
DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc
SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TK_DOTVERSION)
INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include

WISHOBJS = \
	$(TMP_DIR)\winMain.obj \
!if $(TCL_USE_STATIC_PACKAGES)
	$(TCLDDELIB) \
	$(TCLREGLIB) \
	$(TCLSTUBLIB) \
!endif
	$(TMP_DIR)\wish.res

TKTESTOBJS = \
	$(TMP_DIR)\testMain.obj \
	$(TMP_DIR)\tkSquare.obj \
	$(TMP_DIR)\tkTest.obj \
	$(TMP_DIR)\tkOldTest.obj \
	$(TMP_DIR)\tkWinTest.obj

XLIBOBJS = \
	$(TMP_DIR)\xcolors.obj \
	$(TMP_DIR)\xdraw.obj \
	$(TMP_DIR)\xgc.obj \
	$(TMP_DIR)\ximage.obj \
	$(TMP_DIR)\xutil.obj

TKOBJS = \
	$(TMP_DIR)\tkConsole.obj \
	$(TMP_DIR)\tkUnixMenubu.obj \
	$(TMP_DIR)\tkUnixScale.obj \
	$(XLIBOBJS) \
	$(TMP_DIR)\tkWin3d.obj \
	$(TMP_DIR)\tkWin32Dll.obj \
	$(TMP_DIR)\tkWinButton.obj \
	$(TMP_DIR)\tkWinClipboard.obj \
	$(TMP_DIR)\tkWinColor.obj \
	$(TMP_DIR)\tkWinConfig.obj \
	$(TMP_DIR)\tkWinCursor.obj \
	$(TMP_DIR)\tkWinDialog.obj \
	$(TMP_DIR)\tkWinDraw.obj \
	$(TMP_DIR)\tkWinEmbed.obj \
	$(TMP_DIR)\tkWinFont.obj \
	$(TMP_DIR)\tkWinImage.obj \
	$(TMP_DIR)\tkWinInit.obj \
	$(TMP_DIR)\tkWinKey.obj \
	$(TMP_DIR)\tkWinMenu.obj \
	$(TMP_DIR)\tkWinPixmap.obj \
	$(TMP_DIR)\tkWinPointer.obj \
	$(TMP_DIR)\tkWinRegion.obj \
	$(TMP_DIR)\tkWinScrlbr.obj \
	$(TMP_DIR)\tkWinSend.obj \
	$(TMP_DIR)\tkWinSendCom.obj \
	$(TMP_DIR)\tkWinWindow.obj \
	$(TMP_DIR)\tkWinWm.obj \
	$(TMP_DIR)\tkWinX.obj \
	$(TMP_DIR)\stubs.obj \
	$(TMP_DIR)\tk3d.obj \
	$(TMP_DIR)\tkArgv.obj \
	$(TMP_DIR)\tkAtom.obj \
	$(TMP_DIR)\tkBind.obj \
	$(TMP_DIR)\tkBitmap.obj \
	$(TMP_DIR)\tkBusy.obj \
	$(TMP_DIR)\tkButton.obj \
	$(TMP_DIR)\tkCanvArc.obj \
	$(TMP_DIR)\tkCanvBmap.obj \
	$(TMP_DIR)\tkCanvImg.obj \
	$(TMP_DIR)\tkCanvLine.obj \
	$(TMP_DIR)\tkCanvPoly.obj \
	$(TMP_DIR)\tkCanvPs.obj \
	$(TMP_DIR)\tkCanvText.obj \
	$(TMP_DIR)\tkCanvUtil.obj \
	$(TMP_DIR)\tkCanvWind.obj \
	$(TMP_DIR)\tkCanvas.obj \
	$(TMP_DIR)\tkClipboard.obj \
	$(TMP_DIR)\tkCmds.obj \
	$(TMP_DIR)\tkColor.obj \
	$(TMP_DIR)\tkConfig.obj \
	$(TMP_DIR)\tkCursor.obj \
	$(TMP_DIR)\tkEntry.obj \
	$(TMP_DIR)\tkError.obj \
	$(TMP_DIR)\tkEvent.obj \
	$(TMP_DIR)\tkFileFilter.obj \
	$(TMP_DIR)\tkFocus.obj \
	$(TMP_DIR)\tkFont.obj \
	$(TMP_DIR)\tkFrame.obj \
	$(TMP_DIR)\tkGC.obj \
	$(TMP_DIR)\tkGeometry.obj \
	$(TMP_DIR)\tkGet.obj \
	$(TMP_DIR)\tkGrab.obj \
	$(TMP_DIR)\tkGrid.obj \
	$(TMP_DIR)\tkImage.obj \
	$(TMP_DIR)\tkImgBmap.obj \
	$(TMP_DIR)\tkImgGIF.obj \
	$(TMP_DIR)\tkImgPNG.obj \
	$(TMP_DIR)\tkImgPPM.obj \
	$(TMP_DIR)\tkImgPhoto.obj \
	$(TMP_DIR)\tkImgPhInstance.obj \
	$(TMP_DIR)\tkImgUtil.obj \
	$(TMP_DIR)\tkListbox.obj \
	$(TMP_DIR)\tkMacWinMenu.obj \
	$(TMP_DIR)\tkMain.obj \
	$(TMP_DIR)\tkMain2.obj \
	$(TMP_DIR)\tkMenu.obj \
	$(TMP_DIR)\tkMenubutton.obj \
	$(TMP_DIR)\tkMenuDraw.obj \
	$(TMP_DIR)\tkMessage.obj \
	$(TMP_DIR)\tkPanedWindow.obj \
	$(TMP_DIR)\tkObj.obj \
	$(TMP_DIR)\tkOldConfig.obj \
	$(TMP_DIR)\tkOption.obj \
	$(TMP_DIR)\tkPack.obj \
	$(TMP_DIR)\tkPlace.obj \
	$(TMP_DIR)\tkPointer.obj \
	$(TMP_DIR)\tkRectOval.obj \
	$(TMP_DIR)\tkScale.obj \
	$(TMP_DIR)\tkScrollbar.obj \
	$(TMP_DIR)\tkSelect.obj \
	$(TMP_DIR)\tkStyle.obj \
	$(TMP_DIR)\tkText.obj \
	$(TMP_DIR)\tkTextBTree.obj \
	$(TMP_DIR)\tkTextDisp.obj \
	$(TMP_DIR)\tkTextImage.obj \
	$(TMP_DIR)\tkTextIndex.obj \
	$(TMP_DIR)\tkTextMark.obj \
	$(TMP_DIR)\tkTextTag.obj \
	$(TMP_DIR)\tkTextWind.obj \
	$(TMP_DIR)\tkTrig.obj \
	$(TMP_DIR)\tkUndo.obj \
	$(TMP_DIR)\tkUtil.obj \
	$(TMP_DIR)\tkVisual.obj \
	$(TMP_DIR)\tkStubInit.obj \
	$(TMP_DIR)\tkWindow.obj \
        $(TTK_OBJS) \
!if !$(STATIC_BUILD)
	$(TMP_DIR)\tk.res
!endif

TTK_OBJS = \
        $(TMP_DIR)\ttkWinMonitor.obj \
        $(TMP_DIR)\ttkWinTheme.obj \
        $(TMP_DIR)\ttkWinXPTheme.obj \
        $(TMP_DIR)\ttkBlink.obj \
        $(TMP_DIR)\ttkButton.obj \
        $(TMP_DIR)\ttkCache.obj \
        $(TMP_DIR)\ttkClamTheme.obj \
        $(TMP_DIR)\ttkClassicTheme.obj \
        $(TMP_DIR)\ttkDefaultTheme.obj \
        $(TMP_DIR)\ttkElements.obj \
        $(TMP_DIR)\ttkEntry.obj \
        $(TMP_DIR)\ttkFrame.obj \
        $(TMP_DIR)\ttkImage.obj \
        $(TMP_DIR)\ttkInit.obj \
        $(TMP_DIR)\ttkLabel.obj \
        $(TMP_DIR)\ttkLayout.obj \
        $(TMP_DIR)\ttkManager.obj \
        $(TMP_DIR)\ttkNotebook.obj \
        $(TMP_DIR)\ttkPanedwindow.obj \
        $(TMP_DIR)\ttkProgress.obj \
        $(TMP_DIR)\ttkScale.obj \
        $(TMP_DIR)\ttkScrollbar.obj \
        $(TMP_DIR)\ttkScroll.obj \
        $(TMP_DIR)\ttkSeparator.obj \
        $(TMP_DIR)\ttkSquare.obj \
        $(TMP_DIR)\ttkState.obj \
        $(TMP_DIR)\ttkTagSet.obj \
        $(TMP_DIR)\ttkTheme.obj \
        $(TMP_DIR)\ttkTrace.obj \
        $(TMP_DIR)\ttkTrack.obj \
        $(TMP_DIR)\ttkTreeview.obj \
        $(TMP_DIR)\ttkWidget.obj \
        $(TMP_DIR)\ttkStubInit.obj

TKSTUBOBJS = \
	$(TMP_DIR)\tkStubLib.obj $(TMP_DIR)\ttkStubLib.obj


WINDIR          = $(ROOT)\win
GENERICDIR	= $(ROOT)\generic
XLIBDIR		= $(ROOT)\xlib
TTKDIR		= $(ROOT)\generic\ttk
BITMAPDIR	= $(ROOT)\bitmaps
DOCDIR		= $(ROOT)\doc
RCDIR		= $(WINDIR)\rc

TK_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(BITMAPDIR)" -I"$(XLIBDIR)" \
			$(TCL_INCLUDES)

CONFIG_DEFS     =-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
		 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
		 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
		 -DSUPPORT_CONFIG_EMBEDDED \
!if $(HAVE_UXTHEME_H)
		 -DHAVE_UXTHEME_H=1 \
!endif
!if $(TTK_SQUARE_WIDGET)
		 -DTTK_SQUARE_WIDGET=1 \
!endif

TK_DEFINES	=-DBUILD_ttk $(OPTDEFINES)  $(CONFIG_DEFS) -Dinline=__inline

#---------------------------------------------------------------------
# Compile flags
#---------------------------------------------------------------------

!if !$(DEBUG)
!if $(OPTIMIZING)
### This cranks the optimization level to maximize speed
###  We can't use -O2 because sometimes it causes problems.
cdebug	= $(OPTIMIZATIONS)
!else
cdebug	=
!endif
!if $(SYMBOLS)
cdebug	= $(cdebug) -Zi
!endif
!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
### Warnings are too many, can't support warnings into errors.
cdebug	= -Zi -Od $(DEBUGFLAGS)
!else
cdebug	= -Zi -WX $(DEBUGFLAGS)
!endif

### Declarations common to all compiler options
cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\

!if $(MSVCRT)
!if $(DEBUG) && !$(UNCHECKED)
crt = -MDd
!else
crt = -MD
!endif
!else
!if $(DEBUG) && !$(UNCHECKED)
crt = -MTd
!else
crt = -MT
!endif
!endif

BASE_CFLAGS	= $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
TK_CFLAGS	= $(BASE_CFLAGS) $(TK_DEFINES)
CON_CFLAGS	= $(cdebug) $(cflags) $(crt) -DCONSOLE
WISH_CFLAGS	= $(BASE_CFLAGS) $(TK_DEFINES)
### Stubs files should not be compiled with -GL
STUB_CFLAGS     = $(cflags) $(cdebug:-GL=) $(TK_DEFINES)

!if !$(STATIC_BUILD)
TK_CFLAGS = $(TK_CFLAGS) -DUSE_TCL_STUBS
!endif

#---------------------------------------------------------------------
# Link flags
#---------------------------------------------------------------------

!if $(DEBUG)
ldebug	= -debug:full -debugtype:cv
!else
ldebug	= -release -opt:ref -opt:icf,3
!if $(SYMBOLS)
ldebug	= $(ldebug) -debug:full -debugtype:cv
!endif
!endif

### Declarations common to all linker options
lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)

!if $(PROFILE)
lflags	= $(lflags) -profile
!endif

!if $(ALIGN98_HACK) && !$(STATIC_BUILD)
### Align sections for PE size savings.
lflags	= $(lflags) -opt:nowin98
!else if !$(ALIGN98_HACK) && $(STATIC_BUILD)
### Align sections for speed in loading by choosing the virtual page size.
lflags	= $(lflags) -align:4096
!endif

!if $(LOIMPACT)
lflags	= $(lflags) -ws:aggressive
!endif

dlllflags = $(lflags) -dll
conlflags = $(lflags) -subsystem:console
guilflags = $(lflags) -subsystem:windows

tcllibs    = $(TCLIMPLIB)
!if !$(STATIC_BUILD)
tcllibs    = $(TCLSTUBLIB) $(tcllibs)
!endif

baselibs   = netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
# Avoid 'unresolved external symbol __security_cookie' errors.
# c.f. http://support.microsoft.com/?id=894573
!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500
baselibs   = $(baselibs) bufferoverflowU.lib
!endif
!endif
guilibs	  = $(baselibs) gdi32.lib


#---------------------------------------------------------------------
# TkTest flags
#---------------------------------------------------------------------

!if "$(TESTPAT)" != ""
TESTFLAGS   = $(TESTFLAGS) -file $(TESTPAT)
!endif


#---------------------------------------------------------------------
# Project specific targets
#---------------------------------------------------------------------

release:  setup $(TKSTUBLIB) $(WISH)
all:	  release $(CAT32)
core:	  setup $(TKSTUBLIB) $(TKLIB)
cwish:	  $(WISHC)
install:  install-binaries install-libraries install-docs
tktest:	  setup $(TKTEST) $(CAT32)


test: test-classic test-ttk

test-classic: setup $(TKTEST) $(TKLIB) $(CAT32)
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
!if $(TCLINSTALL)
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
	$(DEBUGGER) $(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
!else
	$(DEBUGGER) $(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
!endif

test-ttk: setup $(TKTEST) $(TKLIB) $(CAT32)
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
!if $(TCLINSTALL)
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
	$(DEBUGGER) $(TKTEST) "$(ROOT)/tests/ttk/all.tcl" $(TESTFLAGS) | $(CAT32)
!else
	$(DEBUGGER) $(TKTEST) "$(ROOT)/tests/ttk/all.tcl" $(TESTFLAGS) | $(CAT32)
!endif

runtest: setup $(TKTEST) $(TKLIB) $(CAT32)
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
!if $(TCLINSTALL)
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
	$(DEBUGGER) $(TKTEST)

rundemo: setup $(TKTEST) $(TKLIB) $(CAT32)
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
!if $(TCLINSTALL)
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
	$(TKTEST) $(ROOT)\library\demos\widget

shell: setup $(WISH)
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
!if $(TCLINSTALL)
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
	$(DEBUGGER) $(WISH) <<
	console show
<<

setup:
	@@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
	@@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)

!if !$(STATIC_BUILD)
$(TKIMPLIB): $(TKLIB)
!endif

$(TKLIB): $(TKOBJS)
!if $(STATIC_BUILD)
	$(lib32) -nologo -out:$@@ @@<<
$**
<<
!else
	$(link32) $(dlllflags) -base:@@$(COFFBASE),tk -out:$@@ $(guilibs) \
		$(TCLSTUBLIB) @@<<
$**
<<
	$(_VC_MANIFEST_EMBED_DLL)
	-@@del $*.exp
!endif


$(TKSTUBLIB): $(TKSTUBOBJS)
	$(lib32) -nologo -out:$@@ $**


$(WISH): $(WISHOBJS) $(TKSTUBLIB) $(TKIMPLIB)
	$(link32) $(guilflags) -stack:2300000 -out:$@@ $(guilibs) $(tcllibs) $**
	$(_VC_MANIFEST_EMBED_EXE)


$(WISHC): $(WISHOBJS) $(TKSTUBLIB) $(TKIMPLIB)
	$(link32) $(conlflags) -stack:2300000 -out:$@@ $(guilibs) $(tcllibs) $**
	$(_VC_MANIFEST_EMBED_EXE)


$(TKTEST): $(TKTESTOBJS) $(TKSTUBLIB) $(TKIMPLIB)
	$(link32) $(guilflags) -stack:2300000 -out:$@@ $(guilibs) $(tcllibs) $**
	$(_VC_MANIFEST_EMBED_EXE)


$(CAT32): $(_TCLDIR)\win\cat.c
	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?
	$(link32) $(conlflags) -out:$@@ -stack:16384 $(TMP_DIR)\cat.obj $(baselibs)
	$(_VC_MANIFEST_EMBED_EXE)


#---------------------------------------------------------------------
# Regenerate the stubs files.
#---------------------------------------------------------------------

genstubs:
!if !exist($(TCLSH))
	@@echo Build tclsh first!
!else
	set TCL_LIBRARY=$(TCL_LIBRARY)
	$(TCLSH) $(_TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\$(PROJECT).decls $(GENERICDIR)\$(PROJECT)Int.decls
!endif


#---------------------------------------------------------------------
# Regenerate the windows help files.
#---------------------------------------------------------------------

HLPBASE		= $(PROJECT)$(TK_VERSION)
HELPFILE	= $(OUT_DIR)\$(HLPBASE).hlp
HELPCNT		= $(OUT_DIR)\$(HLPBASE).cnt
DOCTMP_DIR	= $(OUT_DIR)\$(PROJECT)_docs
HELPRTF		= $(DOCTMP_DIR)\$(PROJECT).rtf
MAN2HELP	= $(DOCTMP_DIR)\man2help.tcl
MAN2HELP2	= $(DOCTMP_DIR)\man2help2.tcl
INDEX		= $(DOCTMP_DIR)\index.tcl
BMP		= $(DOCTMP_DIR)\lamp.bmp
BMP_NOPATH	= lamp.bmp
MAN2TCL		= $(DOCTMP_DIR)\man2tcl.exe

winhelp: docsetup $(HELPFILE)

docsetup:
	@@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)

$(MAN2HELP) $(MAN2HELP2) $(INDEX): $(TCLTOOLSDIR)\$$(@@F)
	$(CPY) $(TCLTOOLSDIR)\$(@@F) $(@@D)

$(BMP):
	$(CPY) $(WINDIR)\rc\$(@@F) $(@@D)

$(HELPFILE): $(HELPRTF) $(BMP)
	cd $(DOCTMP_DIR)
	start /wait hcrtf.exe -x <<$(PROJECT).hpj
[OPTIONS]
COMPRESS=12 Hall Zeck
LCID=0x409 0x0 0x0 ; English (United States)
TITLE=Tk Reference Manual
BMROOT=.
CNT=$(@@B).cnt
HLP=$(@@B).hlp

[FILES]
$(PROJECT).rtf

[WINDOWS]
main="Tcl/Tk Reference Manual",,27648,(r15263976),(r4227327)

[CONFIG]
BrowseButtons()
CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))
CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))
CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))
CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
<<
	cd $(MAKEDIR)
	$(CPY) "$(DOCTMP_DIR)\$(@@B).hlp" "$(OUT_DIR)"
	$(CPY) "$(DOCTMP_DIR)\$(@@B).cnt" "$(OUT_DIR)"

$(MAN2TCL): $(TCLTOOLSDIR)\$$(@@B).c
	$(cc32) $(TK_CFLAGS) -Fo$(@@D)\ $(TCLTOOLSDIR)\$(@@B).c
	$(link32) $(conlflags) -out:$@@ -stack:16384 $(@@D)\man2tcl.obj
	$(_VC_MANIFEST_EMBED_EXE)

$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX)
	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(TK_VERSION) $(DOCDIR:\=/)

install-docs:
!if exist($(HELPFILE))
	$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
	$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
	$(TCLSH) <<
puts "Installing $(PROJECT)'s helpfile contents into Tcl's ..."
set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(TK_VERSION).cnt" r]
while {![eof $$f]} {
    if {[regexp {:Include $(PROJECT)([0-9]{2}).cnt} [gets $$f] dummy ver]} {
	if {$$ver == $(TK_VERSION)} {
	    puts "Already installed."
	    exit
	} else {
	    # do something here logical to remove (or replace) it.
	    puts "$$ver != $(TK_VERSION), unfinished code path, die, die!"
	    exit 1
	}
    }
}
close $$f
set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(TK_VERSION).cnt" a]
puts $$f {:Include $(HLPBASE).cnt}
close $$f
<<
	start /wait winhlp32 -g $(DOC_INSTALL_DIR)\tcl$(TK_VERSION).hlp
!endif

#---------------------------------------------------------------------
# Special case object file targets
#---------------------------------------------------------------------

$(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c
	$(cc32) $(WISH_CFLAGS) -DTK_TEST \
	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
	    -Fo$@@ $?

$(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?

$(TMP_DIR)\tkOldTest.obj: $(GENERICDIR)\tkOldTest.c
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?

$(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?

$(TMP_DIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?

$(TMP_DIR)\winMain.obj: $(WINDIR)\winMain.c
	$(cc32) $(WISH_CFLAGS) \
	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
	    -Fo$@@ $?

$(TMP_DIR)\tkMain2.obj: $(GENERICDIR)\tkMain.c
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -DTK_ASCII_MAIN -Fo$@@ $?

# The following objects are part of the stub library and should not
# be built as DLL objects but none of the symbols should be exported
# and no reference made to a C runtime.

$(TMP_DIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
	$(cc32) $(STUB_CFLAGS) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@@ $?


$(TMP_DIR)\wish.exe.manifest: $(WINDIR)\wish.exe.manifest.in
	@@nmakehlp -s << $** >$@@
@@MACHINE@@	  $(MACHINE:IX86=X86)
@@TK_WIN_VERSION@@  $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION).0.0
<<

#---------------------------------------------------------------------
# Generate the makefile depedancies.
#---------------------------------------------------------------------

depend:
!if !exist($(TCLSH))
	@@echo Build tclsh first!
!else
	set TCL_LIBRARY=$(TCL_LIBRARY)
	$(TCLSH) $(TCLTOOLSDIR)\mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
		-passthru:"-DBUILD_tk $(TK_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \
		$(WINDIR),$$(WINDIR) $(TTKDIR),$$(TTKDIR) $(XLIBDIR),$$(XLIBDIR) \
		$(BITMAPDIR),$$(BITMAPDIR) @@<<
$(TKOBJS)
<<
!endif


#---------------------------------------------------------------------
# Dedependency rules
#---------------------------------------------------------------------

$(TMP_DIR)\tk.res: \
    $(RCDIR)\buttons.bmp \
    $(RCDIR)\cursor*.cur \
    $(RCDIR)\tk.ico

!if exist("$(OUT_DIR)\depend.mk")
!include "$(OUT_DIR)\depend.mk"
!message *** Dependency rules in effect.
!else
!message *** Dependency rules are not being used.
!endif

### add a spacer in the output
!message

#---------------------------------------------------------------------
# Implicit rules
#---------------------------------------------------------------------

{$(XLIBDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(TTKDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(WINDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(ROOT)\unix}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(RCDIR)}.rc{$(TMP_DIR)}.res:
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" $(TCL_INCLUDES) \
	    -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
	    -d TCL_THREADS=$(TCL_THREADS) \
	    -d STATIC_BUILD=$(STATIC_BUILD) \
	    $<

$(TMP_DIR)\tk.res: $(TMP_DIR)\wish.exe.manifest
$(TMP_DIR)\wish.res: $(TMP_DIR)\wish.exe.manifest

.SUFFIXES:
.SUFFIXES:.c .rc


#---------------------------------------------------------------------
# Installation.
#---------------------------------------------------------------------

install-binaries:
	@@echo installing binaries
	@@$(CPY) "$(WISH)" "$(BIN_INSTALL_DIR)\"
!if $(TKLIB) != $(TKIMPLIB)
	@@$(CPY) "$(TKLIB)" "$(BIN_INSTALL_DIR)\"
!endif
	@@$(CPY) "$(TKIMPLIB)" "$(LIB_INSTALL_DIR)\"
	@@$(CPY) "$(TKSTUBLIB)" "$(LIB_INSTALL_DIR)\"
!if !$(STATIC_BUILD)
	@@echo creating package index
	@@type << > $(OUT_DIR)\pkgIndex.tcl
if {[package vcompare [package provide Tcl] $(TCL_PATCH_LEVEL)] != 0} { return }
package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk]
<<
	@@$(CPY) $(OUT_DIR)\pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)\"
!endif

#"

install-libraries:
	@@echo installing Tk headers
	@@$(CPY) "$(GENERICDIR)\tk.h" "$(INCLUDE_INSTALL_DIR)\"
	@@$(CPY) "$(GENERICDIR)\tkDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@$(CPY) "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@$(CPY) "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@$(CPY) "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11\"
	@@echo installing script library
	@@$(CPY) "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
	@@echo installing theme library
	@@$(CPY) "$(ROOT)\library\ttk\*" "$(SCRIPT_INSTALL_DIR)\ttk\"
	@@echo installing demos
	@@$(CPY) "$(ROOT)\library\demos\*" "$(SCRIPT_INSTALL_DIR)\demos\"
	@@$(CPY) "$(ROOT)\library\demos\images\*" "$(SCRIPT_INSTALL_DIR)\demos\images\"
	@@echo installing images
	@@$(CPY) "$(ROOT)\library\images\*" "$(SCRIPT_INSTALL_DIR)\images\"
	@@echo installing language files
	@@$(CPY) "$(ROOT)\library\msgs\*" "$(SCRIPT_INSTALL_DIR)\msgs\"

#"

#---------------------------------------------------------------------
# Clean up
#---------------------------------------------------------------------

tidy:
!if $(TKLIB) != $(TKIMPLIB)
	@@echo Removing $(TKLIB) ...
	@@if exist $(TKLIB) del $(TKLIB)
!endif
	@@echo Removing $(TKIMPLIB) ...
	@@if exist $(TKIMPLIB) del $(TKIMPLIB)
	@@echo Removing $(WISH) ...
	@@if exist $(WISH) del $(WISH)
	@@echo Removing $(TKTEST) ...
	@@if exist $(TKTEST) del $(TKTEST)
	@@echo Removing $(TKSTUBLIB) ...
	@@if exist $(TKSTUBLIB) del $(TKSTUBLIB)

clean:
	@@echo Cleaning $(TMP_DIR)\* ...
	@@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)
	@@echo Cleaning $(WINDIR)\nmakehlp.obj ...
	@@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj
	@@echo Cleaning $(WINDIR)\nmakehlp.exe ...
	@@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe
	@@echo Cleaning $(WINDIR)\_junk.pch ...
	@@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch
	@@echo Cleaning $(WINDIR)\vercl.x ...
	@@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x
	@@echo Cleaning $(WINDIR)\vercl.i ...
	@@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i
	@@echo Cleaning $(WINDIR)\versions.vc ...
	@@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

hose:
	@@echo Hosing $(OUT_DIR)\* ...
	@@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)
@


1.132
log
@Add netapi32 to the windows link line
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.131 2010/09/09 14:59:24 nijtmans Exp $
d334 1
d802 3
@


1.131
log
@win/rules.vc:   (sync with tcl version)
mingw should always link with -ladvapi32
Remove ascii variant of tkWinPocs table,
it is no longer necessary.
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.130 2010/03/12 15:23:39 nijtmans Exp $
d524 1
a524 1
baselibs   = kernel32.lib user32.lib advapi32.lib ws2_32.lib
@


1.130
log
@Fix [Tcl Bug 2967340]: Static build failure
@
text
@d8 1
a8 1
# 
d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.129 2009/12/12 00:02:36 nijtmans Exp $
d120 1
a120 1
#			    being built with deprecated functions. 
d133 1
a133 1
#		changed.  $(OUT_DIR) is assumed to be 
d524 1
a524 1
baselibs   = kernel32.lib user32.lib ws2_32.lib
@


1.129
log
@Fix dependancies on ${TKSTUBLIB} when
TCL_USE_STATIC_PACKAGES is defined
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.128 2009/11/22 00:40:21 patthoyts Exp $
d241 1
@


1.128
log
@Include tk stubs in the tktest link line due to nijtmans recent changes
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.127 2008/12/28 13:08:39 dkf Exp $
d649 1
a649 1
$(WISH): $(WISHOBJS) $(TKIMPLIB)
d654 1
a654 1
$(WISHC): $(WISHOBJS) $(TKIMPLIB)
d659 2
a660 2
$(TKTEST): $(TKTESTOBJS) $(TKIMPLIB)
	$(link32) $(guilflags) -stack:2300000 -out:$@@ $(guilibs) $(tcllibs) $(TKSTUBLIB) $**
@


1.127
log
@Implementation of TIP #244, PNG image support.
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.126 2008/10/19 21:22:36 patthoyts Exp $
d660 1
a660 1
	$(link32) $(guilflags) -stack:2300000 -out:$@@ $(guilibs) $(tcllibs) $**
@


1.126
log
@msvc uses __inline, so added the necessary macro now that we are using this
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.125 2008/10/18 14:22:22 dkf Exp $
d325 1
@


1.125
log
@Implementation of the [tk busy] command on non-OSX.
Adapted from [Patch 1997907]
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.124 2008/08/25 11:44:04 dkf Exp $
d428 1
a428 1
TK_DEFINES	=-DBUILD_ttk $(OPTDEFINES)  $(CONFIG_DEFS)
d474 2
a475 1
STUB_CFLAGS     = $(cflags) $(cdebug) $(TK_DEFINES)
@


1.124
log
@Split the photo image core into two pieces to make it easier to maintain.
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.123 2008/06/13 05:46:09 mistachkin Exp $
d293 1
@


1.123
log
@TIP 285 Implementation
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.122 2008/05/15 00:06:19 patthoyts Exp $
d326 1
@


1.122
log
@We should use the thread allocator for threaded builds. Added 'tclalloc' option to disable.
@
text
@d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.121 2008/04/20 19:57:03 patthoyts Exp $
d440 3
d486 3
@


1.121
log
@Include ws2_32 in the link list [Bug 19200872]
@
text
@d1 1
a1 1
#------------------------------------------------------------------------------
d13 1
d16 1
a16 1
# RCS: @@(#) $Id: makefile.vc,v 1.120 2008/04/03 17:04:55 patthoyts Exp $
d92 3
a94 1
#		thrdalloc= Use the thread allocator (shared global free pool).
@


1.120
log
@Fixed stubs usage
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.119 2008/04/02 14:39:36 patthoyts Exp $
d510 1
a510 1
baselibs   = kernel32.lib user32.lib
@


1.119
log
@Tweak the debug targets
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.118 2008/04/02 04:30:44 dgp Exp $
d463 1
a463 1
TK_CFLAGS	= $(BASE_CFLAGS) $(TK_DEFINES) -DUSE_TCL_STUBS
d468 3
d505 5
d637 1
a637 1
	$(link32) $(guilflags) -stack:2300000 -out:$@@ $(guilibs) $(TCLIMPLIB) $**
d642 1
a642 1
	$(link32) $(conlflags) -stack:2300000 -out:$@@ $(guilibs) $(TCLIMPLIB) $**
d647 1
a647 1
	$(link32) $(guilflags) -stack:2300000 -out:$@@ $(guilibs) $(TCLIMPLIB) $**
@


1.118
log
@        * generic/tkWindow.c:   Revised package initialization so that
        * unix/Makefile.in:     "tkStubsPtr" is not present in libtk.so, but
        * win/Makefile.in:      is present only in libtkstub.a.  This tightens
        * win/makefile.bc:      up the rules for users of the stubs interfaces.         * win/makefile.vc:      [Tcl Bug 1819422].
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.117 2008/03/18 06:59:04 jenglish Exp $
d546 1
a546 1
	$(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
d548 1
a548 1
	$(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
d561 1
a561 1
	$(TKTEST) "$(ROOT)/tests/ttk/all.tcl" $(TESTFLAGS) | $(CAT32)
d563 1
a563 1
	$(TKTEST) "$(ROOT)/tests/ttk/all.tcl" $(TESTFLAGS) | $(CAT32)
d575 1
a575 1
	$(TKTEST) 
d597 1
a597 1
	$(WISH) <<
a600 11
dbgshell: setup $(WISH)
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
!if $(TCLINSTALL)
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
	windbg $(WISH)

@


1.117
log
@Put ttkStubLib.o in libtkstub instead of libtk.  [Bug 1863007].
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.116 2007/12/14 02:19:42 patthoyts Exp $
a355 1
	$(TMP_DIR)\tkStubLib.obj \
@


1.117.2.1
log
@        * unix/Makefile.in:     Relax constraints in index script so that
        * win/Makefile.in:      each Tk 8.5.* release may be [package require]d
        * win/makefile.vc:      into any Tcl 8.5.* interp.  [Bug 1890438].
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.117 2008/03/18 06:59:04 jenglish Exp $
d900 1
a900 1
if {[catch {package present Tcl 8.5.0-8.6}]} { return }
@


1.117.2.2
log
@        * generic/tkConsole.c:  Relax the runtime version requirements on Tcl
        * generic/tkMain.c:     so that Tk 8.5.8 can [load] into Tcl 8.6 (and
        * generic/tkWindow.c:   later 8.*) interps.
        * library/tk.tcl
        * unix/Makefile.in:
        * win/Makefile.in:
        * win/makefile.vc:
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.117.2.1 2008/10/10 18:55:31 dgp Exp $
d900 1
a900 1
if {[catch {package present Tcl 8.5.0}]} { return }
@


1.116
log
@Support compilation with MSVC9 on AMD64
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.115 2007/12/13 15:28:52 dgp Exp $
d396 1
a396 2
        $(TMP_DIR)\ttkStubInit.obj \
        $(TMP_DIR)\ttkStubLib.obj
d399 1
a399 1
	$(TMP_DIR)\tkStubLib.obj
@


1.115
log
@merge stable branch onto HEAD
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103.2.7 2007/11/28 20:33:16 dgp Exp $
d508 1
d511 1
@


1.114
log
@(bug 1835052) Fix tidy target to remove tktest rather than tcltest
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.113 2007/11/17 21:47:02 patthoyts Exp $
@


1.113
log
@Fix the environment to run only our built version
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.112 2007/10/17 20:53:06 davygrvy Exp $
d941 2
a942 2
	@@echo Removing $(TCLTEST) ...
	@@if exist $(TCLTEST) del $(TCLTEST)
@


1.112
log
@* bitmaps/*.xbm: Changed CVS storage mode from -kb to -kkv as these
are really text files, not binaries.
* win/makefile.vc: Added $(BITMAPDIR) to the search path for the
depend target.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.111 2007/10/16 21:24:05 davygrvy Exp $
d537 3
a539 2
	set TCL_LIBRARY=$(TCL_LIBRARY)
	set TK_LIBRARY=$(TK_LIBRARY)
d541 1
a541 1
	set PATH=$(_TCLDIR)\bin;$(PATH)
d543 1
a543 1
	set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d552 3
a554 2
	set TCL_LIBRARY=$(TCL_LIBRARY)
	set TK_LIBRARY=$(TK_LIBRARY)
d556 1
a556 1
	set PATH=$(_TCLDIR)\bin;$(PATH)
d558 1
a558 1
	set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d567 3
a569 2
	set TCL_LIBRARY=$(TCL_LIBRARY)
	set TK_LIBRARY=$(TK_LIBRARY)
d571 1
a571 1
	set PATH=$(_TCLDIR)\bin;$(PATH)
d573 1
a573 1
	set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d578 3
a580 2
	set TCL_LIBRARY=$(TCL_LIBRARY)
	set TK_LIBRARY=$(TK_LIBRARY)
d582 1
a582 1
	set PATH=$(_TCLDIR)\bin;$(PATH)
d584 1
a584 1
	set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d589 10
a598 4
	set TCL_LIBRARY=$(TCL_LIBRARY)
	set TK_LIBRARY=$(TK_LIBRARY)
        $(WISH) <<
        console show
d601 11
@


1.111
log
@* win/makefile.vc: depend target now works and builds a generated
dependency list with $(TCLTOOLSDIR)/mkdepend.tcl
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.110 2007/10/12 19:01:07 patthoyts Exp $
d794 2
a795 1
		$(WINDIR),$$(WINDIR) $(TTKDIR),$$(TTKDIR) $(XLIBDIR),$$(XLIBDIR) @@<<
@


1.110
log
@Hush.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.109 2007/10/12 18:56:33 patthoyts Exp $
d189 1
a189 1
HAVE_UXTHEME      = 1
a653 17
# Generate the makefile depedancies.
#---------------------------------------------------------------------

depend:
!if !exist($(TCLSH))
	@@echo Build tclsh first!
!else
	set TCL_LIBRARY=$(TCL_LIBRARY)
	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
		-passthru:"-DBUILD_tcl $(TK_INCLUDES:"="")" $(GENERICDIR) \
		$(COMPATDIR) $(WINDIR) @@<<
$(TKOBJS)
<<
!endif


#---------------------------------------------------------------------
a776 4
#---------------------------------------------------------------------
# Dedependency rules
#---------------------------------------------------------------------

d783 21
a808 63
$(GENERICDIR)/default.h: $(WINDIR)/tkWinDefault.h
$(GENERICDIR)/tkButton.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkCanvas.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkEntry.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkFrame.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkListbox.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkMenu.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkMenubutton.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkMessage.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkPanedWindow.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkScale.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkScrollbar.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkText.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkTextIndex.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkTextTag.c: $(GENERICDIR)/default.h
$(GENERICDIR)/tkUndo.c: $(GENERICDIR)/tkUndo.h

$(GENERICDIR)/tkText.c: $(GENERICDIR)/tkText.h
$(GENERICDIR)/tkTest.c: $(GENERICDIR)/tkText.h
$(GENERICDIR)/tkTextBTree.c: $(GENERICDIR)/tkText.h
$(GENERICDIR)/tkTextDisp.c: $(GENERICDIR)/tkText.h
$(GENERICDIR)/tkTextDisp.c: $(GENERICDIR)/tkText.h
$(GENERICDIR)/tkTextImage.c: $(GENERICDIR)/tkText.h
$(GENERICDIR)/tkTextIndex.c: $(GENERICDIR)/tkText.h
$(GENERICDIR)/tkTextMark.c: $(GENERICDIR)/tkText.h
$(GENERICDIR)/tkTextTag.c: $(GENERICDIR)/tkText.h
$(GENERICDIR)/tkTextWind.c: $(GENERICDIR)/tkText.h

$(GENERICDIR)/tkMacWinMenu.c: $(GENERICDIR)/tkMenu.h
$(GENERICDIR)/tkMenu.c: $(GENERICDIR)/tkMenu.h
$(GENERICDIR)/tkMenuDraw.c: $(GENERICDIR)/tkMenu.h
$(WINDIR)/tkWinMenu.c: $(GENERICDIR)/tkMenu.h

$(TTKDIR)/ttkBlink.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkButton.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkCache.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkClamTheme.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkClassicTheme.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkDefaultTheme.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkElements.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkEntry.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkFrame.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkImage.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkInit.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkLabel.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkLayout.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkManager.c: $(TTKDIR)/ttkTheme.h $(TTKDIR)/ttkManager.h
$(TTKDIR)/ttkNotebook.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkPanedwindow.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkProgress.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkScroll.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkScrollbar.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkSeparator.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkSquare.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkState.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkTagSet.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkTheme.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkTrace.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkTrack.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkTreeview.c: $(TTKDIR)/ttkTheme.h
$(TTKDIR)/ttkWidget.c: $(TTKDIR)/ttkTheme.h $(TTKDIR)/ttkWidget.h


@


1.109
log
@Fixed install of tk broken with last commit
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.108 2007/10/12 14:14:54 patthoyts Exp $
d949 1
a949 1
	@@echo installing Tk headers to "$(INCLUDE_INSTALL_DIR)"
d955 1
a955 1
	@@echo installing script library to "$(SCRIPT_INSTALL_DIR)"
@


1.108
log
@Mine all version information from headers.  Sync tcl and tk and bring
extension versions closer together. Try and avoid using tclsh to do
substitutions as we may cross compile.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.107 2007/09/18 16:12:19 dgp Exp $
a410 5
!if $(TCLINSTALL)
TCL_INCLUDES	= -I "$(_TCLDIR)\include"
!else
TCL_INCLUDES	= -I "$(_TCLDIR)\win" -I "$(_TCLDIR)\generic"
!endif
d949 1
a949 1
	@@echo installing Tk headers
d955 1
a955 1
	@@echo installing script library
@


1.107
log
@        * generic/tkStubLib.c:  Remove C library calls from Tk_InitStubs()
        * win/makefile.vc:      so that we don't need the C library linked
        in to libtkStub.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.105 2007/09/12 17:10:39 andreas_kupries Exp $
d187 19
a206 12
!if [nmakehlp -g ../generic/tk.h TK_VERSION] == 85
DOTVERSION	= 8.5
!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 86
DOTVERSION	= 8.6
!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 90
DOTVERSION	= 9.0
!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 0
MSG =^
Cannot get version string from ../generic/tk.h
!error $(MSG)
!endif
VERSION = $(DOTVERSION:.=)
d214 2
a215 2
TKIMPLIB	= "$(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib"
TKLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
d218 1
a218 1
TKSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
d221 2
a222 2
WISH 		= "$(OUT_DIR)\$(WISHNAMEPREFIX)$(VERSION)$(SUFX).exe"
WISHC 		= "$(OUT_DIR)\$(WISHNAMEPREFIX)c$(VERSION)$(SUFX).exe"
d230 1
a230 1
SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(DOTVERSION)
d426 1
a426 1
!if [nmakehlp -f "$(OPTS)" "square"]
a431 1

d444 1
a444 1
!else if "$(MACHINE)" == "IA64"
d446 1
a446 1
cdebug	= -Z7 -Od $(DEBUGFLAGS)
d448 1
a448 1
cdebug	= -Z7 -WX $(DEBUGFLAGS)
d452 1
a452 1
cwarn = -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
a454 6
!if $(FULLWARNINGS)
cflags = $(cflags) -W4
!else
cflags = $(cflags) -W3
!endif

a488 4
!if $(FULLWARNINGS)
lflags = $(lflags) -warn:3
!endif

d679 1
a679 1
HLPBASE		= $(PROJECT)$(VERSION)
d736 1
a736 1
	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)
d744 1
a744 1
set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt" r]
d747 1
a747 1
	if {$$ver == $(VERSION)} {
d752 1
a752 1
	    puts "$$ver != $(VERSION), unfinished code path, die, die!"
d758 1
a758 1
set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt" a]
d762 1
a762 1
	start /wait winhlp32 -g $(DOC_INSTALL_DIR)\tcl$(VERSION).hlp
d804 3
a806 4
!if ![sed "1d" < NUL > NUL]
        sed -f << $** > $@@
s/@@MACHINE@@/$(MACHINE:IX86=X86)/
s/@@TK_WIN_VERSION@@/$(DOTVERSION).0.0/
a807 16
!else
       $(TCLSH) <<
set f [open {$(WINDIR:\=/)/wish.exe.manifest.in} r]
set data [read $$f]
close $$f
set mach {$(MACHINE)}
if {[regexp -nocase {$(IX86)$$} $mach ]} {set mach X86}
set winver "$(DOTVERSION).0.0"
set data [string map [list @@MACHINE@@ $$mach @@TK_WIN_VERSION@@ $$winver] $$data]
puts {Creating $(TMP_DIR:\=/)/wish.exe.manifest}
set f [open {$(TMP_DIR:\=/)/wish.exe.manifest} w]
puts -nonewline $$f $$data
close $$f
exit
<<
!endif
d945 2
a946 2
if {[catch {package present Tcl $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)}]} { return }
package ifneeded Tk $(DOTVERSION)$(TCL_PATCHLEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk]
d1001 6
@


1.106
log
@Add crt flags for tkStubLib now it makes use of C-library functions
@
text
@d473 1
a473 1
STUB_CFLAGS     = $(cflags) $(cdebug) $(crt) $(TK_DEFINES)
@


1.105
log
@
	* win/Makefile.in (install-binaries): Fixed missing brace in the
	* win/makefile.vc (install-binaries): generated package index file.
	  Note: unix/Makefile.in is good.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.104 2007/09/11 17:46:42 dgp Exp $
d473 1
a473 1
STUB_CFLAGS     = $(cflags) $(cdebug) $(TK_DEFINES)
@


1.104
log
@        * generic/tkConsole.c:  Revised calls to Tcl_InitStubs() and
        * generic/tkMain.c:     [package require Tcl] so that Tk Says What
        * generic/tkWindow.c:   It Means using the new facilties of [package]
        * library/tk.tcl:       in Tcl 8.5 about what version(s) of Tcl it
        * unix/Makefile.in:     is willing to work with.  [Bug 1578344].
        * win/Makefile.in:
        * win/makefile.vc:
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103 2007/05/15 23:20:17 patthoyts Exp $
d966 1
a966 1
if {[catch {package present Tcl $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)]} { return }
@


1.103
log
@Test ttk widgets
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.102 2007/05/14 20:58:31 dgp Exp $
d966 1
a966 2
if {![package vsatisfies [package provide Tcl] $(TCL_DOTVERSION)]} { return }
if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)] != 0} { return }
@


1.103.2.1
log
@merge updates from HEAD
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103 2007/05/15 23:20:17 patthoyts Exp $
d966 2
a967 1
if {[catch {package present Tcl $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)]} { return }
@


1.103.2.2
log
@merge updates from HEAD
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103.2.1 2007/09/11 18:32:36 dgp Exp $
d966 1
a966 1
if {[catch {package present Tcl $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)}]} { return }
@


1.103.2.3
log
@merge updates from HEAD
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103.2.2 2007/09/14 16:30:31 dgp Exp $
d187 11
a197 16
# Extra makefile options processing...
!if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]
HAVE_UXTHEME      = 1
TTK_SQUARE_WIDGET = 0
!else
!if [nmakehlp -f $(OPTS) "noxp"]
!message *** Exclude support for XP theme
HAVE_UXTHEME_H  = 0
!else
HAVE_UXTHEME_H  = 1
!endif
!if [nmakehlp -f "$(OPTS)" "square"]
!message *** Include ttk square demo widget
TTK_SQUARE_WIDGET   = 1
!else
TTK_SQUARE_WIDGET   = 0
d199 1
a199 3
!endif

STUBPREFIX = $(PROJECT)stub
d207 2
a208 2
TKIMPLIB	= "$(OUT_DIR)\$(PROJECT)$(TK_VERSION)$(SUFX).lib"
TKLIBNAME	= $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)
d211 1
a211 1
TKSTUBLIBNAME	= $(STUBPREFIX)$(TK_VERSION).lib
d214 2
a215 2
WISH 		= "$(OUT_DIR)\$(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe"
WISHC 		= "$(OUT_DIR)\$(WISHNAMEPREFIX)c$(TK_VERSION)$(SUFX).exe"
d223 1
a223 1
SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TK_DOTVERSION)
d404 5
d419 1
a419 1
!if $(TTK_SQUARE_WIDGET)
d425 1
d438 1
a438 1
!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
d440 1
a440 1
cdebug	= -Zi -Od $(DEBUGFLAGS)
d442 1
a442 1
cdebug	= -Zi -WX $(DEBUGFLAGS)
d446 1
a446 1
cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
d449 6
d489 4
d683 1
a683 1
HLPBASE		= $(PROJECT)$(TK_VERSION)
d740 1
a740 1
	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(TK_VERSION) $(DOCDIR:\=/)
d748 1
a748 1
set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(TK_VERSION).cnt" r]
d751 1
a751 1
	if {$$ver == $(TK_VERSION)} {
d756 1
a756 1
	    puts "$$ver != $(TK_VERSION), unfinished code path, die, die!"
d762 1
a762 1
set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(TK_VERSION).cnt" a]
d766 1
a766 1
	start /wait winhlp32 -g $(DOC_INSTALL_DIR)\tcl$(TK_VERSION).hlp
d808 19
a826 3
	@@nmakehlp -s << $** >$@@
@@MACHINE@@	  $(MACHINE:IX86=X86)
@@TK_WIN_VERSION@@  $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION).0.0
d828 1
d966 2
a967 2
if {[package vcompare [package provide Tcl] $(TCL_PATCH_LEVEL)] != 0} { return }
package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk]
a1021 6
	@@echo Cleaning $(WINDIR)\vercl.x ...
	@@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x
	@@echo Cleaning $(WINDIR)\vercl.i ...
	@@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i
	@@echo Cleaning $(WINDIR)\versions.vc ...
	@@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc
@


1.103.2.4
log
@merge updates from HEAD
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103.2.3 2007/10/15 18:38:41 dgp Exp $
d189 1
a189 1
HAVE_UXTHEME_H    = 1
d654 17
d794 4
a803 21
#---------------------------------------------------------------------
# Generate the makefile depedancies.
#---------------------------------------------------------------------

depend:
!if !exist($(TCLSH))
	@@echo Build tclsh first!
!else
	set TCL_LIBRARY=$(TCL_LIBRARY)
	$(TCLSH) $(TCLTOOLSDIR)\mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
		-passthru:"-DBUILD_tk $(TK_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \
		$(WINDIR),$$(WINDIR) $(TTKDIR),$$(TTKDIR) $(XLIBDIR),$$(XLIBDIR) @@<<
$(TKOBJS)
<<
!endif


#---------------------------------------------------------------------
# Dedependency rules
#---------------------------------------------------------------------

d809 63
@


1.103.2.5
log
@merge updates from HEAD
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103.2.4 2007/10/17 14:37:05 dgp Exp $
d794 1
a794 2
		$(WINDIR),$$(WINDIR) $(TTKDIR),$$(TTKDIR) $(XLIBDIR),$$(XLIBDIR) \
		$(BITMAPDIR),$$(BITMAPDIR) @@<<
@


1.103.2.6
log
@merge updates from 8.5b3
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103.2.5 2007/10/19 14:35:35 dgp Exp $
d537 2
a538 3
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
d540 1
a540 1
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
d542 1
a542 1
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d551 2
a552 3
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
d554 1
a554 1
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
d556 1
a556 1
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d565 2
a566 3
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
d568 1
a568 1
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
d570 1
a570 1
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d575 2
a576 3
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
d578 1
a578 1
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
d580 1
a580 1
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d585 4
a588 10
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
!if $(TCLINSTALL)
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
	$(WISH) <<
	console show
a590 11
dbgshell: setup $(WISH)
	@@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
	@@set TK_LIBRARY=$(TK_LIBRARY:\=/)
	@@set TCLLIBPATH=
!if $(TCLINSTALL)
	@@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	@@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
	windbg $(WISH)

@


1.103.2.7
log
@merge updates from HEAD
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103.2.6 2007/11/21 16:46:31 dgp Exp $
d941 2
a942 2
	@@echo Removing $(TKTEST) ...
	@@if exist $(TKTEST) del $(TKTEST)
@


1.103.2.8
log
@merge updates from HEAD
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.115 2007/12/13 15:28:52 dgp Exp $
a507 1
!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500
a509 1
!endif
@


1.103.2.9
log
@merge updates from HEAD
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.103.2.8 2008/01/23 16:39:14 dgp Exp $
d396 2
a397 1
        $(TMP_DIR)\ttkStubInit.obj
d400 1
a400 1
	$(TMP_DIR)\tkStubLib.obj $(TMP_DIR)\ttkStubLib.obj
@


1.102
log
@        [Tk Bug 1712081]

        * unix/Makefile.in:     Updates to account for new and deleted files
        * win/Makefile.in:      tkStubImg.c and tkOldTest.c.
        * win/makefile.bc:
        * win/makefile.vc:

        * generic/tkOldTest.c (new):    New file used to create testing
        * generic/tkTest.c:             commands for testing various Tk
        * tests/constraints.tcl:        legacy interfaces where a separate
        * tests/image.test:             compilation unit is needed in order
        to #define suitable macros during compilation.  Only the effect of
        USE_OLD_IMAGE on Tk_CreateImageType() is currently tested, but more
        similar testing commands can be added to this same file.  New
        constraint defined to detect presence of the image type provided by
        the new testing code, and a few tests added to exercise it.  Having
        USE_OLD_IMAGE support tested by the default test suite should reduce
        chance of a recurrence of this bug.

        * doc/CrtImgType.3:     Revised docs to better indicate the legacy
        * doc/CrtPhImgFmt.3:    nature of the interfaces supported by
        USE_OLD_IMAGE.

        * generic/tkDecls.h:    make genstubs
        * generic/tkStubInit.c:

        * generic/tk.decls:             Reworked USE_OLD_IMAGE support to use
        * generic/tk.h:                 the same support mechanisms both with
        * generic/tkStubImg.c (deleted):and without a stub-enabled build.  In
        each case, route the legacy calls to Tk_CreateImageType and
        Tk_CreatePhotoImageFormat through the Tk_CreateOldImageType and
        Tk_CreateOldPhotoImageFormat routines.  Add those routines to the
        public stub table so they're available to a stub-enabled extension.
        Remove the definition of Tk_InitImageArgs() and use a macro to
        convert any calls to it in source code into a comment.

        * generic/tkImage.c:    Removed the MODULE_SCOPE declarations that
        * generic/tkImgPhoto.c: broke USE_OLD_IMAGE support.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.101 2007/02/28 05:26:37 chengyemao Exp $
d543 3
a545 1
test: setup $(TKTEST) $(TKLIB) $(CAT32)
d559 14
@


1.101
log
@Added compliler define SUPPORT_CONFIG_EMBEDDED to support config of -use option at Windows
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.100 2007/02/09 06:54:33 mistachkin Exp $
d238 1
d393 1
a393 2
	$(TMP_DIR)\tkStubLib.obj \
	$(TMP_DIR)\tkStubImg.obj
d765 3
a785 3
$(TMP_DIR)\tkStubImg.obj : $(GENERICDIR)\tkStubImg.c
	$(cc32) $(STUB_CFLAGS) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@@ $?

@


1.100
log
@Windows build fixes
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.99 2007/01/19 09:00:30 mistachkin Exp $
d415 1
@


1.99
log
@Build fix for man2tcl.c with MSVC8
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.98 2006/11/03 11:22:22 patthoyts Exp $
d1000 6
@


1.98
log
@Oops. Removing rogue flag
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.97 2006/10/31 22:26:19 patthoyts Exp $
d718 3
a720 1
	$(cc32) -nologo -G4 -ML -O2 -Fo$(@@D)\ $(TCLTOOLSDIR)\$(@@B).c -link -out:$@@
@


1.97
log
@Add manifest merging for MSVC8.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.96 2006/10/31 14:45:04 patthoyts Exp $
d468 1
a468 2
BASE_CFLAGS	= $(cdebug) $(cflags) $(crt) $(TK_INCLUDES) \
                  -DTK_SEND_ENABLED_ON_WINDOWS
@


1.96
log
@Update to support ttk merge.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.95 2006/10/19 00:48:25 patthoyts Exp $
d82 1
a82 1
#		static  =  Builds a static library of the core instead of a
d84 1
a84 1
#		msvcrt  =  Effects the static option only to switch it from
d88 1
a88 1
#		staticpkg = Affects the static option only to switch wishXX.exe
d90 8
a97 7
#		threads =  Turns on full multithreading support.
#		thrdalloc = Use the thread allocator (shared global free pool).
#		symbols =  Adds symbols for step debugging.
#		profile =  Adds profiling hooks.  Map file is assumed.
#		loimpact =  Adds a flag for how NT treats the heap to keep memory
#			   in use, low.  This is said to impact alloc performance.
#		unchecked = Allows a symbols build to not use the debug
d100 3
a102 2
#               noxp =    If you do not have the uxtheme.h header then you cannot
#                         include support for XP themeing.
d416 4
a419 1
		 -DHAVE_UXTHEME_H=1
d468 2
a469 1
BASE_CFLAGS	= $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
d577 7
d602 1
d613 2
d618 2
d623 1
d629 1
@


1.95
log
@generic/tkImgBmap.c: Fixed line endings.
win/makefile.vc:  Patched up build system to manage
win/rules.vc:     AMD64 with MSVC8
win/nmakehlp.c:   Ensure operation without Platform SDK.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.94 2006/09/27 18:43:35 andreas_kupries Exp $
d99 2
d233 2
a235 2
	$(TMP_DIR)\tkSquare.obj \
	$(TMP_DIR)\testMain.obj \
d348 1
d353 36
d397 1
d410 8
a417 1
TK_DEFINES	= $(OPTDEFINES)
d830 30
d884 5
d918 1
d926 7
a932 6
	@@echo Creating package index "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
	-del "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
	echo if {![package vsatisfies [package provide Tcl] $(TCL_DOTVERSION)]} { return } > "$(OUT_DIR)\pkgIndex.tcl"
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)] != 0} { return } >>"$(OUT_DIR)\pkgIndex.tcl"
	echo package ifneeded Tk $(DOTVERSION)$(TCL_PATCHLEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
	$(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\"
d935 2
d938 1
d944 1
d946 3
a948 1
	@@$(CPY) "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
d951 1
d953 1
d956 1
@


1.94
log
@
	* unix/Makefile.in (install-binaries): Added a second guard to the
	* win/Makefile.in: package index file to prevent older versions of
	* win/makefile.vc: Tcl from seeing version numbers which may
	  contain a/b information, and then balking on them. This could
	  otherwise happen when Tcl/Tk 8.4 and 8.5 are installed in the
	  same directory, seeing each other. [SF Tk Bug 1566418].
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.93 2006/09/22 19:02:08 andreas_kupries Exp $
d19 3
a21 2
# or with the MS Platform SDK (MSSDK)
!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(MSSDK)
d171 1
a171 1
!error $(MSG) 
d192 1
a192 1
Can't get version string from ../generic/tk.h
d379 3
a381 3
### This cranks the optimization level up.  We can't use -02 because
### sometimes it causes problems.
cdebug	= -Oti
d386 2
a387 3
### Warnings are too many, can't support warnings into errors for
### an IA64 build.
cdebug	= -Z7 -Od -GZ
d389 1
a389 1
cdebug	= -Z7 -WX -Od -GZ
d392 3
a394 2
# declarations common to all compiler options
cflags = -nologo -c -YX -Fp$(TMP_DIR)^\
a401 8
!if $(PENT_0F_ERRATA)
cflags = $(cflags) -QI0f
!endif

!if $(ITAN_B_ERRATA)
cflags = $(cflags) -QIA64_Bx
!endif

d416 2
a417 2
BASE_CLFAGS	= $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
TK_CFLAGS	= $(BASE_CLFAGS) $(TK_DEFINES) -DUSE_TCL_STUBS
d419 1
a419 1
WISH_CFLAGS	= $(BASE_CLFAGS) $(TK_DEFINES)
d433 2
a434 2
# declarations common to all linker options
lflags	= -nologo -machine:$(MACHINE) $(ldebug)
d445 1
a445 1
# align sections for PE size savings.
d448 1
a448 1
# align sections for speed in loading by choosing the virtual page size.
d460 1
a460 1
baselibs  = kernel32.lib user32.lib
d474 1
a474 1
TESTFLAGS   = -file $(TESTPAT)
d723 6
d743 1
@


1.93
log
@
	* generic/tkConsole.c: TIP #268 update regarding registered package
	* generic/tkMain.c:    version, now using full patchlevel instead of
	* generic/tkWindow.c:  major.minor
	* library/tk.tcl:
	* unix/configure:
	* unix/Makefile.in:
	* unix/tcl.m4:
	* win/configure:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/rules.vc:
	* win/tcl.m4:
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.92 2005/12/09 00:48:54 das Exp $
d845 2
a846 1
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
@


1.92
log
@	* generic/tkInt.decls:   move all platform test sources from tk lib into
	* generic/tkTest.c:      tktest directly, removes requirement to export
	* macosx/tkMacOSXTest.c: TkplatformtestInit from internal stubs table.
	* unix/Makefile.in:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/tkWinTest.c:

	* generic/tkIntPlatDecls.h:
	* generic/tkStubInit.c: regen.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.91 2005/12/08 22:14:15 hobbs Exp $
d845 2
a846 2
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
	echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
@


1.91
log
@add tkWinTest.obj to regular Tk obj for TkplatformtestInit
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.90 2005/12/08 20:25:42 hobbs Exp $
d232 2
a233 1
	$(TMP_DIR)\testMain.obj
a267 1
	$(TMP_DIR)\tkWinTest.obj \
d703 3
@


1.90
log
@	* win/tcl.m4:       Add build support for Windows-x64 builds.
	* win/configure:    --enable-64bit now accepts =amd64|ia64 for
	* win/Makefile.in:  Windows 64-bit build variants (default: amd64)
	* win/makefile.vc:  [Bug 1369597]
	* win/configure.in: Add CE build support (some C code fixes needed)
	* win/wish.exe.manifest.in (new):     manifest must map in MACHINE
	* win/rc/wish.exe.manifest (removed): and VERSION to be correct.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.89 2005/03/08 21:55:49 hobbs Exp $
d232 1
a232 2
	$(TMP_DIR)\testMain.obj \
	$(TMP_DIR)\tkWinTest.obj
d267 1
a702 3
$(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?

@


1.89
log
@	* win/makefile.vc: clarify necessary defined vars that can come
	from MSVC or the Platform SDK.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.88 2004/11/26 20:53:26 davygrvy Exp $
d116 1
a116 1
#	MACHINE=(IX86|IA64|ALPHA)
d468 5
d729 16
d818 1
a818 1
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) \
d824 3
@


1.88
log
@* win/makefile.vc: Shell targets needed more stack space.  [Bug 1066755]
@
text
@d11 1
a11 1
# Copyright (c) 2001 ActiveState Corporation.
d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.87 2004/10/27 00:56:33 davygrvy Exp $
d18 3
a20 1
!if !defined(MSDEVDIR) && !defined(MSVCDIR)
d22 3
a24 2
You will need to run vcvars32.bat from Developer Studio, first, to setup^
the environment.  Jump to this line to read the new instructions.
d31 5
a35 4
# 1)  It is now necessary to have MSVCDir set in the environment.  This is used
#     as a check to see if vcvars32.bat had been run prior to running nmake or
#     during the install of Microsoft Developer Studio, MSVCDir had been set
#     globally and the PATH adjusted.  Either way is valid.
d38 3
a40 3
#     directory to setup the proper environment, if needed, for your current
#     setup.  This is a needed bootstrap requirement and allows the swapping of
#     different environments to be easier.
d43 2
a44 2
#     vcvars32.bat according to the instructions for it.  This can also turn on
#     the 64-bit compiler, if your SDK has it.
@


1.87
log
@* win/tkWinX.c:		     Signature for tkWinXCleanup needed to be
* generic/tkInt.decls:       changed so it matches the Tcl_ExitProc
* generic/tkIntPlatDecls.h:  typedef to avoid a bad-style cast.

* win/makefile.vc: Force TCL_LIBRARY envar when calling tclsh
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.86 2004/09/16 17:52:08 davygrvy Exp $
d549 1
a549 1
	$(link32) $(guilflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**
d552 1
a552 1
	$(link32) $(conlflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**
d555 1
a555 1
	$(link32) $(guilflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**
@


1.86
log
@added VC7-safe environment check used in the Tcl makefile.vc
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.85 2004/09/10 12:32:24 vincentdarley Exp $
d571 1
d585 1
@


1.85
log
@include tkTest.c in list of files which depend on tkText.h
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.84 2004/09/06 13:45:37 patthoyts Exp $
d18 1
a18 1
!if "$(MSDEVDIR)" == ""
d196 2
d490 1
a490 1
	set TK_LIBRARY=$(ROOT)/library
d504 1
a504 1
	set TK_LIBRARY=$(ROOT)/library
d514 1
a514 1
	set TK_LIBRARY=$(ROOT)/library
@


1.84
log
@Set TK_LIBRARY when execing Tk apps (test, runtest, rundemo).
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.83 2004/03/09 03:35:08 davygrvy Exp $
d739 1
@


1.83
log
@Checks MSDevDir, not MSVCDir envar.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.82 2004/02/08 01:38:03 davygrvy Exp $
d488 1
d502 1
d512 1
@


1.82
log
@* win/makefile.vc:
* win/rules.vc:
* win/rc/tk.rc:
* win/rc/wish.rc:  Now supports the 'unchecked' option when building.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.81 2004/02/01 10:41:18 davygrvy Exp $
d18 1
a18 1
!if "$(MSVCDIR)" == ""
@


1.81
log
@* win/makefile.vc: General clean-up.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.80 2004/01/15 21:46:22 davygrvy Exp $
d72 1
a72 1
#	OPTS=static,msvcrt,linkexten,threads,symbols,profile,none
d91 3
d370 12
a381 6
!if $(DEBUG)
!if "$(MACHINE)" == "IA64"
cdebug = -Od -Zi
!else
cdebug = -Z7 -Od -WX -GZ
!endif
d383 1
a383 3
# This cranks the optimization level up.  We can't use -02 because sometimes
# it causes problems.
cdebug = -Oti
d404 1
a404 1
!if $(DEBUG)
d410 1
a410 1
!if $(DEBUG)
d786 2
a787 1
	    -d DEBUG=$(DEBUG) -d TCL_THREADS=$(TCL_THREADS) \
@


1.80
log
@* win/tkWinSendCom.c:  Placed the requirement for the special COM
libraries into the object file itself with #paragma comment (lib, ...)
when built with VC++.  This will simplify linking for users of the
static library.  uuid.lib is required for VC5.2, but is implicit
with VC6.

* win/makefile.vc:  Removed 'ole32.lib oleaut32.lib uuid.lib' from
$(baselibs).
@
text
@d12 1
a12 1
# Copyright (c) 2001-2003 David Gravereaux.
d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.79 2004/01/13 13:43:36 vincentdarley Exp $
d101 8
d371 1
a371 1
cdebug = -Z7 -Od -WX
d380 7
a386 1
cflags = -nologo -c -W3 -YX -Fp$(TMP_DIR)^\
d430 4
a549 28
install-binaries:
	@@$(CPY) "$(WISH)" "$(BIN_INSTALL_DIR)\"
!if $(TKLIB) != $(TKIMPLIB)
	@@$(CPY) "$(TKLIB)" "$(BIN_INSTALL_DIR)\"
!endif
	@@$(CPY) "$(TKIMPLIB)" "$(LIB_INSTALL_DIR)\"
	@@$(CPY) "$(TKSTUBLIB)" "$(LIB_INSTALL_DIR)\"
!if !$(STATIC_BUILD)
	@@echo Creating package index "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
	-del "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
	echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
	$(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\"
!endif

install-libraries:
	@@$(CPY) "$(GENERICDIR)\tk.h" "$(INCLUDE_INSTALL_DIR)\"
	@@$(CPY) "$(GENERICDIR)\tkDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@$(CPY) "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@$(CPY) "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@$(CPY) "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11\"
	@@$(CPY) "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
	@@$(CPY) "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
	@@$(CPY) "$(ROOT)\library\demos\*" "$(SCRIPT_INSTALL_DIR)\demos\"
	@@$(CPY) "$(ROOT)\library\demos\images\*" "$(SCRIPT_INSTALL_DIR)\demos\images\"
	@@$(CPY) "$(ROOT)\library\images\*" "$(SCRIPT_INSTALL_DIR)\images\"
	@@$(CPY) "$(ROOT)\library\msgs\*" "$(SCRIPT_INSTALL_DIR)\msgs\"

d673 3
a675 5
!if $(TCL_USE_STATIC_PACKAGES)
	$(cc32) $(WISH_CFLAGS) -DTK_TEST -DTCL_USE_STATIC_PACKAGES -Fo$@@ $?
!else
	$(cc32) $(WISH_CFLAGS) -DTK_TEST -Fo$@@ $?
!endif
d687 3
a689 5
!if $(TCL_USE_STATIC_PACKAGES)
	$(cc32) $(WISH_CFLAGS) -DTCL_USE_STATIC_PACKAGES -Fo$@@ $?
!else
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?
!endif
d779 40
a818 3
		-d DEBUG=$(DEBUG) -d TCL_THREADS=$(TCL_THREADS) \
		-d STATIC_BUILD=$(STATIC_BUILD) \
		$<
d824 14
d839 2
a840 5
	-$(RMDIR) $(TMP_DIR)

hose: clean
	-$(RMDIR) $(OUT_DIR)

d842 3
a844 2
.SUFFIXES:
.SUFFIXES:.c .rc
@


1.79
log
@uuid.lib needed by tkWinSend
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.78 2004/01/13 02:01:39 davygrvy Exp $
d436 1
a436 1
baselibs  = kernel32.lib user32.lib ole32.lib oleaut32.lib uuid.lib
d802 1
a802 1
	-@@$(RMDIR) $(TMP_DIR)
d805 1
a805 1
	-@@$(RMDIR) $(OUT_DIR)
@


1.78
log
@	* win/rc/tk.rc:
	* win/rc/tk_base.rc:
	* win/rc/wish.rc:
	* win/makefile.vc:  Refreshed how the resource files are built.
	Should be a bit easier for people linking with a static Tk library.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.77 2003/12/23 02:59:12 davygrvy Exp $
d436 1
a436 1
baselibs  = kernel32.lib user32.lib ole32.lib oleaut32.lib
@


1.77
log
@Uses new features of nmakehlp to get the version strings from header files
without the use of hardcoded values.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.76 2003/11/17 02:15:32 dgp Exp $
d436 2
a437 2
baselibs  = kernel32.lib advapi32.lib user32.lib ole32.lib oleaut32.lib uuid.lib
guilibs	  = $(baselibs) shell32.lib gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
d615 1
a615 1
	$(CPY) $(WINDIR)\$(@@F) $(@@D)
d793 2
a794 9
!if $(DEBUG)
		-d DEBUG \
!endif
!if $(TCL_THREADS)
		-d TCL_THREADS \
!endif
!if $(STATIC_BUILD)
		-d STATIC_BUILD \
!endif
@


1.76
log
@        * win/makefile.vc:      Restored consistency of pkgIndex.tcl file
        with that generated by Makefile.

	Let's discuss whether there's really need for a change, and if so,
	let's make it consistently in all Makefiles.
@
text
@d12 1
a12 1
# Copyright (c) 2001-2002 David Gravereaux.
d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.74 2003/10/14 15:35:52 patthoyts Exp $
d168 11
a178 1
DOTVERSION = 8.5
a183 4

#TCLIMPLIBNAME	= tcl$(VERSION)$(SUFX).lib
#TCLLIB	= tcl$(VERSION)$(SUFX).$(EXT)
#TCLSTUBLIBNAME	= tclstub$(VERSION).lib
@


1.75
log
@Fixes pkgIndex.tcl generation so a symbols build is loaded when Tcl is symbols
@
text
@d536 2
a537 6
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return }> "$(OUT_DIR)\pkgIndex.tcl"
	echo if {[info exists ::tcl_platform(debug)]} {>> "$(OUT_DIR)\pkgIndex.tcl"
	echo     package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin tk$(VERSION)g.dll] Tk]>> "$(OUT_DIR)\pkgIndex.tcl"
	echo } else {>> "$(OUT_DIR)\pkgIndex.tcl"
	echo    package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin tk$(VERSION).dll] Tk]>> "$(OUT_DIR)\pkgIndex.tcl"
	echo }>> "$(OUT_DIR)\pkgIndex.tcl"
@


1.74
log
@	* win/makefile.vc:  Applied patches from tcl bug #801467 from
	* win/winMain.c:    Joe Mistachkin
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.73 2003/09/26 23:59:26 patthoyts Exp $
d536 6
a541 2
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
	echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
@


1.73
log
@	* win/makefile.vc:    Implementation of TIP #150, "Provide
	* win/tkWinSend.c:    'send' command for Windows"
	* win/tkWinSendCom.h:
	* win/tkWinSendCom.c:
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.72 2003/08/25 20:35:59 davygrvy Exp $
d20 1
a20 1
You'll need to run vcvars32.bat from Developer Studio, first, to setup^
d394 1
d704 1
a704 1
	$(cc32) $(cdebug) $(cflags) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@@ $?
d707 1
a707 1
	$(cc32) $(cdebug) $(cflags) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@@ $?
@


1.72
log
@Don't do a string compare on the $(DBGX) variable, use the $(DEBUG)
boolean directly.  Also, don't try to regen the stubs table if $(TCLSH) doesn't
exist.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.71 2003/05/13 14:15:08 vincentdarley Exp $
d244 1
d429 1
a429 1
baselibs  = kernel32.lib advapi32.lib user32.lib
@


1.71
log
@space in path bug fix
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.70 2003/03/23 02:17:44 kennykb Exp $
d376 3
a378 1
!if "$(DBGX)" == ""
d380 1
d382 2
a383 2
crt = -MDd
!endif
a384 1
!if "$(DBGX)" == ""
a385 2
!else
crt = -MTd
d558 3
d563 1
@


1.70
log
@Corrected several problems that prevented OPTS=symbols from building
properly. [Patch 707792] Thanks to Joe Mistachkin for the fixes.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.69 2003/03/11 23:31:55 kennykb Exp $
d659 1
a659 1
set f [open $(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt a]
@


1.69
log
@Backported the code that makes the makefile build pkgIndex.tcl as part
of the install step.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.68 2003/03/04 23:50:49 dgp Exp $
d376 2
a377 1
crt = -MD$(DBGX)
d379 8
a386 1
crt = -MT$(DBGX)
d461 1
a461 1
	$(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
d463 1
a463 1
	$(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
@


1.68
log
@        * README:                               Bumped version number of
        * generic/tk.h:                         Tk to 8.5a0.
        * library/tk.tcl:
        * mac/README:
        * macosx/Wish.pbproj/project.pbxproj:
        * unix/README:
        * unix/configure.in:
        * unix/tk.spec:
        * win/README:
        * win/configure.in:
        * win/makefile.vc:
        * win/tcl.m4:

        * unix/configure:      autoconf
        * win/configure:
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67 2003/02/14 20:30:36 davygrvy Exp $
d523 7
@


1.67
log
@matched to the Tcl one.  build option 'linkexten' renamed to 'staticpkg'.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.66 2002/12/10 22:06:40 davygrvy Exp $
d168 1
a168 1
DOTVERSION = 8.4
@


1.67.2.1
log
@Backported the code that makes the makefile build pkgIndex.tcl as part
of the install step.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.69 2003/03/11 23:31:55 kennykb Exp $
d168 1
a168 1
DOTVERSION = 8.5
a522 7
!if !$(STATIC_BUILD)
	@@echo Creating package index "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
	-del "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
	echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
	$(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\"
!endif
@


1.67.2.2
log
@Backed the version to 8.4 on the 8.4 branch.
(I just loathe sticky tags).
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.1 2003/03/11 23:48:26 kennykb Exp $
d168 1
a168 1
DOTVERSION = 8.4
@


1.67.2.3
log
@Corrected several problems that prevented OPTS=symbols from building
properly. [Patch 707792] Thanks to Joe Mistachkin for the fixes.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.2 2003/03/13 16:41:48 kennykb Exp $
d376 1
a376 2
!if "$(DBGX)" == ""
crt = -MD
d378 1
a378 8
crt = -MDd
!endif
!else
!if "$(DBGX)" == ""
crt = -MT
!else
crt = -MTd
!endif
d453 1
a453 1
	$(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
d455 1
a455 1
	$(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
@


1.67.2.4
log
@Fixes pkgIndex.tcl generation so a symbols build is loaded when Tcl is symbols
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.3 2003/03/23 02:25:21 kennykb Exp $
d534 2
a535 6
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return }> "$(OUT_DIR)\pkgIndex.tcl"
	echo if {[info exists ::tcl_platform(debug)]} {>> "$(OUT_DIR)\pkgIndex.tcl"
	echo     package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin tk84g.dll] Tk]>> "$(OUT_DIR)\pkgIndex.tcl"
	echo } else {>> "$(OUT_DIR)\pkgIndex.tcl"
	echo    package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin tk84.dll] Tk]>> "$(OUT_DIR)\pkgIndex.tcl"
	echo }>> "$(OUT_DIR)\pkgIndex.tcl"
@


1.67.2.5
log
@        * win/makefile.vc:      Restored consistency of pkgIndex.tcl file
        with that generated by Makefile.
@
text
@d534 6
a539 2
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
	echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
@


1.67.2.6
log
@Apply fix from tcl bug #950049 for make docs.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.5 2003/11/17 02:20:20 dgp Exp $
d659 1
a659 1
set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt" a]
@


1.67.2.7
log
@* win/makefile.vc:  Backport to the most recent
* win/rules.vc:     changes on the HEAD.
* win/nmakehlp.c:
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.6 2004/05/10 08:30:30 patthoyts Exp $
d18 1
a18 1
!if !defined(MSDEVDIR) && !defined(MSVCDIR)
d168 1
a168 13
!if [nmakehlp -g ../generic/tk.h TK_VERSION] == 84
DOTVERSION	= 8.5
!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 85
DOTVERSION	= 8.5
!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 86
DOTVERSION	= 8.6
!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 90
DOTVERSION	= 9.0
!elseif [nmakehlp -g ../generic/tk.h TK_VERSION] == 0
MSG =^
Can't get version string from ../generic/tk.h
!error $(MSG)
!endif
d175 3
a177 1
TK_LIBRARY	= $(ROOT)\library
a454 1
	set TK_LIBRARY=$(TK_LIBRARY)
a467 1
	set TK_LIBRARY=$(TK_LIBRARY)
a557 1
	set TCL_LIBRARY=$(TCL_LIBRARY)
a569 1
	set TCL_LIBRARY=$(TCL_LIBRARY)
@


1.67.2.8
log
@* win/makefile.vc (DOTVERSION): Was installing 8.4 relabelled as 8.5
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.7 2004/10/27 00:36:33 davygrvy Exp $
d169 1
a169 1
DOTVERSION	= 8.4
@


1.67.2.9
log
@	* win/makefile.vc: clarify necessary defined vars that can come
	from MSVC or the Platform SDK.
@
text
@d11 1
a11 1
# Copyright (c) 2001-2005 ActiveState Corporation.
d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.8 2004/10/29 11:52:42 patthoyts Exp $
d18 1
a18 3
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
# or with the MS Platform SDK (MSSDK)
!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(MSSDK)
d20 2
a21 3
You need to run vcvars32.bat from Developer Studio or setenv.bat from the^
Platform SDK first to setup the environment.  Jump to this line to read^
the build instructions.
d28 4
a31 5
# 1)  It is now necessary to have MSVCDir, MSDevDir or MSSDK set in the
#     environment.  This is used as a check to see if vcvars32.bat had been
#     run prior to running nmake or during the installation of Microsoft
#     Visual C++, MSVCDir had been set globally and the PATH adjusted.
#     Either way is valid.
d34 3
a36 3
#     directory to setup the proper environment, if needed, for your
#     current setup.  This is a needed bootstrap requirement and allows the
#     swapping of different environments to be easier.
d39 2
a40 2
#     vcvars32.bat according to the instructions for it.  This can also
#     turn on the 64-bit compiler, if your SDK has it.
@


1.67.2.10
log
@	* win/tcl.m4:      Add build support for Windows-x64 builds.
	* win/configure:   --enable-64bit now accepts =amd64|ia64 for
	* win/Makefile.in: Windows 64-bit build variants (default: amd64)
	* win/makefile.vc: [Bug 1369597]
	* win/configure.in:
	* win/wish.exe.manifest.in (new):     manifest must map in MACHINE
	* win/rc/wish.exe.manifest (removed): and VERSION to be correct.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.9 2005/03/08 21:54:01 hobbs Exp $
a442 5
# Avoid 'unresolved external symbol __security_cookie' errors.
# c.f. http://support.microsoft.com/?id=894573
!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
baselibs   = $(baselibs) bufferoverflowU.lib
!endif
a725 15
$(TMP_DIR)\wish.exe.manifest: $(WINDIR)\wish.exe.manifest.in
	$(TCLSH) <<
puts "Creating wish.exe.manifest ..."
set f [open "$(WINDIR:\=/)/wish.exe.manifest.in" r]
set data [read $$f]
close $$f
set f [open "$(TMPDIR:\=/)/wish.exe.manifest" w]
set mach "$(MACHINE)"
if {[regexp -nocase {^(|IX86)$$} $$mach]} { set mach "X86" }
# Exact version is not critical in the manifest
set winver "$(DOTVERSION).0.0"
puts $$f -nonewline [string map [list @@MACHINE@@ $$mach @@TK_WIN_VERSION@@	$$winver] $$data]
close $$f
<<

d797 1
a797 1
{$(RCDIR)}.rc{$(TMP_DIR)}.res: $(TMP_DIR)\wish.exe.manifest
@


1.67.2.11
log
@restored the ability to build from makefile.vc
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.10 2005/11/30 00:19:01 hobbs Exp $
d733 2
a734 1
set f [open {$(WINDIR:\=/)/wish.exe.manifest.in} r]
d737 4
a740 2
set mach {$(MACHINE)}
if {[regexp -nocase {$(IX86)$$} $mach ]} {set mach X86}
d742 1
a742 4
set data [string map [list @@MACHINE@@ $$mach @@TK_WIN_VERSION@@ $$winver] $$data]
puts {Creating $(TMP_DIR:\=/)/wish.exe.manifest}
set f [open {$(TMP_DIR:\=/)/wish.exe.manifest} w]
puts -nonewline $$f $$data
a743 1
exit
d817 2
d820 1
a820 3
RCDEBUG = -d DEBUG
!else
RCDEBUG = 
d823 1
a823 3
RCTHREADS = -d TCL_THREADS
!else
RCTHREADS =
d826 1
a826 3
RCSTATIC = -d STATIC_BUILD
!else
RCSTATIC =
d828 1
a828 16

$(TMP_DIR)\tk.res: $(RCDIR)\tk.rc $(TMP_DIR)\wish.exe.manifest
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" $(TCL_INCLUDES) \
		$(RCDEBUG) $(RCTHREADS) $(RCSTATIC) \
		$(RCDIR)\tk.rc

$(TMP_DIR)\tk_base.res: $(RCDIR)\tk_base.rc $(TMP_DIR)\wish.exe.manifest
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) \
		$(RCDEBUG) $(RCTHREADS) $(RCSTATIC) \
		-d MANIFEST_FILE="$(TMP_DIR)\wish.exe.manifest"
		$(RCDIR)\tk_base.rc

$(TMP_DIR)\wish.res: $(RCDIR)\wish.rc $(TMP_DIR)\wish.exe.manifest
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) -i "$(TMP_DIR)" \
		$(RCDEBUG) $(RCTHREADS) $(RCSTATIC) \
		$(RCDIR)\wish.rc
@


1.67.2.12
log
@simplified makefile.vc a little bit
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.11 2005/12/01 17:51:30 kennykb Exp $
d834 1
a834 1
{$(RCDIR)}.rc{$(TMP_DIR)}.res:
d837 1
a837 1
		$<
d839 10
a848 2
$(TMP_DIR)\tk.res: $(TMP_DIR)\wish.exe.manifest
$(TMP_DIR)\wish.res: $(TMP_DIR)\wish.exe.manifest
@


1.67.2.13
log
@Avoid pipe problems on Win98
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.12 2005/12/01 18:00:00 kennykb Exp $
d483 1
a483 2
	$(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) > tests.log
	type tests.log | more
@


1.67.2.14
log
@Sync with tcl to enable building with VC8 (VS2005 C compiler)
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.13 2006/03/28 22:23:53 patthoyts Exp $
d19 2
a20 3
# or with the MS Platform SDK (MSSDK). Visual Studio .NET 2003 and 2005 define
# VCINSTALLDIR instead.
!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(MSSDK) && !defined(VCINSTALLDIR)
d159 1
a159 1
!error $(MSG)
d172 13
a184 1
DOTVERSION = 8.4
d224 1
a224 2
	$(TMP_DIR)\tkWinTest.obj \
        $(TMP_DIR)\wish.res
d366 3
a368 4
!if !$(DEBUG)
!if $(OPTIMIZING)
### This cranks the optimization level to maximize speed
cdebug	= -O2 $(OPTIMIZATIONS)
d370 1
a370 1
cdebug	=
a371 3
!else if "$(MACHINE)" == "IA64"
### Warnings are too many, can't support warnings into errors.
cdebug	= -Z7 -Od $(DEBUGFLAGS)
d373 3
a375 1
cdebug	= -Z7 -WX $(DEBUGFLAGS)
d378 10
a387 3
### Declarations common to all compiler options
cwarn = -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\
d419 1
a419 1
### Declarations common to all linker options
d427 1
a427 1
### Align sections for PE size savings.
d430 1
a430 1
### Align sections for speed in loading by choosing the virtual page size.
a523 1
	$(_VC_MANIFEST_EMBED_DLL)
a533 1
	$(_VC_MANIFEST_EMBED_EXE)
a536 1
	$(_VC_MANIFEST_EMBED_EXE)
d540 1
a540 1
	$(_VC_MANIFEST_EMBED_EXE)
a544 1
	$(_VC_MANIFEST_EMBED_EXE)
@


1.67.2.15
log
@
	* generic/tkConsole.c: TIP #268 update regarding registered package
	* generic/tkMain.c:    version, now using full patchlevel instead of
	* generic/tkWindow.c:  major.minor
	* library/tk.tcl:
	* unix/configure:
	* unix/Makefile.in:
	* unix/tcl.m4:
	* win/configure:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/rules.vc:
	* win/tcl.m4:
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.14 2006/06/14 23:52:01 patthoyts Exp $
d545 2
a546 2
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
	echo package ifneeded Tk $(DOTVERSION)$(TCL_PATCHLEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
@


1.67.2.16
log
@
	* generic/tkConsole.c: Complete reversal of the changes of Sep 22.
	* generic/tkMain.c:    For compat reason the Tcl core will not change
	* generic/tkWindow.c:  the registered version to include the patchlevel,
	* library/tk.tcl:      making the changes to Tk unnecessary.
	* unix/configure:
	* unix/Makefile.in:
	* unix/tcl.m4:
	* win/configure:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/rules.vc:
	* win/tcl.m4:
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.15 2006/09/22 19:01:52 andreas_kupries Exp $
d545 2
a546 2
	echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
	echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
@


1.67.2.17
log
@	* win/makefile.vc:  Support MSVC8 and AMD64 target. Also try using
	* win/rules.vc:     sed to generate the manifest (cross-compile cannot
	* win/nmakehlp.c:   execute tclsh). If no sed, use the tclsh exe.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.16 2006/09/25 17:28:21 andreas_kupries Exp $
a373 6
!if $(FULLWARNINGS)
cflags = $(cflags) -W4
!else
cflags = $(cflags) -W3
!endif

d388 2
a389 2
BASE_CFLAGS	= $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
TK_CFLAGS	= $(BASE_CFLAGS) $(TK_DEFINES) -DUSE_TCL_STUBS
d391 1
a391 1
WISH_CFLAGS	= $(BASE_CFLAGS) $(TK_DEFINES)
d405 1
a405 5
lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)

!if $(FULLWARNINGS)
lflags = $(lflags) -warn:3
!endif
a721 6
!if ![sed "1d" < NUL > NUL]
        sed -f << $** > $@@
s/@@MACHINE@@/$(MACHINE:IX86=X86)/
s/@@TK_WIN_VERSION@@/$(DOTVERSION).0.0/
<<
!else
a735 1
!endif
@


1.67.2.18
log
@Fix for AMD64 symbols builds
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.67.2.17 2006/09/26 23:55:50 patthoyts Exp $
d106 1
a106 1
#	MACHINE=(IX86|IA64|AMD64|ALPHA)
d363 1
a363 1
!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
d365 1
a365 1
cdebug	= -Zi -Od $(DEBUGFLAGS)
d367 1
a367 1
cdebug	= -Zi -WX $(DEBUGFLAGS)
d451 1
a451 1
TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
a545 1
        @@echo installing binaries in "$(BIN_INSTALL_DIR)"
d553 5
a557 4
	@@-del "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
	@@echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl"
	@@echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl"
	@@$(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\"
a560 1
        @@echo installing headers in "$(INCLUDE_INSTALL_DIR)"
a565 1
        @@echo installing library files in "$(SCRIPT_INSTALL_DIR)"
d567 3
a571 3
        @@echo installing demo files in "$(SCRIPT_INSTALL_DIR)\demos"
	@@$(CPY) "$(ROOT)\library\demos\*" "$(SCRIPT_INSTALL_DIR)\demos\"
	@@$(CPY) "$(ROOT)\library\demos\images\*" "$(SCRIPT_INSTALL_DIR)\demos\images\"
@


1.66
log
@* win/makefile.vc: tclThreadTest.obj not required to link
tktest.exe [Bug 651396]
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.65 2002/11/04 07:49:43 davygrvy Exp $
d50 1
a50 1
#	console-wish -- builds a console version of wish.
d83 1
a83 1
#		linkexten = Affects the static option only to switch wishXX.exe
d86 1
d89 2
a190 2
RMDIR		= .\rmd.bat
RM		= del
d440 1
a440 1
console-wish : $(WISHC)
@


1.65
log
@	* win/winMain.c (Tcl_AppInit): Calls Registry_Init() and
	Dde_Init() when STATIC_BUILD and TCL_USE_STATIC_PACKAGES macros
	are set.

	* win/makefile.vc:  linkexten option now sets the
	TCL_USE_STATIC_PACKAGES	macro which also adds the registry and
	dde static lib files to the link of the shell. [Patch 479697]

	* win/rules.vc: Matches the one from Tcl.

	* win/buildall.vc.bat: More useful commentary.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.64 2002/11/01 18:33:54 andreas_kupries Exp $
d209 1
a209 2
	$(TMP_DIR)\tkWinTest.obj \
	$(TCLTMP_DIR)\tclThreadTest.obj
@


1.64
log
@
	* win/makefile.vc (TCLREGLIBNAME): Updated to registry 1.1.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.63 2002/08/14 15:31:21 vincentdarley Exp $
a157 24
_INSTALLDIR	= $(INSTALLDIR:/=\)

!if !defined(TCLDIR)
!if exist($(_INSTALLDIR)\include\tcl.h)
TCLINSTALL	= 1
_TCLDIR		= $(_INSTALLDIR)
!else
MSG=^
Don't know where tcl.h is.  Set the _TCLDIR macro.
!error $(MSG)
!endif
!else
_TCLDIR	= $(TCLDIR:/=\)
!if exist($(_TCLDIR)\include\tcl.h)
TCLINSTALL	= 1
!elseif exist($(_TCLDIR)\generic\tcl.h)
TCLINSTALL	= 0
!else
MSG =^
Don't know where tcl.h is.  the TCLDIR macro doesn't appear correct.
!error $(MSG)
!endif
!endif

d172 3
a174 6
TCLIMPLIBNAME	= tcl$(VERSION)$(SUFX).lib
TCLLIBNAME	= tcl$(VERSION)$(SUFX).$(EXT)
TCLSTUBLIBNAME	= tclstub$(VERSION).lib

TCLREGLIBNAME	= tclreg11$(SUFX:t=).lib
TCLDDELIBNAME	= tcldde12$(SUFX:t=).lib
d176 1
a176 1
TKIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
d178 1
a178 1
TKLIB		= $(OUT_DIR)\$(TKLIBNAME)
d181 1
a181 23
TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)

!if $(TCLINSTALL)
TCLSH		= $(_INSTALLDIR)\bin\tclsh$(VERSION)$(SUFX).exe
TCLSTUBLIB	= $(_INSTALLDIR)\lib\$(TCLSTUBLIBNAME)
TCLIMPLIB	= $(_INSTALLDIR)\lib\$(TCLIMPLIBNAME)
TCL_LIBRARY	= $(_INSTALLDIR)\lib
TCLREGLIB	= $(_INSTALLDIR)\lib\$(TCLREGLIBNAME)
TCLDDELIB	= $(_INSTALLDIR)\lib\$(TCLDDELIBNAME)
TCLTMP_DIR	= \must\have\tcl\sources\to\build\this\target
COFFBASE	= \must\have\tcl\sources\to\build\this\target
TOOLSDIR	= \must\have\tcl\sources\to\build\this\target
!else
TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(VERSION)$(SUFX).exe
TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLSTUBLIBNAME)
TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLIMPLIBNAME)
TCL_LIBRARY	= $(_TCLDIR)\library
TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLREGLIBNAME)
TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLDDELIBNAME)
TCLTMP_DIR	= $(_TCLDIR)\win\$(TMP_DIR:tk=tcl)
COFFBASE	= $(_TCLDIR)\win\coffbase.txt
TOOLSDIR	= $(_TCLDIR)\tools
!endif
d183 2
a184 2
WISH 		= $(OUT_DIR)\$(WISHNAMEPREFIX)$(VERSION)$(SUFX).exe
WISHC 		= $(OUT_DIR)\$(WISHNAMEPREFIX)c$(VERSION)$(SUFX).exe
d186 2
a187 2
TKTEST		= $(OUT_DIR)\$(PROJECT)test.exe
CAT32		= $(OUT_DIR)\cat32.exe
d199 1
a199 1
!if $(TCL_LINKWITHEXTENSIONS)
d420 2
a421 2
baselibs   = kernel32.lib advapi32.lib user32.lib
guilibs	    = $(baselibs) shell32.lib gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
d517 3
a519 3
	@@xcopy /i /y "$(WISH)" "$(BIN_INSTALL_DIR)\"
!if "$(TKLIB)" != "$(TKIMPLIB)"
	@@xcopy /i /y "$(TKLIB)" "$(BIN_INSTALL_DIR)\"
d521 2
a522 2
	@@xcopy /i /y "$(TKIMPLIB)" "$(LIB_INSTALL_DIR)\"
	@@xcopy /i /y "$(TKSTUBLIB)" "$(LIB_INSTALL_DIR)\"
d525 11
a535 11
	@@xcopy /i /y "$(GENERICDIR)\tk.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(GENERICDIR)\tkDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11\"
	@@xcopy /i /y "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
	@@xcopy /i /y "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
	@@xcopy /i /y "$(ROOT)\library\demos\*" "$(SCRIPT_INSTALL_DIR)\demos\"
	@@xcopy /i /y "$(ROOT)\library\demos\images\*" "$(SCRIPT_INSTALL_DIR)\demos\images\"
	@@xcopy /i /y "$(ROOT)\library\images\*" "$(SCRIPT_INSTALL_DIR)\images\"
	@@xcopy /i /y "$(ROOT)\library\msgs\*" "$(SCRIPT_INSTALL_DIR)\msgs\"
d584 2
a585 2
$(MAN2HELP) $(MAN2HELP2) $(INDEX): $(TOOLSDIR)\$$(@@F)
	copy $(TOOLSDIR)\$(@@F) $(@@D)
d588 1
a588 1
	copy $(WINDIR)\$(@@F) $(@@D)
d615 2
a616 2
	copy "$(DOCTMP_DIR)\$(@@B).hlp" "$(OUT_DIR)"
	copy "$(DOCTMP_DIR)\$(@@B).cnt" "$(OUT_DIR)"
d618 2
a619 2
$(MAN2TCL): $(TOOLSDIR)\$$(@@B).c
	$(cc32) -nologo -G4 -ML -O2 -Fo$(@@D)\ $(TOOLSDIR)\$(@@B).c -link -out:$@@
d622 1
a622 1
	$(TCLSH) $(MAN2HELP:\=/) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)
d626 2
a627 2
	@@xcopy /i /y "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
	@@xcopy /i /y "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
d656 2
a657 2
!if $(TCL_LINKWITHEXTENSIONS)
	$(cc32) $(WISH_CFLAGS) -DTK_TEST -DTCL_LINKWITHEXTENSIONS -Fo$@@ $?
d672 2
a673 2
!if $(TCL_LINKWITHEXTENSIONS)
	$(cc32) $(WISH_CFLAGS) -DTCL_LINKWITHEXTENSIONS -Fo$@@ $?
@


1.63
log
@compilation, link fixes
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.62 2002/06/21 23:09:54 hobbs Exp $
d200 1
a200 1
TCLREGLIBNAME	= tclreg10$(SUFX:t=).lib
@


1.62
log
@	* doc/text.n:          TIP #104 implementation which generalizes the
	* generic/tkText.c:    undo/redo stack to not be tied solely to the
	* generic/tkText.h:    text widget.  The APIs are still private.
	* generic/tkUndo.c:    This also adds a stack limiting ability and
	* generic/tkUndo.h:    a -maxundo option to the text widget (in
	* library/text.tcl:    addition to the options from TIP #26) should
	* mac/tkMacDefault.h:  users want to limit the undo/redo stack
	* tests/text.test:     (should not be necessary in most cases).
	* unix/Makefile.in:    [Patch #554763] (callewart)
	* unix/tkUnixDefault.h:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/tkWinDefault.h:
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.61 2002/06/18 23:51:46 dkf Exp $
d470 1
a470 1
guilibs	    = $(baselibs) gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
@


1.61
log
@Added TIP#48 style engine implementation
Frederic Bonnet to supply docs+tests as soon as possible.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.60 2002/06/10 22:45:51 davygrvy Exp $
d364 1
d762 1
@


1.60
log
@Fixed a win98 issue where the /exclude option for xcopy is unsupported.
Reported by Roy Terry <royterry@@earthlink.net>.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.59 2002/05/08 02:22:37 davygrvy Exp $
d354 1
@


1.59
log
@Problem with TCLDIR macro not accepting forward slash path seperators
resolved.  Added the same logic to INSTALLDIR, too. [Bug #553208]
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.58 2002/03/29 04:14:40 davygrvy Exp $
d577 6
a582 3
	@@xcopy /i /y "$(ROOT)\library" "$(SCRIPT_INSTALL_DIR)\" /s /exclude:<<
CVS
<<
@


1.58
log
@small lint in comments/docs.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.57 2002/03/29 03:55:24 davygrvy Exp $
d158 2
d161 1
a161 1
!if exist($(INSTALLDIR)\include\tcl.h)
d163 1
a163 1
TCLDIR		= $(INSTALLDIR)
d166 1
a166 1
Don't know where tcl.h is.  Set the TCLDIR macro.
d170 2
a171 1
!if exist($(TCLDIR)\include\tcl.h)
d173 1
a173 1
!elseif exist($(TCLDIR)\generic\tcl.h)
d182 6
d211 6
a216 6
TCLSH		= $(INSTALLDIR)\bin\tclsh$(VERSION)$(SUFX).exe
TCLSTUBLIB	= $(INSTALLDIR)\lib\$(TCLSTUBLIBNAME)
TCLIMPLIB	= $(INSTALLDIR)\lib\$(TCLIMPLIBNAME)
TCL_LIBRARY	= $(INSTALLDIR)\lib
TCLREGLIB	= $(INSTALLDIR)\lib\$(TCLREGLIBNAME)
TCLDDELIB	= $(INSTALLDIR)\lib\$(TCLDDELIBNAME)
d221 9
a229 9
TCLSH		= $(TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(VERSION)$(SUFX).exe
TCLSTUBLIB	= $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLSTUBLIBNAME)
TCLIMPLIB	= $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLIMPLIBNAME)
TCL_LIBRARY	= $(TCLDIR)\library
TCLREGLIB	= $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLREGLIBNAME)
TCLDDELIB	= $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLDDELIBNAME)
TCLTMP_DIR	= $(TCLDIR)\win\$(TMP_DIR:tk=tcl)
COFFBASE	= $(TCLDIR)\win\coffbase.txt
TOOLSDIR	= $(TCLDIR)\tools
d240 5
a244 5
LIB_INSTALL_DIR		= $(INSTALLDIR)\lib
BIN_INSTALL_DIR		= $(INSTALLDIR)\bin
DOC_INSTALL_DIR		= $(INSTALLDIR)\doc
SCRIPT_INSTALL_DIR	= $(INSTALLDIR)\lib\$(PROJECT)$(DOTVERSION)
INCLUDE_INSTALL_DIR	= $(INSTALLDIR)\include
d385 1
a385 1
TCL_INCLUDES	= -I "$(TCLDIR)\include"
d387 1
a387 1
TCL_INCLUDES	= -I "$(TCLDIR)\win" -I "$(TCLDIR)\generic"
d495 1
a495 1
	set PATH=$(TCLDIR)\bin;$(PATH)
d497 1
a497 1
	set PATH=$(TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d508 1
a508 1
	set PATH=$(TCLDIR)\bin;$(PATH)
d510 1
a510 1
	set PATH=$(TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d517 1
a517 1
	set PATH=$(TCLDIR)\bin;$(PATH)
d519 1
a519 1
	set PATH=$(TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
d559 1
a559 1
$(CAT32): $(TCLDIR)\win\cat.c
d587 1
a587 1
	$(TCLSH) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
@


1.57
log
@small cruft
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.56 2002/03/29 01:27:50 davygrvy Exp $
d43 1
a43 4
#	release  -- builds the core, the shell and the dlls. (default)
#	dlls     -- just builds the windows extensions and the 16-bit DOS
#		    pipe/thunk driver.
#	shell    -- Just builds the shell and the core.
d47 1
a47 1
#	tcltest  -- just builds the binaries for the test suite.
d50 1
a50 1
#	plugin   -- [currently out-dated].
d54 4
d64 1
a64 2
#		libraries.  The install point is assumed when not
#		specified.  This can be the source tree or an installation.
d66 1
a66 1
#		to not needing the sources.
d83 2
a84 3
#		linkexten = Effects the static option only to switch
#			   tclshXX.exe to have the dde and reg extension linked
#			   inside it.
d478 1
a516 2

console-wish : $(WISHC)
@


1.56
log
@ack!  fixed big typo.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.54 2002/03/28 23:29:44 davygrvy Exp $
d585 16
d633 1
a633 1
TITLE=Tcl/Tk Reference Manual
d666 1
a666 1
puts "Installing Tk's helpfile contents into Tcl's ..."
d669 1
a669 1
    if {[regexp {:Include tk([0-9]{2}).cnt} [gets $$f] dummy ver]} {
d673 4
@


1.55
log
@	* win/makefile.vc:  Tk helpfile is now installing itself into Tcl's
	contents file as part of the install target and rebuilding the
	contents table as desired.  [Bug 527941]
@
text
@a648 1
	@@echo :Include $(HLPBASE).cnt >> $(DOC_INSTALL_DIR)\tcl$(VERSION).cnt
@


1.54
log
@fixed double use of $(ldebug)
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.53 2002/03/28 23:23:03 davygrvy Exp $
d203 1
a203 1
TCLSH		= $(INSTALLDIR)\bin\$(TCLNAMEPREFIX)sh$(VERSION)$(SUFX).exe
d235 1
a235 1
SCRIPT_INSTALL_DIR	= $(INSTALLDIR)\lib\tk$(DOTVERSION)
d479 1
a479 1
install:  install-binaries install-libraries
d581 1
a581 1
		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls
d588 3
a590 3
TCLHLPBASE	= $(PROJECT)$(VERSION)
HELPFILE	= $(OUT_DIR)\$(TCLHLPBASE).hlp
HELPCNT		= $(OUT_DIR)\$(TCLHLPBASE).cnt
d649 18
@


1.53
log
@	* win/.cvsignore (new):
	* win/lamp.bmp (new):
	* win/makefile.vc:
	* win/nmakehlp.c (new):
	* win/rules.vc:  Brought the makefile up-to-date with Tcl's one.
	This now has support for Win9x issues and the winhelp target now
	exists.  Color scheme can be changed.  I'm just imparting a first
	suggestion using orange :)  I'll have to think about the install
	portion of the helpfile as I'll need to do some tricks to insert
	tk's contents file into Tcl's using some special winhlp32.exe
	switches.  [Bug 533862 527941]
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.52 2002/03/21 17:48:54 davygrvy Exp $
d530 2
a531 2
	$(link32) $(ldebug) $(dlllflags) -base:@@$(COFFBASE),tk -out:$@@ \
		$(guilibs) $(TCLSTUBLIB) @@<<
d543 1
a543 1
	$(link32) $(ldebug) $(guilflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**
d546 1
a546 1
	$(link32) $(ldebug) $(conlflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**
d549 1
a549 1
	$(link32) $(ldebug) $(guilflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**
@


1.52
log
@fix for bug #528441.  max optimize seems to cause problems for some folks.
@
text
@d12 1
a12 1
# Copyright (c) 2001 Tomasoft Engineering.
d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.51 2002/02/22 02:41:17 hobbs Exp $
d65 2
d210 2
d213 1
a213 1
TCLSH		= $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLNAMEPREFIX)sh$(VERSION)$(SUFX).exe
d220 2
a226 4
#TKHLPBASE	= $(PROJECT)$(VERSION)
#TKHLP		= $(OUT_DIR)\$(TKHLPBASE).hlp
#TKHLPCNT	= $(OUT_DIR)\$(TKHLPBASE).cnt

a229 1
MKDIR		= .\mkd.bat
d373 1
d404 9
a412 1
cflags = -nologo -c -W3 -Fp$(TMP_DIR)^\ -YX
d431 1
a431 1
ldebug	    = -debug:full -debugtype:cv
d433 1
a433 1
ldebug	    = -release
d437 1
a437 1
lflags	    = -nologo -machine:$(MACHINE)
d439 3
a441 10
# declarations for use on Intel i386, i486, and Pentium systems
!IF "$(MACHINE)" == "IX86"
DLLENTRY    = @@12
dlllflags   = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
!ELSE IF "$(MACHINE)" == "IA64"
DLLENTRY    = @@12
dlllflags   = $(lflags) -dll
!ELSE
dlllflags   = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
!ENDIF
d443 7
a449 2
conlflags   = $(lflags) -subsystem:console -entry:mainCRTStartup
guilflags   = $(lflags) -subsystem:windows -entry:WinMainCRTStartup
d451 9
a459 1
baselibs    = kernel32.lib advapi32.lib user32.lib
d515 2
a516 2
	@@$(MKDIR) $(TMP_DIR)
	@@$(MKDIR) $(OUT_DIR)
d530 2
a531 1
	$(link32) $(ldebug) $(dlllflags) -out:$@@ $(guilibs) $(TCLSTUBLIB) @@<<
d588 62
a649 28
#MAN2TCL		= $(TOOLSDIR)\man2tcl
#TCLRTF		= $(TOOLSDIR)\tcl.rtf
#MAN2HELP	= $(TOOLSDIR)\man2help.tcl
#TCLHPJ		= $(TOOLSDIR)\tcl.hpj

#winhelp: $(TCLHLP)

#$(TCLHLP): $(TCLRTF)
#	cd $(TOOLSDIR)
#	start /wait hcrtf.exe -x tcl.hpj
#	cd $(MAKEDIR)
#	copy $(TOOLSDIR)\$(TCLHLPBASE).hlp $(OUT_DIR)
#	copy $(TOOLSDIR)\$(TCLHLPBASE).cnt $(OUT_DIR)

#$(TCLHPJ): $(TCLHPJ).in
#	copy $(TCLHPJ).in $(TCLHPJ)

#$(MAN2TCL).exe: $(MAN2TCL).obj 
#	cd $(TOOLSDIR)
#	$(cc32) -nologo -G4 -ML -O2 $(MAN2TCL).c
#	cd $(MAKEDIR)

#$(TCLRTF): $(MAN2TCL).exe $(TCLSH)
#	cd $(TOOLSDIR)
#	..\win\$(TCLSH) $(MAN2HELP) $(PROJECT) $(VERSION) $(ROOT)/doc \
#		../../tk$(DOTVERSION)/doc
#	cd $(MAKEDIR)

d729 6
d736 2
@


1.51
log
@TIP #41 implementation, panedwindow [Patch #512503] (melski)
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.50 2002/02/01 23:20:29 davygrvy Exp $
d396 3
a398 2
# This cranks the optimization level to maximize speed
cdebug = -O2
@


1.50
log
@* win/makefile.vc: unset macro located in the tktest target caused a failure.
[Bug 511652]
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.49 2001/12/03 10:42:31 davygrvy Exp $
d334 1
d655 1
@


1.49
log
@install target changes by request from Ryan Casey <scfiead@@hotmail.com>.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.48 2001/11/28 01:13:16 davygrvy Exp $
d207 1
d215 1
d250 1
a250 1
	$(TCLLIBDIR)\tclThreadTest.obj
@


1.48
log
@Fixed CAT32 target.  cat.c is located in the Tcl source, not the Tk source.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.47 2001/11/16 10:24:53 davygrvy Exp $
d456 1
a456 1
release:  setup $(WISH)
d458 1
a458 1
core:	  setup $(TKLIB)
d536 1
a536 4
	@@$(MKDIR) "$(BIN_INSTALL_DIR)"
	copy $(WISH) "$(BIN_INSTALL_DIR)"
	@@$(MKDIR) "$(LIB_INSTALL_DIR)"
	@@copy "$(TKLIB)" "$(BIN_INSTALL_DIR)"
d538 1
a538 1
	@@copy $(TKIMPLIB) "$(LIB_INSTALL_DIR)"
d540 2
a541 3
#	@@if exist $(TKHLP) $(MKDIR) "$(DOC_INSTALL_DIR)"
#	@@if exist $(TKHLP) copy "$(TKHLP)" "$(DOC_INSTALL_DIR)"
#	@@if exist $(TKHLPCNT) copy "$(TKHLPCNT)" "$(DOC_INSTALL_DIR)"
d544 8
a551 15
	@@$(MKDIR) "$(INCLUDE_INSTALL_DIR)"
	@@$(MKDIR) "$(INCLUDE_INSTALL_DIR)\X11"
	copy "$(GENERICDIR)\tk.h"             "$(INCLUDE_INSTALL_DIR)"
	copy "$(GENERICDIR)\tkDecls.h"        "$(INCLUDE_INSTALL_DIR)"
	copy "$(GENERICDIR)\tkPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)"
	copy "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)"
	xcopy "$(XLIBDIR)\X11\*.h"            "$(INCLUDE_INSTALL_DIR)\X11"
	@@$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
	@@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\images"
	@@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\demos"
	@@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\demos\images"
	xcopy "$(ROOT)\library"              "$(SCRIPT_INSTALL_DIR)"
	xcopy "$(ROOT)\library\images"       "$(SCRIPT_INSTALL_DIR)\images"
	xcopy "$(ROOT)\library\demos"        "$(SCRIPT_INSTALL_DIR)\demos"
	xcopy "$(ROOT)\library\demos\images" "$(SCRIPT_INSTALL_DIR)\demos\images"
@


1.47
log
@install target repaired.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.46 2001/11/13 06:55:18 davygrvy Exp $
d531 1
a531 1
$(CAT32): $(WINDIR)\cat.c
@


1.46
log
@Added the logic for the linkexten option.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.45 2001/11/13 04:26:48 davygrvy Exp $
d417 1
a417 1
ldebug	= -debug:full -debugtype:cv
d419 1
a419 1
ldebug	= -release
d423 1
a423 1
lflags	= -nologo -machine:$(MACHINE)
d427 2
a428 2
DLLENTRY = @@12
dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
d430 2
a431 2
DLLENTRY = @@12
dlllflags = $(lflags) -dll
d433 1
a433 1
dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
d436 2
a437 2
conlflags = $(lflags) -subsystem:console -entry:mainCRTStartup
guilflags = $(lflags) -subsystem:windows -entry:WinMainCRTStartup
d439 2
a440 2
baselibs   = kernel32.lib advapi32.lib user32.lib
guilibs	   = $(baselibs) gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
d448 1
a448 1
TESTFLAGS = -file $(TESTPAT)
a536 1
	copy $(TKDLL) "$(BIN_INSTALL_DIR)"
d539 1
d541 1
a541 1
	@@copy "$(TKLIB)" "$(BIN_INSTALL_DIR)"
d543 3
a545 4
	@@copy $(TKIMPLIB) "$(LIB_INSTALL_DIR)"
	@@if exist $(TKHLP) $(MKDIR) "$(DOC_INSTALL_DIR)"
	@@if exist $(TKHLP) copy "$(TKHLP)" "$(DOC_INSTALL_DIR)"
	@@if exist $(TKHLPCNT) copy "$(TKHLPCNT)" "$(DOC_INSTALL_DIR)"
@


1.45
log
@small bug fix with filenames in the .res files.
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.44 2001/11/13 02:46:23 davygrvy Exp $
d70 1
a70 1
#	OPTS=static,msvcrt,threads,symbols,profile,none
a130 13
#     I've found the following batchfile useful for building everything:
#
#	if "%MSVCDir%" == "" call c:\progra~1\micros~1\vc98\bin\vcvars32.bat
#	set INSTALLDIR=C:\tclTestArea
#	nmake -nologo -f makefile.vc release winhelp
#	nmake -nologo -f makefile.vc release   OPTS=static,linkexten      TCLDIR=%1
#	nmake -nologo -f makefile.vc core dlls OPTS=static,msvcrt         TCLDIR=%1
#	nmake -nologo -f makefile.vc core      OPTS=static,threads        TCLDIR=%1
#	nmake -nologo -f makefile.vc core      OPTS=static,msvcrt,threads TCLDIR=%1
#	nmake -nologo -f makefile.vc shell     OPTS=threads               TCLDIR=%1
#	pause
#
#
d162 3
a164 1
!error Don't know where tcl.h is.  Set the TCLDIR macro.
d172 3
a174 1
!error Don't know where tcl.h is.  the TCLDIR macro doesn't appear correct.
d190 3
d205 2
d212 2
d232 1
a232 1
SCRIPT_INSTALL_DIR	= $(INSTALLDIR)\lib\tcl$(DOTVERSION)
d237 4
d613 3
d617 1
d629 3
d633 1
@


1.44
log
@	* win/mkd.bat:
	* win/rmd.bat:  Removed -kb CVS attribute and added changes
	from Llyod Lim for better stability.  [Patch #456761]

	* win/rules.vc(new):
	* win/buildall.vc.bat(new):
	* win/makefile.vc:  large rewrite following Tcl's makefile.vc as
	a guide and Patch #456761.  Appears BugFree(tm).
@
text
@d15 1
a15 1
# RCS: @@(#) $Id: makefile.vc,v 1.72 2001/11/10 10:38:47 davygrvy Exp $
d183 1
a183 1
!error Don't know where tcl.h is.  Set the TCLDIR macro.
d705 6
@


1.43
log
@add comctl32.lib to build libs
@
text
@d1 4
a4 1
# Visual C++ makefile
d9 1
a9 1
# Copyright (c) 1995-1997 Sun Microsystems, Inc.
d12 1
d14 10
a23 5
# RCS: @@(#) $Id: makefile.vc,v 1.42 2001/10/12 13:30:32 tmh Exp $

# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from 
# location of the compiler directories.
d25 2
d28 138
a165 13
# Project directories
#
# ROOT    = top of source tree
#
# TMPDIR  = location where .obj files should be stored during build
#
# TOOLS32 = location of VC++ 32-bit development tools. Note that the
#	    VC++ 2.0 header files are broken, so you need to use the
#	    ones that come with the developer network CD's, or later
#	    versions of VC++.
#
# TCLDIR = location of top of Tcl source heirarchy
#
d167 2
a168 3
ROOT		= ..
TCLDIR		= ..\..\tcl8.4
INSTALLDIR      = C:\Progra~1\tcl
d170 16
a185 3
# Set this to the appropriate value of /MACHINE: for your platform
# Choices: IX86, IA64, ALPHA
MACHINE		= IX86
d187 4
a190 1
!IF "$(MACHINE)" == "IA64"
d192 2
a193 2
# IA64 support is based on the standard setup with v2 of the
# Microsoft SDK for XP, RC1
d195 22
a216 30
TOOLS32		= C:\Progra~1\Microsoft SDK
TOOLS32_rc	= C:\Progra~1\Microsoft SDK

cc32		= "$(TOOLS32)\bin\Win64\cl.exe"
link32		= "$(TOOLS32)\bin\Win64\link.exe"
libpath32	= /LIBPATH:"$(TOOLS32)\lib\IA64"
lib32		= "$(TOOLS32)\bin\Win64\lib.exe"

!ELSE

# Visual Studio 5 default
TOOLS32		= C:\Progra~1\devstudio\vc
TOOLS32_rc	= C:\Progra~1\devstudio\sharedide

# Visual Studio 6 default
#TOOLS32		= C:\Progra~1\Microsoft Visual Studio\VC98
#TOOLS32_rc	= C:\Progra~1\Microsoft Visual Studio\common\MSDev98

cc32		= "$(TOOLS32)\bin\cl.exe"
link32		= "$(TOOLS32)\bin\link.exe"
libpath32	= /LIBPATH:"$(TOOLS32)\lib"
lib32		= "$(TOOLS32)\bin\lib.exe"

!ENDIF

rc32		= "$(TOOLS32_rc)\bin\rc.exe"
include32	= -I"$(TOOLS32)\include"

# Uncomment the following line to compile with thread support
#THREADDEFINES = -DTCL_THREADS=1
d218 2
a219 2
# Set NODEBUG to 0 to compile with symbols
NODEBUG = 1
d221 15
a235 52
# uncomment the following two lines to compile with TCL_MEM_DEBUG
#DEBUGDEFINES	=-DTCL_MEM_DEBUG
#DEBUGDEFINES = -DTCL_MEM_DEBUG -DUSE_TCLALLOC=0 -DPURIFY

######################################################################
# Do not modify below this line
######################################################################

TCLNAMEPREFIX = tcl
TKNAMEPREFIX = tk
WISHNAMEPREFIX = wish
VERSION = 84
DOTVERSION = 8.4

TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub
TKSTUBPREFIX  = $(TKNAMEPREFIX)stub


BINROOT		= .
!IF "$(NODEBUG)" == "1"
TMPDIRNAME	= Release
DBGX		=
!ELSE
TMPDIRNAME	= Debug
DBGX		= d
!ENDIF
TMPDIR		= $(BINROOT)\$(TMPDIRNAME)
OUTDIRNAME	= $(TMPDIRNAME)
OUTDIR		= $(TMPDIR)

TCLLIB 		= $(TCLNAMEPREFIX)$(VERSION)$(DBGX).lib
TCLPLUGINLIB 	= $(TCLNAMEPREFIX)$(VERSION)p.lib
TCLSTUBLIB	= $(TCLSTUBPREFIX)$(VERSION)$(DBGX).lib
TKDLLNAME	= $(TKNAMEPREFIX)$(VERSION)$(DBGX).dll
TKDLL 		= $(OUTDIR)\$(TKDLLNAME)
TKLIB 		= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib
TKSTUBLIBNAME	= $(TKSTUBPREFIX)$(VERSION)$(DBGX).lib
TKSTUBLIB	= $(OUTDIR)\$(TKSTUBLIBNAME)
TKPLUGINDLLNAME	= $(TKNAMEPREFIX)$(VERSION)p$(DBG).dll
TKPLUGINDLL 	= $(OUTDIR)\$(TKPLUGINDLLNAME)
TKPLUGINLIB 	= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)p$(DBGX).lib

WISH 		= $(OUTDIR)\$(WISHNAMEPREFIX)$(VERSION)$(DBGX).exe
WISHC 		= $(OUTDIR)\$(WISHNAMEPREFIX)c$(VERSION)$(DBGX).exe
WISHP 		= $(OUTDIR)\$(WISHNAMEPREFIX)p$(VERSION)$(DBGX).exe
TKTEST 		= $(OUTDIR)\$(TKNAMEPREFIX)test.exe
CAT32           = $(TMPDIR)\cat32.exe

BIN_INSTALL_DIR = $(INSTALLDIR)\bin
INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include
LIB_INSTALL_DIR = $(INSTALLDIR)\lib
SCRIPT_INSTALL_DIR = $(LIB_INSTALL_DIR)\tk$(DOTVERSION)
d238 2
a239 1
	$(TMPDIR)\winMain.obj
d242 4
a245 4
	$(TMPDIR)\tkTest.obj \
	$(TMPDIR)\tkSquare.obj \
	$(TMPDIR)\testMain.obj \
	$(TMPDIR)\tkWinTest.obj \
d249 5
a253 5
	$(TMPDIR)\xcolors.obj \
	$(TMPDIR)\xdraw.obj \
	$(TMPDIR)\xgc.obj \
	$(TMPDIR)\ximage.obj \
	$(TMPDIR)\xutil.obj
d256 3
a258 3
	$(TMPDIR)\tkConsole.obj \
	$(TMPDIR)\tkUnixMenubu.obj \
	$(TMPDIR)\tkUnixScale.obj \
d260 101
a360 94
	$(TMPDIR)\tkWin3d.obj \
	$(TMPDIR)\tkWin32Dll.obj \
	$(TMPDIR)\tkWinButton.obj \
	$(TMPDIR)\tkWinClipboard.obj \
	$(TMPDIR)\tkWinColor.obj \
	$(TMPDIR)\tkWinConfig.obj \
	$(TMPDIR)\tkWinCursor.obj \
	$(TMPDIR)\tkWinDialog.obj \
	$(TMPDIR)\tkWinDraw.obj \
	$(TMPDIR)\tkWinEmbed.obj \
	$(TMPDIR)\tkWinFont.obj \
	$(TMPDIR)\tkWinImage.obj \
	$(TMPDIR)\tkWinInit.obj \
	$(TMPDIR)\tkWinKey.obj \
	$(TMPDIR)\tkWinMenu.obj \
	$(TMPDIR)\tkWinPixmap.obj \
	$(TMPDIR)\tkWinPointer.obj \
	$(TMPDIR)\tkWinRegion.obj \
	$(TMPDIR)\tkWinScrlbr.obj \
	$(TMPDIR)\tkWinSend.obj \
	$(TMPDIR)\tkWinWindow.obj \
	$(TMPDIR)\tkWinWm.obj \
	$(TMPDIR)\tkWinX.obj \
	$(TMPDIR)\stubs.obj \
	$(TMPDIR)\tk3d.obj \
	$(TMPDIR)\tkArgv.obj \
	$(TMPDIR)\tkAtom.obj \
	$(TMPDIR)\tkBind.obj \
	$(TMPDIR)\tkBitmap.obj \
	$(TMPDIR)\tkButton.obj \
	$(TMPDIR)\tkCanvArc.obj \
	$(TMPDIR)\tkCanvBmap.obj \
	$(TMPDIR)\tkCanvImg.obj \
	$(TMPDIR)\tkCanvLine.obj \
	$(TMPDIR)\tkCanvPoly.obj \
	$(TMPDIR)\tkCanvPs.obj \
	$(TMPDIR)\tkCanvText.obj \
	$(TMPDIR)\tkCanvUtil.obj \
	$(TMPDIR)\tkCanvWind.obj \
	$(TMPDIR)\tkCanvas.obj \
	$(TMPDIR)\tkClipboard.obj \
	$(TMPDIR)\tkCmds.obj \
	$(TMPDIR)\tkColor.obj \
	$(TMPDIR)\tkConfig.obj \
	$(TMPDIR)\tkCursor.obj \
	$(TMPDIR)\tkEntry.obj \
	$(TMPDIR)\tkError.obj \
	$(TMPDIR)\tkEvent.obj \
	$(TMPDIR)\tkFileFilter.obj \
	$(TMPDIR)\tkFocus.obj \
	$(TMPDIR)\tkFont.obj \
	$(TMPDIR)\tkFrame.obj \
	$(TMPDIR)\tkGC.obj \
	$(TMPDIR)\tkGeometry.obj \
	$(TMPDIR)\tkGet.obj \
	$(TMPDIR)\tkGrab.obj \
	$(TMPDIR)\tkGrid.obj \
	$(TMPDIR)\tkImage.obj \
	$(TMPDIR)\tkImgBmap.obj \
	$(TMPDIR)\tkImgGIF.obj \
	$(TMPDIR)\tkImgPPM.obj \
	$(TMPDIR)\tkImgPhoto.obj \
	$(TMPDIR)\tkImgUtil.obj \
	$(TMPDIR)\tkListbox.obj \
	$(TMPDIR)\tkMacWinMenu.obj \
	$(TMPDIR)\tkMain.obj \
	$(TMPDIR)\tkMenu.obj \
	$(TMPDIR)\tkMenubutton.obj \
	$(TMPDIR)\tkMenuDraw.obj \
	$(TMPDIR)\tkMessage.obj \
	$(TMPDIR)\tkObj.obj \
	$(TMPDIR)\tkOldConfig.obj \
	$(TMPDIR)\tkOption.obj \
	$(TMPDIR)\tkPack.obj \
	$(TMPDIR)\tkPlace.obj \
	$(TMPDIR)\tkPointer.obj \
	$(TMPDIR)\tkRectOval.obj \
	$(TMPDIR)\tkScale.obj \
	$(TMPDIR)\tkScrollbar.obj \
	$(TMPDIR)\tkSelect.obj \
	$(TMPDIR)\tkText.obj \
	$(TMPDIR)\tkTextBTree.obj \
	$(TMPDIR)\tkTextDisp.obj \
	$(TMPDIR)\tkTextImage.obj \
	$(TMPDIR)\tkTextIndex.obj \
	$(TMPDIR)\tkTextMark.obj \
	$(TMPDIR)\tkTextTag.obj \
	$(TMPDIR)\tkTextWind.obj \
	$(TMPDIR)\tkTrig.obj \
	$(TMPDIR)\tkUtil.obj \
	$(TMPDIR)\tkVisual.obj \
	$(TMPDIR)\tkStubInit.obj \
	$(TMPDIR)\tkStubLib.obj \
	$(TMPDIR)\tkWindow.obj
a361 2
TKSTUBOBJS = $(TMPDIR)\tkStubLib.obj \
	$(TMPDIR)\tkStubImg.obj
a366 1
TCLLIBDIR       = $(TCLDIR)\win\$(OUTDIRNAME)
d369 7
a375 3
TK_INCLUDES	= -I$(WINDIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \
			-I$(TCLDIR)\generic
TK_DEFINES	= $(DEBUGDEFINES) $(THREADDEFINES)
d377 4
a380 1
######################################################################
d382 1
a382 1
######################################################################
d384 10
a393 12
!IF "$(NODEBUG)" == "1"
!IF "$(MACHINE)" == "IA64"
cdebug	= -O2i -Gs
!ELSE
# NOTE: Due to a bug in MSVC, we cannot use -O2 here or Tk starts to misbehave.
cdebug	= -Oti -Gs -GD
!ENDIF
!ELSE IF "$(MACHINE)" == "IA64"
cdebug	= -Od -Zi
!ELSE
cdebug	= -Z7 -Od -WX
!ENDIF
d396 12
a407 2
cflags	= -c -W3 -nologo -Fp$(TMPDIR)\ -YX
cvarsdll = -MD$(DBGX)
a408 5
CON_CFLAGS	= $(cdebug) $(cflags) $(include32) -DCONSOLE
TK_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
			$(TK_INCLUDES) $(TK_DEFINES) -DUSE_TCL_STUBS
WISH_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
			$(TK_INCLUDES) $(TK_DEFINES)
d410 1
a410 1
######################################################################
d412 1
a412 1
######################################################################
d414 1
a414 3
!IF "$(NODEBUG)" == "1"
ldebug	= /RELEASE
!ELSE
d416 3
a418 1
!ENDIF
d421 1
a421 2
lcommon	= /NODEFAULTLIB /RELEASE /NOLOGO
lflags	= $(lcommon) /MACHINE:$(MACHINE) $(libpath32)
d426 6
d434 14
a447 11
conlflags	= $(lflags) -subsystem:console -entry:mainCRTStartup
guilflags	= $(lflags) -subsystem:windows -entry:WinMainCRTStartup
dlllflags	= $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll

!IF "$(MACHINE)" == "PPC"
libc = libc$(DBGX).lib
libcdll = crtdll$(DBGX).lib
!ELSE
libc = libc$(DBGX).lib oldnames.lib
libcdll = msvcrt$(DBGX).lib oldnames.lib
!ENDIF
a448 6
baselibs   = kernel32.lib $(optlibs) advapi32.lib
winlibs    = $(baselibs) user32.lib gdi32.lib comdlg32.lib winspool.lib \
             imm32.lib comctl32.lib
guilibs	   = $(libc) $(winlibs)
conlibs    = $(libc) $(baselibs)
guilibsdll = $(libcdll) $(winlibs)
d450 1
a450 1
######################################################################
d452 1
a452 1
######################################################################
d454 19
a472 8
all:    setup $(WISH) $(CAT32)
install: install-binaries install-libraries
plugin:	setup $(TKPLUGINDLL) $(WISHP)
tktest: setup $(TKTEST) $(CAT32)
test:	setup $(TKTEST) $(TKLIB) $(CAT32)
	set TCL_LIBRARY=$(TCLDIR)/library
	set PATH=$(TCLDIR)\win\$(TMPDIRNAME);$(PATH)
	$(TKTEST) $(ROOT)/tests/all.tcl | $(CAT32)
d475 6
a480 2
	set TCL_LIBRARY=$(TCLDIR)/library
	set PATH=$(TCLDIR)\win\$(TMPDIRNAME);$(PATH)
d483 44
a526 1
console-wish : all $(WISHC)
a527 4
stubs:
	$(TCLDIR)\win\$(TMPDIRNAME)\tclsh$(VERSION)$(DBGX) \
		$(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls
d529 3
a531 3
setup:
	@@mkd $(TMPDIR)
	@@mkd $(OUTDIR)
d534 1
a534 1
	@@mkd "$(BIN_INSTALL_DIR)"
d537 8
a544 2
	@@mkd "$(LIB_INSTALL_DIR)"
	copy $(TKLIB) "$(LIB_INSTALL_DIR)"
d547 2
a548 2
	@@mkd "$(INCLUDE_INSTALL_DIR)"
	@@mkd "$(INCLUDE_INSTALL_DIR)\X11"
d554 4
a557 4
	@@mkd "$(SCRIPT_INSTALL_DIR)"
	@@mkd "$(SCRIPT_INSTALL_DIR)\images"
	@@mkd "$(SCRIPT_INSTALL_DIR)\demos"
	@@mkd "$(SCRIPT_INSTALL_DIR)\demos\images"
a562 1
$(TKLIB): $(TKDLL) $(TKSTUBLIB)
d564 3
a566 2
$(TKSTUBLIB): $(TKSTUBOBJS)
        $(lib32) /out:$@@ $(TKSTUBOBJS)
d568 3
a570 6
$(TKDLL): $(TKOBJS) $(TMPDIR)\tk.res
       $(link32) $(ldebug) $(dlllflags) \
		-out:$@@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLSTUBLIB) \
		$(guilibsdll) @@<<
			$(TKOBJS)
<<
a571 1
$(TKPLUGINLIB): $(TKPLUGINDLL)
d573 31
a603 31
$(TKPLUGINDLL): $(TKOBJS) $(TMPDIR)\tk.res
        $(link32) $(ldebug) $(dlllflags) \
		-out:$@@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLPLUGINLIB) \
		$(guilibsdll) @@<<
			$(TKOBJS)
<<

$(WISH): $(WISHOBJS) $(TKLIB) $(TMPDIR)\wish.res
	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@@ \
		$(guilibsdll) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB) $(WISHOBJS) 

$(WISHC): $(WISHOBJS) $(TKLIB) $(TMPDIR)\wish.res
	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\wish.res -out:$@@ \
		$(guilibsdll) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB) $(WISHOBJS) 

$(WISHP): $(WISHOBJS) $(TKPLUGINLIB) $(TMPDIR)\wish.res
	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@@ \
		$(guilibsdll) $(TCLLIBDIR)\$(TCLPLUGINLIB) \
		$(TKPLUGINLIB) $(WISHOBJS) 

$(TKTEST): $(TKTESTOBJS) $(TKLIB) $(TMPDIR)\wish.res
	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@@ \
		$(guilibsdll) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB) $(TKTESTOBJS)

$(CAT32): $(TCLDIR)\win\cat.c
	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
	$(link32) $(conlflags) -out:$@@ -stack:16384 $(TMPDIR)\cat.obj $(conlibs)

#
# Regenerate the stubs files.
#
a604 3
genstubs:
	tclsh$(VERSION) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls
d606 1
a606 1
#
d608 1
a608 1
#
d610 1
a610 1
$(TMPDIR)\testMain.obj: $(WINDIR)\winMain.c
d613 1
a613 1
$(TMPDIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
d616 1
a616 1
$(TMPDIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c
d619 1
a619 1
$(TMPDIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c
d622 1
a622 1
$(TMPDIR)\winMain.obj: $(WINDIR)\winMain.c
d625 3
a627 2
$(TMPDIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
	$(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@@ $?
d629 2
a630 3
#
# Implicit rules
#
d632 2
a633 2
{$(XLIBDIR)}.c{$(TMPDIR)}.obj:
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
a634 2
{$(GENERICDIR)}.c{$(TMPDIR)}.obj:
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d636 3
a638 13
{$(WINDIR)}.c{$(TMPDIR)}.obj:
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<

{$(ROOT)\unix}.c{$(TMPDIR)}.obj:
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<

{$(RCDIR)}.rc{$(TMPDIR)}.res:
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" -i "$(TOOLS32)\include" \
		-i "$(TCLDIR)\generic" \
!if "$(NODEBUG)" == "0"
		-d DEBUG \
!endif
		$<
d640 1
a640 16
clean:
        -@@del $(OUTDIR)\*.exp 
	-@@del $(OUTDIR)\*.lib 
	-@@del $(OUTDIR)\*.dll 
	-@@del $(OUTDIR)\*.exe
	-@@del $(OUTDIR)\*.pdb
	-@@del $(TMPDIR)\*.pch
        -@@del $(TMPDIR)\*.obj
        -@@del $(TMPDIR)\*.res
        -@@del $(TMPDIR)\*.exe
	-@@rmd $(OUTDIR)
	-@@rmd $(TMPDIR)

# dependencies

$(TMPDIR)\tk.res: \
d675 46
@


1.42
log
@implementation of TIP 63 (accepted) -compound option to menu items.
@
text
@d10 1
a10 1
# RCS: @@(#) $Id: makefile.vc,v 1.41 2001/10/01 21:04:37 hobbs Exp $
d322 1
a322 1
             imm32.lib
@


1.42.2.1
log
@Merging with TOT as of 06/09/2002.
@
text
@d1 1
a1 4
#------------------------------------------------------------------------------
# makefile.vc --
#
#	Microsoft Visual C++ makefile for use with nmake.exe v1.62+ (VC++ 5.0+)
d6 1
a6 1
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
a8 1
# Copyright (c) 2001-2002 David Gravereaux.
d10 5
a14 10
#------------------------------------------------------------------------------
# RCS: @@(#) $Id$
#------------------------------------------------------------------------------

!if "$(MSVCDIR)" == ""
MSG = ^
You'll need to run vcvars32.bat from Developer Studio, first, to setup^
the environment.  Jump to this line to read the new instructions.
!error $(MSG)
!endif
a15 2
#------------------------------------------------------------------------------
# HOW TO USE this makefile:
d17 54
a70 126
# 1)  It is now necessary to have MSVCDir set in the environment.  This is used
#     as a check to see if vcvars32.bat had been run prior to running nmake or
#     during the install of Microsoft Developer Studio, MSVCDir had been set
#     globally and the PATH adjusted.  Either way is valid.
#
#     You'll need to run vcvars32.bat contained in the MsDev's vc(98)/bin
#     directory to setup the proper environment, if needed, for your current
#     setup.  This is a needed bootstrap requirement and allows the swapping of
#     different environments to be easier.
#
# 2)  To use the Platform SDK (not expressly needed), run setenv.bat after
#     vcvars32.bat according to the instructions for it.  This can also turn on
#     the 64-bit compiler, if your SDK has it.
#
# 3)  Targets are:
#	release  -- builds the core, the shell. (default)
#	core     -- Only builds the core.
#	all      -- builds everything.
#	test     -- builds and runs the test suite.
#	tktest   -- just builds the binaries for the test suite.
#	install  -- installs the built binaries and libraries to $(INSTALLDIR)
#		    as the root of the install tree.
#	console-wish -- builds a console version of wish.
#	clean    -- removes the contents of $(TMP_DIR)
#	hose     -- removes the contents of $(TMP_DIR) and $(OUT_DIR)
#	genstubs -- rebuilds the Stubs table and support files (dev only).
#	depend   -- Generates an accurate set of source dependancies for this
#		    makefile.  Helpful to avoid problems when the sources are
#		    refreshed and you rebuild, but can "overbuild" when common
#		    headers like tkInt.h just get small changes.
#	winhelp  -- builds the windows .hlp file for Tcl from the troff man
#		    files.
#
# 4)  Macros usable on the commandline:
#	TCLDIR=<path>
#		Sets the location for where to find the Tcl headers and
#		libraries.  The install point is assumed when not specified.
#		Tk does need the source directory, though.  Tk comes very close
#		to not needing the sources, but does, in fact, require them.
#
#	INSTALLDIR=<path>
#		Sets where to install Tcl from the built binaries.
#		C:\Progra~1\Tcl is assumed when not specified.
#
#	OPTS=static,msvcrt,linkexten,threads,symbols,profile,none
#		Sets special options for the core.  The default is for none.
#		Any combination of the above may be used (comma separated).
#		'none' will over-ride everything to nothing.
#
#		static  =  Builds a static library of the core instead of a
#			   dll.  The shell will be static (and large), as well.
#		msvcrt  =  Effects the static option only to switch it from
#			   using libcmt(d) as the C runtime [by default] to
#			   msvcrt(d). This is useful for static embedding
#			   support.
#		linkexten = Affects the static option only to switch wishXX.exe
#			   to have the dde and reg extension linked inside it.
#		threads =  Turns on full multithreading support.
#		symbols =  Adds symbols for step debugging.
#		profile =  Adds profiling hooks.  Map file is assumed.
#
#	STATS=memdbg,compdbg,none
#		Sets optional memory and bytecode compiler debugging code added
#		to the core.  The default is for none.  Any combination of the
#		above may be used (comma separated).  'none' will over-ride
#		everything to nothing.
#
#		memdbg   = Enables the debugging memory allocator.
#		compdbg  = Enables byte compilation logging.
#
#	MACHINE=(IX86|IA64|ALPHA)
#		Set the machine type used for the compiler, linker, and
#		resource compiler.  This hook is needed to tell the tools
#		when alternate platforms are requested.  IX86 is the default
#		when not specified.
#
#	TMP_DIR=<path>
#	OUT_DIR=<path>
#		Hooks to allow the intermediate and output directories to be
#		changed.  $(OUT_DIR) is assumed to be 
#		$(BINROOT)\(Release|Debug) based on if symbols are requested.
#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.
#
#	TESTPAT=<file>
#		Reads the tests requested to be run from this file.
#
# 5)  Examples:
#
#	Basic syntax of calling nmake looks like this:
#	nmake [-nologo] -f makefile.vc [target|macrodef [target|macrodef] [...]]
#
#                        Standard (no frills)
#       c:\tk_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
#       Setting environment for using Microsoft Visual C++ tools.
#       c:\tk_src\win\>nmake -f makefile.vc release
#       c:\tk_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
#
#                         Building for Win64
#       c:\tk_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
#       Setting environment for using Microsoft Visual C++ tools.
#       c:\tk_src\win\>c:\progra~1\platfo~1\setenv.bat /pre64 /RETAIL
#       Targeting Windows pre64 RETAIL
#       c:\tk_src\win\>nmake -f makefile.vc MACHINE=IA64
#
#------------------------------------------------------------------------------
#==============================================================================
###############################################################################


#    //==================================================================\\
#   >>[               -> Do not modify below this line. <-               ]<<
#   >>[  Please, use the commandline macros to modify how Tcl is built.  ]<<
#   >>[  If you need more features, send us a patch for more macros.     ]<<
#    \\==================================================================//


###############################################################################
#==============================================================================
#------------------------------------------------------------------------------

!if !exist("makefile.vc")
MSG = ^
You must run this makefile only from the directory it is in.^
Please `cd` to its location first.
!error $(MSG) 
!endif
d72 2
a73 2
PROJECT	= tk
!include "rules.vc"
d75 2
a76 1
_INSTALLDIR	= $(INSTALLDIR:/=\)
d78 3
a80 21
!if !defined(TCLDIR)
!if exist($(_INSTALLDIR)\include\tcl.h)
TCLINSTALL	= 1
_TCLDIR		= $(_INSTALLDIR)
!else
MSG=^
Don't know where tcl.h is.  Set the _TCLDIR macro.
!error $(MSG)
!endif
!else
_TCLDIR	= $(TCLDIR:/=\)
!if exist($(_TCLDIR)\include\tcl.h)
TCLINSTALL	= 1
!elseif exist($(_TCLDIR)\generic\tcl.h)
TCLINSTALL	= 0
!else
MSG =^
Don't know where tcl.h is.  the TCLDIR macro doesn't appear correct.
!error $(MSG)
!endif
!endif
d82 3
a84 5
!if $(TCLINSTALL)
!message *** Warning: Tk requires the source distribution of Tcl to build from,
!message ***    at this time, sorry.  Please set the TCLDIR macro to point to the
!message ***    Tcl sources.
!endif
d86 4
a89 1
STUBPREFIX = $(PROJECT)stub
a90 5
VERSION = $(DOTVERSION:.=)
WISHNAMEPREFIX = wish

BINROOT		= .
ROOT		= ..
d92 2
a93 35
TCLIMPLIBNAME	= tcl$(VERSION)$(SUFX).lib
TCLLIBNAME	= tcl$(VERSION)$(SUFX).$(EXT)
TCLSTUBLIBNAME	= tclstub$(VERSION).lib

TCLREGLIBNAME	= tclreg10$(SUFX:t=).lib
TCLDDELIBNAME	= tcldde12$(SUFX:t=).lib

TKIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
TKLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
TKLIB		= $(OUT_DIR)\$(TKLIBNAME)

TKSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)

!if $(TCLINSTALL)
TCLSH		= $(_INSTALLDIR)\bin\tclsh$(VERSION)$(SUFX).exe
TCLSTUBLIB	= $(_INSTALLDIR)\lib\$(TCLSTUBLIBNAME)
TCLIMPLIB	= $(_INSTALLDIR)\lib\$(TCLIMPLIBNAME)
TCL_LIBRARY	= $(_INSTALLDIR)\lib
TCLREGLIB	= $(_INSTALLDIR)\lib\$(TCLREGLIBNAME)
TCLDDELIB	= $(_INSTALLDIR)\lib\$(TCLDDELIBNAME)
TCLTMP_DIR	= \must\have\tcl\sources\to\build\this\target
COFFBASE	= \must\have\tcl\sources\to\build\this\target
TOOLSDIR	= \must\have\tcl\sources\to\build\this\target
!else
TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(VERSION)$(SUFX).exe
TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLSTUBLIBNAME)
TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLIMPLIBNAME)
TCL_LIBRARY	= $(_TCLDIR)\library
TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLREGLIBNAME)
TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\$(TCLDDELIBNAME)
TCLTMP_DIR	= $(_TCLDIR)\win\$(TMP_DIR:tk=tcl)
COFFBASE	= $(_TCLDIR)\win\coffbase.txt
TOOLSDIR	= $(_TCLDIR)\tools
!endif
a94 2
WISH 		= $(OUT_DIR)\$(WISHNAMEPREFIX)$(VERSION)$(SUFX).exe
WISHC 		= $(OUT_DIR)\$(WISHNAMEPREFIX)c$(VERSION)$(SUFX).exe
d96 34
a129 10
TKTEST		= $(OUT_DIR)\$(PROJECT)test.exe
CAT32		= $(OUT_DIR)\cat32.exe
RMDIR		= .\rmd.bat
RM		= del

LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib
BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin
DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc
SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(DOTVERSION)
INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include
d132 1
a132 6
	$(TMP_DIR)\winMain.obj \
!if $(TCL_LINKWITHEXTENSIONS)
	$(TCLDDELIB) \
	$(TCLREGLIB) \
!endif
	$(TMP_DIR)\wish.res
d135 5
a139 5
	$(TMP_DIR)\tkTest.obj \
	$(TMP_DIR)\tkSquare.obj \
	$(TMP_DIR)\testMain.obj \
	$(TMP_DIR)\tkWinTest.obj \
	$(TCLTMP_DIR)\tclThreadTest.obj
d142 5
a146 5
	$(TMP_DIR)\xcolors.obj \
	$(TMP_DIR)\xdraw.obj \
	$(TMP_DIR)\xgc.obj \
	$(TMP_DIR)\ximage.obj \
	$(TMP_DIR)\xutil.obj
d149 3
a151 3
	$(TMP_DIR)\tkConsole.obj \
	$(TMP_DIR)\tkUnixMenubu.obj \
	$(TMP_DIR)\tkUnixScale.obj \
d153 94
a246 102
	$(TMP_DIR)\tkWin3d.obj \
	$(TMP_DIR)\tkWin32Dll.obj \
	$(TMP_DIR)\tkWinButton.obj \
	$(TMP_DIR)\tkWinClipboard.obj \
	$(TMP_DIR)\tkWinColor.obj \
	$(TMP_DIR)\tkWinConfig.obj \
	$(TMP_DIR)\tkWinCursor.obj \
	$(TMP_DIR)\tkWinDialog.obj \
	$(TMP_DIR)\tkWinDraw.obj \
	$(TMP_DIR)\tkWinEmbed.obj \
	$(TMP_DIR)\tkWinFont.obj \
	$(TMP_DIR)\tkWinImage.obj \
	$(TMP_DIR)\tkWinInit.obj \
	$(TMP_DIR)\tkWinKey.obj \
	$(TMP_DIR)\tkWinMenu.obj \
	$(TMP_DIR)\tkWinPixmap.obj \
	$(TMP_DIR)\tkWinPointer.obj \
	$(TMP_DIR)\tkWinRegion.obj \
	$(TMP_DIR)\tkWinScrlbr.obj \
	$(TMP_DIR)\tkWinSend.obj \
	$(TMP_DIR)\tkWinWindow.obj \
	$(TMP_DIR)\tkWinWm.obj \
	$(TMP_DIR)\tkWinX.obj \
	$(TMP_DIR)\stubs.obj \
	$(TMP_DIR)\tk3d.obj \
	$(TMP_DIR)\tkArgv.obj \
	$(TMP_DIR)\tkAtom.obj \
	$(TMP_DIR)\tkBind.obj \
	$(TMP_DIR)\tkBitmap.obj \
	$(TMP_DIR)\tkButton.obj \
	$(TMP_DIR)\tkCanvArc.obj \
	$(TMP_DIR)\tkCanvBmap.obj \
	$(TMP_DIR)\tkCanvImg.obj \
	$(TMP_DIR)\tkCanvLine.obj \
	$(TMP_DIR)\tkCanvPoly.obj \
	$(TMP_DIR)\tkCanvPs.obj \
	$(TMP_DIR)\tkCanvText.obj \
	$(TMP_DIR)\tkCanvUtil.obj \
	$(TMP_DIR)\tkCanvWind.obj \
	$(TMP_DIR)\tkCanvas.obj \
	$(TMP_DIR)\tkClipboard.obj \
	$(TMP_DIR)\tkCmds.obj \
	$(TMP_DIR)\tkColor.obj \
	$(TMP_DIR)\tkConfig.obj \
	$(TMP_DIR)\tkCursor.obj \
	$(TMP_DIR)\tkEntry.obj \
	$(TMP_DIR)\tkError.obj \
	$(TMP_DIR)\tkEvent.obj \
	$(TMP_DIR)\tkFileFilter.obj \
	$(TMP_DIR)\tkFocus.obj \
	$(TMP_DIR)\tkFont.obj \
	$(TMP_DIR)\tkFrame.obj \
	$(TMP_DIR)\tkGC.obj \
	$(TMP_DIR)\tkGeometry.obj \
	$(TMP_DIR)\tkGet.obj \
	$(TMP_DIR)\tkGrab.obj \
	$(TMP_DIR)\tkGrid.obj \
	$(TMP_DIR)\tkImage.obj \
	$(TMP_DIR)\tkImgBmap.obj \
	$(TMP_DIR)\tkImgGIF.obj \
	$(TMP_DIR)\tkImgPPM.obj \
	$(TMP_DIR)\tkImgPhoto.obj \
	$(TMP_DIR)\tkImgUtil.obj \
	$(TMP_DIR)\tkListbox.obj \
	$(TMP_DIR)\tkMacWinMenu.obj \
	$(TMP_DIR)\tkMain.obj \
	$(TMP_DIR)\tkMenu.obj \
	$(TMP_DIR)\tkMenubutton.obj \
	$(TMP_DIR)\tkMenuDraw.obj \
	$(TMP_DIR)\tkMessage.obj \
	$(TMP_DIR)\tkPanedWindow.obj \
	$(TMP_DIR)\tkObj.obj \
	$(TMP_DIR)\tkOldConfig.obj \
	$(TMP_DIR)\tkOption.obj \
	$(TMP_DIR)\tkPack.obj \
	$(TMP_DIR)\tkPlace.obj \
	$(TMP_DIR)\tkPointer.obj \
	$(TMP_DIR)\tkRectOval.obj \
	$(TMP_DIR)\tkScale.obj \
	$(TMP_DIR)\tkScrollbar.obj \
	$(TMP_DIR)\tkSelect.obj \
	$(TMP_DIR)\tkText.obj \
	$(TMP_DIR)\tkTextBTree.obj \
	$(TMP_DIR)\tkTextDisp.obj \
	$(TMP_DIR)\tkTextImage.obj \
	$(TMP_DIR)\tkTextIndex.obj \
	$(TMP_DIR)\tkTextMark.obj \
	$(TMP_DIR)\tkTextTag.obj \
	$(TMP_DIR)\tkTextWind.obj \
	$(TMP_DIR)\tkTrig.obj \
	$(TMP_DIR)\tkUtil.obj \
	$(TMP_DIR)\tkVisual.obj \
	$(TMP_DIR)\tkStubInit.obj \
	$(TMP_DIR)\tkStubLib.obj \
	$(TMP_DIR)\tkWindow.obj \
!if !$(STATIC_BUILD)
	$(TMP_DIR)\tk.res
!endif

TKSTUBOBJS = \
	$(TMP_DIR)\tkStubLib.obj \
	$(TMP_DIR)\tkStubImg.obj
d248 2
d255 1
a255 1
DOCDIR		= $(ROOT)\doc
d258 3
a260 10
!if $(TCLINSTALL)
TCL_INCLUDES	= -I "$(_TCLDIR)\include"
!else
TCL_INCLUDES	= -I "$(_TCLDIR)\win" -I "$(_TCLDIR)\generic"
!endif
TK_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(BITMAPDIR)" -I"$(XLIBDIR)" \
			$(TCL_INCLUDES)

TK_DEFINES	= $(OPTDEFINES)

d262 1
a262 1
#---------------------------------------------------------------------
d264 1
a264 1
#---------------------------------------------------------------------
d266 12
a277 11
!if $(DEBUG)
!if "$(MACHINE)" == "IA64"
cdebug = -Od -Zi
!else
cdebug = -Z7 -Od -WX
!endif
!else
# This cranks the optimization level up.  We can't use -02 because sometimes
# it causes problems.
cdebug = -Oti
!endif
d280 2
a281 1
cflags = -nologo -c -W3 -YX -Fp$(TMP_DIR)^\
d283 5
a287 18
!if $(PENT_0F_ERRATA)
cflags = $(cflags) -QI0f
!endif

!if $(ITAN_B_ERRATA)
cflags = $(cflags) -QIA64_Bx
!endif

!if $(MSVCRT)
crt = -MD$(DBGX)
!else
crt = -MT$(DBGX)
!endif

BASE_CLFAGS	= $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
TK_CFLAGS	= $(BASE_CLFAGS) $(TK_DEFINES) -DUSE_TCL_STUBS
CON_CFLAGS	= $(cdebug) $(cflags) $(crt) -DCONSOLE
WISH_CFLAGS	= $(BASE_CLFAGS) $(TK_DEFINES)
d289 1
a289 2

#---------------------------------------------------------------------
d291 1
a291 1
#---------------------------------------------------------------------
d293 3
a295 1
!if $(DEBUG)
d297 1
a297 3
!else
ldebug	= -release -opt:ref -opt:icf,3
!endif
d300 2
a301 24
lflags	= -nologo -machine:$(MACHINE) $(ldebug)

!if $(PROFILE)
lflags	= $(lflags) -profile
!endif

!if $(ALIGN98_HACK) && !$(STATIC_BUILD)
# align sections for PE size savings.
lflags	= $(lflags) -opt:nowin98
!else if !$(ALIGN98_HACK) && $(STATIC_BUILD)
# align sections for speed in loading by choosing the virtual page size.
lflags	= $(lflags) -align:4096
!endif

!if $(LOIMPACT)
lflags	= $(lflags) -ws:aggressive
!endif

dlllflags = $(lflags) -dll
conlflags = $(lflags) -subsystem:console
guilflags = $(lflags) -subsystem:windows

baselibs   = kernel32.lib advapi32.lib user32.lib
guilibs	    = $(baselibs) gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
d303 23
d327 1
a327 10
#---------------------------------------------------------------------
# TkTest flags
#---------------------------------------------------------------------

!if "$(TESTPAT)" != ""
TESTFLAGS   = -file $(TESTPAT)
!endif


#---------------------------------------------------------------------
d329 1
a329 1
#---------------------------------------------------------------------
d331 8
a338 20
release:  setup $(TKSTUBLIB) $(WISH)
all:	  release $(CAT32)
core:	  setup $(TKSTUBLIB) $(TKLIB)
console-wish : $(WISHC)
install:  install-binaries install-libraries install-docs
tktest:	  setup $(TKTEST) $(CAT32)


test: setup $(TKTEST) $(TKLIB) $(CAT32)
	set TCL_LIBRARY=$(TCL_LIBRARY)
!if $(TCLINSTALL)
	set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
	$(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
!else
	$(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
!endif
d341 2
a342 6
	set TCL_LIBRARY=$(TCL_LIBRARY)
!if $(TCLINSTALL)
	set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
d345 6
a350 8
rundemo: setup $(TKTEST) $(TKLIB) $(CAT32)
	set TCL_LIBRARY=$(TCL_LIBRARY)
!if $(TCLINSTALL)
	set PATH=$(_TCLDIR)\bin;$(PATH)
!else
	set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
	$(TKTEST) $(ROOT)\library\demos\widget
d353 2
a354 2
	@@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
	@@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
d356 6
a361 3
!if !$(STATIC_BUILD)
$(TKIMPLIB): $(TKLIB)
!endif
d363 16
a378 12
$(TKLIB): $(TKOBJS)
!if $(STATIC_BUILD)
	$(lib32) -nologo -out:$@@ @@<<
$**
<<
!else
	$(link32) $(dlllflags) -base:@@$(COFFBASE),tk -out:$@@ $(guilibs) \
		$(TCLSTUBLIB) @@<<
$**
<<
	-@@del $*.exp
!endif
d380 1
d383 1
a383 1
	$(lib32) -nologo -out:$@@ $**
d385 6
d392 1
a392 5
$(WISH): $(WISHOBJS) $(TKIMPLIB)
	$(link32) $(guilflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**

$(WISHC): $(WISHOBJS) $(TKIMPLIB)
	$(link32) $(conlflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**
d394 5
a398 24
$(TKTEST): $(TKTESTOBJS) $(TKIMPLIB)
	$(link32) $(guilflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**


$(CAT32): $(_TCLDIR)\win\cat.c
	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?
	$(link32) $(conlflags) -out:$@@ -stack:16384 $(TMP_DIR)\cat.obj $(baselibs)

install-binaries:
	@@xcopy /i /y "$(WISH)" "$(BIN_INSTALL_DIR)\"
!if "$(TKLIB)" != "$(TKIMPLIB)"
	@@xcopy /i /y "$(TKLIB)" "$(BIN_INSTALL_DIR)\"
!endif
	@@xcopy /i /y "$(TKIMPLIB)" "$(LIB_INSTALL_DIR)\"
	@@xcopy /i /y "$(TKSTUBLIB)" "$(LIB_INSTALL_DIR)\"

install-libraries:
	@@xcopy /i /y "$(GENERICDIR)\tk.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(GENERICDIR)\tkDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11\"
	@@xcopy /i /y "$(ROOT)\library" "$(SCRIPT_INSTALL_DIR)\" /s /exclude:<<
CVS
d401 20
d422 1
a422 1
#---------------------------------------------------------------------
d424 1
a424 1
#---------------------------------------------------------------------
d427 2
a428 2
	$(TCLSH) $(_TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\$(PROJECT).decls $(GENERICDIR)\$(PROJECT)Int.decls
d430 1
a430 106

#---------------------------------------------------------------------
# Generate the makefile depedancies.
#---------------------------------------------------------------------

depend:
!if !exist($(TCLSH))
	@@echo Build tclsh first!
!else
	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
		-passthru:"-DBUILD_tcl $(TK_INCLUDES:"="")" $(GENERICDIR) \
		$(COMPATDIR) $(WINDIR) @@<<
$(TKOBJS)
<<
!endif


#---------------------------------------------------------------------
# Regenerate the windows help files.
#---------------------------------------------------------------------

HLPBASE		= $(PROJECT)$(VERSION)
HELPFILE	= $(OUT_DIR)\$(HLPBASE).hlp
HELPCNT		= $(OUT_DIR)\$(HLPBASE).cnt
DOCTMP_DIR	= $(OUT_DIR)\$(PROJECT)_docs
HELPRTF		= $(DOCTMP_DIR)\$(PROJECT).rtf
MAN2HELP	= $(DOCTMP_DIR)\man2help.tcl
MAN2HELP2	= $(DOCTMP_DIR)\man2help2.tcl
INDEX		= $(DOCTMP_DIR)\index.tcl
BMP		= $(DOCTMP_DIR)\lamp.bmp
BMP_NOPATH	= lamp.bmp
MAN2TCL		= $(DOCTMP_DIR)\man2tcl.exe

winhelp: docsetup $(HELPFILE)

docsetup:
	@@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)

$(MAN2HELP) $(MAN2HELP2) $(INDEX): $(TOOLSDIR)\$$(@@F)
	copy $(TOOLSDIR)\$(@@F) $(@@D)

$(BMP):
	copy $(WINDIR)\$(@@F) $(@@D)

$(HELPFILE): $(HELPRTF) $(BMP)
	cd $(DOCTMP_DIR)
	start /wait hcrtf.exe -x <<$(PROJECT).hpj
[OPTIONS]
COMPRESS=12 Hall Zeck
LCID=0x409 0x0 0x0 ; English (United States)
TITLE=Tk Reference Manual
BMROOT=.
CNT=$(@@B).cnt
HLP=$(@@B).hlp

[FILES]
$(PROJECT).rtf

[WINDOWS]
main="Tcl/Tk Reference Manual",,27648,(r15263976),(r4227327)

[CONFIG]
BrowseButtons()
CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))
CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))
CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))
CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
<<
	cd $(MAKEDIR)
	copy "$(DOCTMP_DIR)\$(@@B).hlp" "$(OUT_DIR)"
	copy "$(DOCTMP_DIR)\$(@@B).cnt" "$(OUT_DIR)"

$(MAN2TCL): $(TOOLSDIR)\$$(@@B).c
	$(cc32) -nologo -G4 -ML -O2 -Fo$(@@D)\ $(TOOLSDIR)\$(@@B).c -link -out:$@@

$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX)
	$(TCLSH) $(MAN2HELP:\=/) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)

install-docs:
!if exist($(HELPFILE))
	@@xcopy /i /y "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
	@@xcopy /i /y "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
	$(TCLSH) <<
puts "Installing $(PROJECT)'s helpfile contents into Tcl's ..."
set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt" r]
while {![eof $$f]} {
    if {[regexp {:Include $(PROJECT)([0-9]{2}).cnt} [gets $$f] dummy ver]} {
	if {$$ver == $(VERSION)} {
	    puts "Already installed."
	    exit
	} else {
	    # do something here logical to remove (or replace) it.
	    puts "$$ver != $(VERSION), unfinished code path, die, die!"
	    exit 1
	}
    }
}
close $$f
set f [open $(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt a]
puts $$f {:Include $(HLPBASE).cnt}
close $$f
<<
	start /wait winhlp32 -g $(DOC_INSTALL_DIR)\tcl$(VERSION).hlp
!endif

#---------------------------------------------------------------------
d432 1
a432 1
#---------------------------------------------------------------------
d434 1
a434 4
$(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c
!if $(TCL_LINKWITHEXTENSIONS)
	$(cc32) $(WISH_CFLAGS) -DTK_TEST -DTCL_LINKWITHEXTENSIONS -Fo$@@ $?
!else
a435 1
!endif
d437 1
a437 1
$(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
d440 1
a440 1
$(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c
d443 1
a443 1
$(TMP_DIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c
d446 1
a446 4
$(TMP_DIR)\winMain.obj: $(WINDIR)\winMain.c
!if $(TCL_LINKWITHEXTENSIONS)
	$(cc32) $(WISH_CFLAGS) -DTCL_LINKWITHEXTENSIONS -Fo$@@ $?
!else
a447 1
!endif
d449 12
a460 3
# The following objects are part of the stub library and should not
# be built as DLL objects but none of the symbols should be exported
# and no reference made to a C runtime.
d462 2
a463 2
$(TMP_DIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
	$(cc32) $(cdebug) $(cflags) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@@ $?
d465 10
a474 2
$(TMP_DIR)\tkStubImg.obj : $(GENERICDIR)\tkStubImg.c
	$(cc32) $(cdebug) $(cflags) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@@ $?
d476 12
d489 1
a489 3
#---------------------------------------------------------------------
# Dedependency rules
#---------------------------------------------------------------------
d491 1
a491 1
$(TMP_DIR)\tk.res: \
a504 1
$(GENERICDIR)/tkPanedWindow.c: $(GENERICDIR)/default.h
a525 60
!if exist("$(OUT_DIR)\depend.mk")
!include "$(OUT_DIR)\depend.mk"
!message *** Dependency rules in effect.
!else
!message *** Dependency rules are not being used.
!endif

### add a spacer in the output
!message

#---------------------------------------------------------------------
# Implicit rules
#---------------------------------------------------------------------

{$(XLIBDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(WINDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(ROOT)\unix}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(RCDIR)}.rc{$(TMP_DIR)}.res:
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) \
!if $(DEBUG)
		-d DEBUG \
!endif
!if $(TCL_THREADS)
		-d TCL_THREADS \
!endif
!if $(STATIC_BUILD)
		-d STATIC_BUILD \
!endif
		$<

#---------------------------------------------------------------------
# Clean up
#---------------------------------------------------------------------

clean:
	-@@$(RMDIR) $(TMP_DIR)

hose: clean
	-@@$(RMDIR) $(OUT_DIR)


.SUFFIXES:
.SUFFIXES:.c .rc
@


1.42.2.2
log
@merged with trunk at tag macosx-8-4-merge-2002-08-20-trunk
@
text
@a353 1
	$(TMP_DIR)\tkStyle.obj \
a362 1
	$(TMP_DIR)\tkUndo.obj \
d468 1
a468 1
guilibs	    = $(baselibs) shell32.lib gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
d577 3
a579 6
	@@xcopy /i /y "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
	@@xcopy /i /y "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
	@@xcopy /i /y "$(ROOT)\library\demos\*" "$(SCRIPT_INSTALL_DIR)\demos\"
	@@xcopy /i /y "$(ROOT)\library\demos\images\*" "$(SCRIPT_INSTALL_DIR)\demos\images\"
	@@xcopy /i /y "$(ROOT)\library\images\*" "$(SCRIPT_INSTALL_DIR)\images\"
	@@xcopy /i /y "$(ROOT)\library\msgs\*" "$(SCRIPT_INSTALL_DIR)\msgs\"
a756 1
$(GENERICDIR)/tkUndo.c: $(GENERICDIR)/tkUndo.h
@


1.41
log
@updated for Win64 SDK RC1 compilation support
@
text
@d10 1
a10 1
# RCS: @@(#) $Id: makefile.vc,v 1.40 2001/03/30 23:50:17 hobbs Exp $
d55 2
a56 2
#TOOLS32		= C:\Progra~1\devstudio\vc
#TOOLS32_rc	= C:\Progra~1\devstudio\sharedide
d59 2
a60 2
TOOLS32		= C:\Progra~1\Microsoft Visual Studio\VC98
TOOLS32_rc	= C:\Progra~1\Microsoft Visual Studio\common\MSDev98
d80 1
@


1.40
log
@	* win/makefile.vc:
	* win/configure:
	* win/tcl.m4: added imm32.lib to LIBS_GUI for Tk IME support.
	* win/tkWinInt.h:
	* win/tkWinKey.c:
	* win/tkWinX.c: added support for changing IME on the fly in
	Windows (2000).  (lam) [Patch #402993]
@
text
@d8 1
d10 1
a10 1
# RCS: @@(#) $Id: makefile.vc,v 1.39 2000/11/03 01:16:30 hobbs Exp $
d42 1
a42 1
# Microsoft Platform SDK for Whistler, build 2267
d44 2
a45 2
TOOLS32		= C:\Progra~1\Microsoft Platform SDK
TOOLS32_rc	= C:\Progra~1\Microsoft Platform SDK
d259 1
a259 1
TK_DEFINES	= -D__WIN32__ $(DEBUGDEFINES) $(THREADDEFINES)
d266 2
a267 3
!IF "$(MACHINE)" == "ALPHA"
# MSVC on Alpha doesn't understand -Ot
cdebug	= -O2i -Gs -GD
@


1.39
log
@	* win/tcl.m4:
	* win/makefile.vc: updated for Win64 compile support
@
text
@d9 1
a9 1
# RCS: @@(#) $Id: makefile.vc,v 1.38 2000/10/31 01:28:26 davidg Exp $
d320 2
a321 1
winlibs    = $(baselibs) user32.lib gdi32.lib comdlg32.lib winspool.lib
@


1.39.4.1
log
@        * Merged in updates from HEAD branch.
@
text
@d9 1
a9 1
# RCS: @@(#) $Id: makefile.vc,v 1.40 2001/03/30 23:50:17 hobbs Exp $
d320 1
a320 2
winlibs    = $(baselibs) user32.lib gdi32.lib comdlg32.lib winspool.lib \
             imm32.lib
@


1.39.2.1
log
@	* generic/tk.decls:
	* generic/tkInt.decls:
	* generic/tkIntPlatDecls.h:
	* generic/tkPlatDecls.h:
	* generic/tkStubInit.c:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/tkWin3d.c:
	* win/tkWinButton.c:
	* win/tkWinColor.c:
	* win/tkWinDraw.c:
	* win/tkWinFont.c:
	* win/tkWinGdi.c (new):
	* win/tkWinGdi.h (new):
	* win/tkWinImage.c:
	* win/tkWinInt.h:
	* win/tkWinMenu.c:
	* win/tkWinPixmap.c:
	* win/tkWinUtil.c (new):
	* win/tkWinWindow.c:
	* win/tkWinWm.c:
	* win/tkWinX.c:
	* win/winMain.c:
	* xlib/xgc.c:
	* xlib/X11/Xlib.h: first cut at Windows speedup improvements by
	Leo Schubert.  Needs to be streamlined, but the code is correct
	and passes all tests.
@
text
@d9 1
a9 1
# RCS: @@(#) $Id: makefile.vc,v 1.39 2000/11/03 01:16:30 hobbs Exp $
a173 2
	$(TMPDIR)\tkWinGdi.obj \
	$(TMPDIR)\tkWinUtil.obj \
@


1.39.2.2
log
@sync with head
@
text
@d1 1
a1 4
#------------------------------------------------------------------------------
# makefile.vc --
#
#	Microsoft Visual C++ makefile for use with nmake.exe v1.62+ (VC++ 5.0+)
d6 1
a6 1
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
a7 2
# Copyright (c) 2001 ActiveState Corporation.
# Copyright (c) 2001-2002 David Gravereaux.
d9 5
a13 10
#------------------------------------------------------------------------------
# RCS: @@(#) $Id: makefile.vc,v 1.58 2002/03/29 04:14:40 davygrvy Exp $
#------------------------------------------------------------------------------

!if "$(MSVCDIR)" == ""
MSG = ^
You'll need to run vcvars32.bat from Developer Studio, first, to setup^
the environment.  Jump to this line to read the new instructions.
!error $(MSG)
!endif
a14 2
#------------------------------------------------------------------------------
# HOW TO USE this makefile:
d16 60
a75 126
# 1)  It is now necessary to have MSVCDir set in the environment.  This is used
#     as a check to see if vcvars32.bat had been run prior to running nmake or
#     during the install of Microsoft Developer Studio, MSVCDir had been set
#     globally and the PATH adjusted.  Either way is valid.
#
#     You'll need to run vcvars32.bat contained in the MsDev's vc(98)/bin
#     directory to setup the proper environment, if needed, for your current
#     setup.  This is a needed bootstrap requirement and allows the swapping of
#     different environments to be easier.
#
# 2)  To use the Platform SDK (not expressly needed), run setenv.bat after
#     vcvars32.bat according to the instructions for it.  This can also turn on
#     the 64-bit compiler, if your SDK has it.
#
# 3)  Targets are:
#	release  -- builds the core, the shell. (default)
#	core     -- Only builds the core.
#	all      -- builds everything.
#	test     -- builds and runs the test suite.
#	tktest   -- just builds the binaries for the test suite.
#	install  -- installs the built binaries and libraries to $(INSTALLDIR)
#		    as the root of the install tree.
#	console-wish -- builds a console version of wish.
#	clean    -- removes the contents of $(TMP_DIR)
#	hose     -- removes the contents of $(TMP_DIR) and $(OUT_DIR)
#	genstubs -- rebuilds the Stubs table and support files (dev only).
#	depend   -- Generates an accurate set of source dependancies for this
#		    makefile.  Helpful to avoid problems when the sources are
#		    refreshed and you rebuild, but can "overbuild" when common
#		    headers like tkInt.h just get small changes.
#	winhelp  -- builds the windows .hlp file for Tcl from the troff man
#		    files.
#
# 4)  Macros usable on the commandline:
#	TCLDIR=<path>
#		Sets the location for where to find the Tcl headers and
#		libraries.  The install point is assumed when not specified.
#		Tk does need the source directory, though.  Tk comes very close
#		to not needing the sources, but does, in fact, require them.
#
#	INSTALLDIR=<path>
#		Sets where to install Tcl from the built binaries.
#		C:\Progra~1\Tcl is assumed when not specified.
#
#	OPTS=static,msvcrt,linkexten,threads,symbols,profile,none
#		Sets special options for the core.  The default is for none.
#		Any combination of the above may be used (comma separated).
#		'none' will over-ride everything to nothing.
#
#		static  =  Builds a static library of the core instead of a
#			   dll.  The shell will be static (and large), as well.
#		msvcrt  =  Effects the static option only to switch it from
#			   using libcmt(d) as the C runtime [by default] to
#			   msvcrt(d). This is useful for static embedding
#			   support.
#		linkexten = Affects the static option only to switch wishXX.exe
#			   to have the dde and reg extension linked inside it.
#		threads =  Turns on full multithreading support.
#		symbols =  Adds symbols for step debugging.
#		profile =  Adds profiling hooks.  Map file is assumed.
#
#	STATS=memdbg,compdbg,none
#		Sets optional memory and bytecode compiler debugging code added
#		to the core.  The default is for none.  Any combination of the
#		above may be used (comma separated).  'none' will over-ride
#		everything to nothing.
#
#		memdbg   = Enables the debugging memory allocator.
#		compdbg  = Enables byte compilation logging.
#
#	MACHINE=(IX86|IA64|ALPHA)
#		Set the machine type used for the compiler, linker, and
#		resource compiler.  This hook is needed to tell the tools
#		when alternate platforms are requested.  IX86 is the default
#		when not specified.
#
#	TMP_DIR=<path>
#	OUT_DIR=<path>
#		Hooks to allow the intermediate and output directories to be
#		changed.  $(OUT_DIR) is assumed to be 
#		$(BINROOT)\(Release|Debug) based on if symbols are requested.
#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.
#
#	TESTPAT=<file>
#		Reads the tests requested to be run from this file.
#
# 5)  Examples:
#
#	Basic syntax of calling nmake looks like this:
#	nmake [-nologo] -f makefile.vc [target|macrodef [target|macrodef] [...]]
#
#                        Standard (no frills)
#       c:\tk_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
#       Setting environment for using Microsoft Visual C++ tools.
#       c:\tk_src\win\>nmake -f makefile.vc release
#       c:\tk_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
#
#                         Building for Win64
#       c:\tk_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
#       Setting environment for using Microsoft Visual C++ tools.
#       c:\tk_src\win\>c:\progra~1\platfo~1\setenv.bat /pre64 /RETAIL
#       Targeting Windows pre64 RETAIL
#       c:\tk_src\win\>nmake -f makefile.vc MACHINE=IA64
#
#------------------------------------------------------------------------------
#==============================================================================
###############################################################################


#    //==================================================================\\
#   >>[               -> Do not modify below this line. <-               ]<<
#   >>[  Please, use the commandline macros to modify how Tcl is built.  ]<<
#   >>[  If you need more features, send us a patch for more macros.     ]<<
#    \\==================================================================//


###############################################################################
#==============================================================================
#------------------------------------------------------------------------------

!if !exist("makefile.vc")
MSG = ^
You must run this makefile only from the directory it is in.^
Please `cd` to its location first.
!error $(MSG) 
!endif
d77 2
a78 2
PROJECT	= tk
!include "rules.vc"
d80 3
a82 20
!if !defined(TCLDIR)
!if exist($(INSTALLDIR)\include\tcl.h)
TCLINSTALL	= 1
TCLDIR		= $(INSTALLDIR)
!else
MSG=^
Don't know where tcl.h is.  Set the TCLDIR macro.
!error $(MSG)
!endif
!else
!if exist($(TCLDIR)\include\tcl.h)
TCLINSTALL	= 1
!elseif exist($(TCLDIR)\generic\tcl.h)
TCLINSTALL	= 0
!else
MSG =^
Don't know where tcl.h is.  the TCLDIR macro doesn't appear correct.
!error $(MSG)
!endif
!endif
d84 4
a87 1
STUBPREFIX = $(PROJECT)stub
a88 2
VERSION = $(DOTVERSION:.=)
WISHNAMEPREFIX = wish
d90 2
a91 2
BINROOT		= .
ROOT		= ..
a92 35
TCLIMPLIBNAME	= tcl$(VERSION)$(SUFX).lib
TCLLIBNAME	= tcl$(VERSION)$(SUFX).$(EXT)
TCLSTUBLIBNAME	= tclstub$(VERSION).lib

TCLREGLIBNAME	= tclreg10$(SUFX:t=).lib
TCLDDELIBNAME	= tcldde12$(SUFX:t=).lib

TKIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
TKLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
TKLIB		= $(OUT_DIR)\$(TKLIBNAME)

TKSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)

!if $(TCLINSTALL)
TCLSH		= $(INSTALLDIR)\bin\tclsh$(VERSION)$(SUFX).exe
TCLSTUBLIB	= $(INSTALLDIR)\lib\$(TCLSTUBLIBNAME)
TCLIMPLIB	= $(INSTALLDIR)\lib\$(TCLIMPLIBNAME)
TCL_LIBRARY	= $(INSTALLDIR)\lib
TCLREGLIB	= $(INSTALLDIR)\lib\$(TCLREGLIBNAME)
TCLDDELIB	= $(INSTALLDIR)\lib\$(TCLDDELIBNAME)
TCLTMP_DIR	= \must\have\tcl\sources\to\build\this\target
COFFBASE	= \must\have\tcl\sources\to\build\this\target
TOOLSDIR	= \must\have\tcl\sources\to\build\this\target
!else
TCLSH		= $(TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(VERSION)$(SUFX).exe
TCLSTUBLIB	= $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLSTUBLIBNAME)
TCLIMPLIB	= $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLIMPLIBNAME)
TCL_LIBRARY	= $(TCLDIR)\library
TCLREGLIB	= $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLREGLIBNAME)
TCLDDELIB	= $(TCLDIR)\win\$(BUILDDIRTOP)\$(TCLDDELIBNAME)
TCLTMP_DIR	= $(TCLDIR)\win\$(TMP_DIR:tk=tcl)
COFFBASE	= $(TCLDIR)\win\coffbase.txt
TOOLSDIR	= $(TCLDIR)\tools
!endif
d94 34
a127 13
WISH 		= $(OUT_DIR)\$(WISHNAMEPREFIX)$(VERSION)$(SUFX).exe
WISHC 		= $(OUT_DIR)\$(WISHNAMEPREFIX)c$(VERSION)$(SUFX).exe

TKTEST		= $(OUT_DIR)\$(PROJECT)test.exe
CAT32		= $(OUT_DIR)\cat32.exe
RMDIR		= .\rmd.bat
RM		= del

LIB_INSTALL_DIR		= $(INSTALLDIR)\lib
BIN_INSTALL_DIR		= $(INSTALLDIR)\bin
DOC_INSTALL_DIR		= $(INSTALLDIR)\doc
SCRIPT_INSTALL_DIR	= $(INSTALLDIR)\lib\$(PROJECT)$(DOTVERSION)
INCLUDE_INSTALL_DIR	= $(INSTALLDIR)\include
d130 1
a130 6
	$(TMP_DIR)\winMain.obj \
!if $(TCL_LINKWITHEXTENSIONS)
	$(TCLDDELIB) \
	$(TCLREGLIB) \
!endif
	$(TMP_DIR)\wish.res
d133 5
a137 5
	$(TMP_DIR)\tkTest.obj \
	$(TMP_DIR)\tkSquare.obj \
	$(TMP_DIR)\testMain.obj \
	$(TMP_DIR)\tkWinTest.obj \
	$(TCLTMP_DIR)\tclThreadTest.obj
d140 5
a144 5
	$(TMP_DIR)\xcolors.obj \
	$(TMP_DIR)\xdraw.obj \
	$(TMP_DIR)\xgc.obj \
	$(TMP_DIR)\ximage.obj \
	$(TMP_DIR)\xutil.obj
d147 3
a149 3
	$(TMP_DIR)\tkConsole.obj \
	$(TMP_DIR)\tkUnixMenubu.obj \
	$(TMP_DIR)\tkUnixScale.obj \
d151 96
a246 104
	$(TMP_DIR)\tkWin3d.obj \
	$(TMP_DIR)\tkWin32Dll.obj \
	$(TMP_DIR)\tkWinButton.obj \
	$(TMP_DIR)\tkWinClipboard.obj \
	$(TMP_DIR)\tkWinColor.obj \
	$(TMP_DIR)\tkWinConfig.obj \
	$(TMP_DIR)\tkWinCursor.obj \
	$(TMP_DIR)\tkWinDialog.obj \
	$(TMP_DIR)\tkWinDraw.obj \
	$(TMP_DIR)\tkWinEmbed.obj \
	$(TMP_DIR)\tkWinFont.obj \
	$(TMP_DIR)\tkWinImage.obj \
	$(TMP_DIR)\tkWinInit.obj \
	$(TMP_DIR)\tkWinKey.obj \
	$(TMP_DIR)\tkWinMenu.obj \
	$(TMP_DIR)\tkWinPixmap.obj \
	$(TMP_DIR)\tkWinPointer.obj \
	$(TMP_DIR)\tkWinRegion.obj \
	$(TMP_DIR)\tkWinScrlbr.obj \
	$(TMP_DIR)\tkWinSend.obj \
	$(TMP_DIR)\tkWinWindow.obj \
	$(TMP_DIR)\tkWinWm.obj \
	$(TMP_DIR)\tkWinX.obj \
	$(TMP_DIR)\tkWinGdi.obj \
	$(TMP_DIR)\tkWinUtil.obj \
	$(TMP_DIR)\stubs.obj \
	$(TMP_DIR)\tk3d.obj \
	$(TMP_DIR)\tkArgv.obj \
	$(TMP_DIR)\tkAtom.obj \
	$(TMP_DIR)\tkBind.obj \
	$(TMP_DIR)\tkBitmap.obj \
	$(TMP_DIR)\tkButton.obj \
	$(TMP_DIR)\tkCanvArc.obj \
	$(TMP_DIR)\tkCanvBmap.obj \
	$(TMP_DIR)\tkCanvImg.obj \
	$(TMP_DIR)\tkCanvLine.obj \
	$(TMP_DIR)\tkCanvPoly.obj \
	$(TMP_DIR)\tkCanvPs.obj \
	$(TMP_DIR)\tkCanvText.obj \
	$(TMP_DIR)\tkCanvUtil.obj \
	$(TMP_DIR)\tkCanvWind.obj \
	$(TMP_DIR)\tkCanvas.obj \
	$(TMP_DIR)\tkClipboard.obj \
	$(TMP_DIR)\tkCmds.obj \
	$(TMP_DIR)\tkColor.obj \
	$(TMP_DIR)\tkConfig.obj \
	$(TMP_DIR)\tkCursor.obj \
	$(TMP_DIR)\tkEntry.obj \
	$(TMP_DIR)\tkError.obj \
	$(TMP_DIR)\tkEvent.obj \
	$(TMP_DIR)\tkFileFilter.obj \
	$(TMP_DIR)\tkFocus.obj \
	$(TMP_DIR)\tkFont.obj \
	$(TMP_DIR)\tkFrame.obj \
	$(TMP_DIR)\tkGC.obj \
	$(TMP_DIR)\tkGeometry.obj \
	$(TMP_DIR)\tkGet.obj \
	$(TMP_DIR)\tkGrab.obj \
	$(TMP_DIR)\tkGrid.obj \
	$(TMP_DIR)\tkImage.obj \
	$(TMP_DIR)\tkImgBmap.obj \
	$(TMP_DIR)\tkImgGIF.obj \
	$(TMP_DIR)\tkImgPPM.obj \
	$(TMP_DIR)\tkImgPhoto.obj \
	$(TMP_DIR)\tkImgUtil.obj \
	$(TMP_DIR)\tkListbox.obj \
	$(TMP_DIR)\tkMacWinMenu.obj \
	$(TMP_DIR)\tkMain.obj \
	$(TMP_DIR)\tkMenu.obj \
	$(TMP_DIR)\tkMenubutton.obj \
	$(TMP_DIR)\tkMenuDraw.obj \
	$(TMP_DIR)\tkMessage.obj \
	$(TMP_DIR)\tkPanedWindow.obj \
	$(TMP_DIR)\tkObj.obj \
	$(TMP_DIR)\tkOldConfig.obj \
	$(TMP_DIR)\tkOption.obj \
	$(TMP_DIR)\tkPack.obj \
	$(TMP_DIR)\tkPlace.obj \
	$(TMP_DIR)\tkPointer.obj \
	$(TMP_DIR)\tkRectOval.obj \
	$(TMP_DIR)\tkScale.obj \
	$(TMP_DIR)\tkScrollbar.obj \
	$(TMP_DIR)\tkSelect.obj \
	$(TMP_DIR)\tkText.obj \
	$(TMP_DIR)\tkTextBTree.obj \
	$(TMP_DIR)\tkTextDisp.obj \
	$(TMP_DIR)\tkTextImage.obj \
	$(TMP_DIR)\tkTextIndex.obj \
	$(TMP_DIR)\tkTextMark.obj \
	$(TMP_DIR)\tkTextTag.obj \
	$(TMP_DIR)\tkTextWind.obj \
	$(TMP_DIR)\tkTrig.obj \
	$(TMP_DIR)\tkUtil.obj \
	$(TMP_DIR)\tkVisual.obj \
	$(TMP_DIR)\tkStubInit.obj \
	$(TMP_DIR)\tkStubLib.obj \
	$(TMP_DIR)\tkWindow.obj \
!if !$(STATIC_BUILD)
	$(TMP_DIR)\tk.res
!endif

TKSTUBOBJS = \
	$(TMP_DIR)\tkStubLib.obj \
	$(TMP_DIR)\tkStubImg.obj
d248 2
d255 1
a255 1
DOCDIR		= $(ROOT)\doc
d258 3
a260 7
!if $(TCLINSTALL)
TCL_INCLUDES	= -I "$(TCLDIR)\include"
!else
TCL_INCLUDES	= -I "$(TCLDIR)\win" -I "$(TCLDIR)\generic"
!endif
TK_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(BITMAPDIR)" -I"$(XLIBDIR)" \
			$(TCL_INCLUDES)
d262 1
a262 4
TK_DEFINES	= $(OPTDEFINES)


#---------------------------------------------------------------------
d264 1
a264 1
#---------------------------------------------------------------------
d266 13
a278 11
!if $(DEBUG)
!if "$(MACHINE)" == "IA64"
cdebug = -Od -Zi
!else
cdebug = -Z7 -Od -WX
!endif
!else
# This cranks the optimization level up.  We can't use -02 because sometimes
# it causes problems.
cdebug = -Oti
!endif
d281 2
a282 1
cflags = -nologo -c -W3 -YX -Fp$(TMP_DIR)^\
d284 5
a288 18
!if $(PENT_0F_ERRATA)
cflags = $(cflags) -QI0f
!endif

!if $(ITAN_B_ERRATA)
cflags = $(cflags) -QIA64_Bx
!endif

!if $(MSVCRT)
crt = -MD$(DBGX)
!else
crt = -MT$(DBGX)
!endif

BASE_CLFAGS	= $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
TK_CFLAGS	= $(BASE_CLFAGS) $(TK_DEFINES) -DUSE_TCL_STUBS
CON_CFLAGS	= $(cdebug) $(cflags) $(crt) -DCONSOLE
WISH_CFLAGS	= $(BASE_CLFAGS) $(TK_DEFINES)
d290 1
a290 2

#---------------------------------------------------------------------
d292 1
a292 1
#---------------------------------------------------------------------
d294 3
a296 1
!if $(DEBUG)
d298 1
a298 3
!else
ldebug	= -release -opt:ref -opt:icf,3
!endif
d301 2
a302 24
lflags	= -nologo -machine:$(MACHINE) $(ldebug)

!if $(PROFILE)
lflags	= $(lflags) -profile
!endif

!if $(ALIGN98_HACK) && !$(STATIC_BUILD)
# align sections for PE size savings.
lflags	= $(lflags) -opt:nowin98
!else if !$(ALIGN98_HACK) && $(STATIC_BUILD)
# align sections for speed in loading by choosing the virtual page size.
lflags	= $(lflags) -align:4096
!endif

!if $(LOIMPACT)
lflags	= $(lflags) -ws:aggressive
!endif

dlllflags = $(lflags) -dll
conlflags = $(lflags) -subsystem:console
guilflags = $(lflags) -subsystem:windows

baselibs   = kernel32.lib advapi32.lib user32.lib
guilibs	    = $(baselibs) gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
d304 22
d327 1
a327 10
#---------------------------------------------------------------------
# TkTest flags
#---------------------------------------------------------------------

!if "$(TESTPAT)" != ""
TESTFLAGS   = -file $(TESTPAT)
!endif


#---------------------------------------------------------------------
d329 1
a329 1
#---------------------------------------------------------------------
d331 8
a338 20
release:  setup $(TKSTUBLIB) $(WISH)
all:	  release $(CAT32)
core:	  setup $(TKSTUBLIB) $(TKLIB)
console-wish : $(WISHC)
install:  install-binaries install-libraries install-docs
tktest:	  setup $(TKTEST) $(CAT32)


test: setup $(TKTEST) $(TKLIB) $(CAT32)
	set TCL_LIBRARY=$(TCL_LIBRARY)
!if $(TCLINSTALL)
	set PATH=$(TCLDIR)\bin;$(PATH)
!else
	set PATH=$(TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
	$(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
!else
	$(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
!endif
d341 2
a342 6
	set TCL_LIBRARY=$(TCL_LIBRARY)
!if $(TCLINSTALL)
	set PATH=$(TCLDIR)\bin;$(PATH)
!else
	set PATH=$(TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
d345 6
a350 8
rundemo: setup $(TKTEST) $(TKLIB) $(CAT32)
	set TCL_LIBRARY=$(TCL_LIBRARY)
!if $(TCLINSTALL)
	set PATH=$(TCLDIR)\bin;$(PATH)
!else
	set PATH=$(TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
	$(TKTEST) $(ROOT)\library\demos\widget
d353 2
a354 2
	@@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
	@@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
d356 6
a361 3
!if !$(STATIC_BUILD)
$(TKIMPLIB): $(TKLIB)
!endif
d363 16
a378 12
$(TKLIB): $(TKOBJS)
!if $(STATIC_BUILD)
	$(lib32) -nologo -out:$@@ @@<<
$**
<<
!else
	$(link32) $(dlllflags) -base:@@$(COFFBASE),tk -out:$@@ $(guilibs) \
		$(TCLSTUBLIB) @@<<
$**
<<
	-@@del $*.exp
!endif
d380 1
d383 1
a383 1
	$(lib32) -nologo -out:$@@ $**
d385 6
d392 1
a392 2
$(WISH): $(WISHOBJS) $(TKIMPLIB)
	$(link32) $(guilflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**
d394 6
a399 5
$(WISHC): $(WISHOBJS) $(TKIMPLIB)
	$(link32) $(conlflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**

$(TKTEST): $(TKTESTOBJS) $(TKIMPLIB)
	$(link32) $(guilflags) -out:$@@ $(guilibs) $(TCLIMPLIB) $**
d401 16
d419 2
a420 2
	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?
	$(link32) $(conlflags) -out:$@@ -stack:16384 $(TMP_DIR)\cat.obj $(baselibs)
d422 1
a422 20
install-binaries:
	@@xcopy /i /y "$(WISH)" "$(BIN_INSTALL_DIR)\"
!if "$(TKLIB)" != "$(TKIMPLIB)"
	@@xcopy /i /y "$(TKLIB)" "$(BIN_INSTALL_DIR)\"
!endif
	@@xcopy /i /y "$(TKIMPLIB)" "$(LIB_INSTALL_DIR)\"
	@@xcopy /i /y "$(TKSTUBLIB)" "$(LIB_INSTALL_DIR)\"

install-libraries:
	@@xcopy /i /y "$(GENERICDIR)\tk.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(GENERICDIR)\tkDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)\"
	@@xcopy /i /y "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11\"
	@@xcopy /i /y "$(ROOT)\library" "$(SCRIPT_INSTALL_DIR)\" /s /exclude:<<
CVS
<<


#---------------------------------------------------------------------
d424 1
a424 1
#---------------------------------------------------------------------
d427 2
a428 2
	$(TCLSH) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\$(PROJECT).decls $(GENERICDIR)\$(PROJECT)Int.decls
d430 1
a430 106

#---------------------------------------------------------------------
# Generate the makefile depedancies.
#---------------------------------------------------------------------

depend:
!if !exist($(TCLSH))
	@@echo Build tclsh first!
!else
	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
		-passthru:"-DBUILD_tcl $(TK_INCLUDES:"="")" $(GENERICDIR) \
		$(COMPATDIR) $(WINDIR) @@<<
$(TKOBJS)
<<
!endif


#---------------------------------------------------------------------
# Regenerate the windows help files.
#---------------------------------------------------------------------

HLPBASE		= $(PROJECT)$(VERSION)
HELPFILE	= $(OUT_DIR)\$(HLPBASE).hlp
HELPCNT		= $(OUT_DIR)\$(HLPBASE).cnt
DOCTMP_DIR	= $(OUT_DIR)\$(PROJECT)_docs
HELPRTF		= $(DOCTMP_DIR)\$(PROJECT).rtf
MAN2HELP	= $(DOCTMP_DIR)\man2help.tcl
MAN2HELP2	= $(DOCTMP_DIR)\man2help2.tcl
INDEX		= $(DOCTMP_DIR)\index.tcl
BMP		= $(DOCTMP_DIR)\lamp.bmp
BMP_NOPATH	= lamp.bmp
MAN2TCL		= $(DOCTMP_DIR)\man2tcl.exe

winhelp: docsetup $(HELPFILE)

docsetup:
	@@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)

$(MAN2HELP) $(MAN2HELP2) $(INDEX): $(TOOLSDIR)\$$(@@F)
	copy $(TOOLSDIR)\$(@@F) $(@@D)

$(BMP):
	copy $(WINDIR)\$(@@F) $(@@D)

$(HELPFILE): $(HELPRTF) $(BMP)
	cd $(DOCTMP_DIR)
	start /wait hcrtf.exe -x <<$(PROJECT).hpj
[OPTIONS]
COMPRESS=12 Hall Zeck
LCID=0x409 0x0 0x0 ; English (United States)
TITLE=Tk Reference Manual
BMROOT=.
CNT=$(@@B).cnt
HLP=$(@@B).hlp

[FILES]
$(PROJECT).rtf

[WINDOWS]
main="Tcl/Tk Reference Manual",,27648,(r15263976),(r4227327)

[CONFIG]
BrowseButtons()
CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))
CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))
CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))
CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
<<
	cd $(MAKEDIR)
	copy "$(DOCTMP_DIR)\$(@@B).hlp" "$(OUT_DIR)"
	copy "$(DOCTMP_DIR)\$(@@B).cnt" "$(OUT_DIR)"

$(MAN2TCL): $(TOOLSDIR)\$$(@@B).c
	$(cc32) -nologo -G4 -ML -O2 -Fo$(@@D)\ $(TOOLSDIR)\$(@@B).c -link -out:$@@

$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX)
	$(TCLSH) $(MAN2HELP:\=/) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)

install-docs:
!if exist($(HELPFILE))
	@@xcopy /i /y "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
	@@xcopy /i /y "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
	$(TCLSH) <<
puts "Installing $(PROJECT)'s helpfile contents into Tcl's ..."
set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt" r]
while {![eof $$f]} {
    if {[regexp {:Include $(PROJECT)([0-9]{2}).cnt} [gets $$f] dummy ver]} {
	if {$$ver == $(VERSION)} {
	    puts "Already installed."
	    exit
	} else {
	    # do something here logical to remove (or replace) it.
	    puts "$$ver != $(VERSION), unfinished code path, die, die!"
	    exit 1
	}
    }
}
close $$f
set f [open $(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt a]
puts $$f {:Include $(HLPBASE).cnt}
close $$f
<<
	start /wait winhlp32 -g $(DOC_INSTALL_DIR)\tcl$(VERSION).hlp
!endif

#---------------------------------------------------------------------
d432 1
a432 1
#---------------------------------------------------------------------
d434 1
a434 4
$(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c
!if $(TCL_LINKWITHEXTENSIONS)
	$(cc32) $(WISH_CFLAGS) -DTK_TEST -DTCL_LINKWITHEXTENSIONS -Fo$@@ $?
!else
a435 1
!endif
d437 1
a437 1
$(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
d440 1
a440 1
$(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c
d443 1
a443 1
$(TMP_DIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c
d446 1
a446 4
$(TMP_DIR)\winMain.obj: $(WINDIR)\winMain.c
!if $(TCL_LINKWITHEXTENSIONS)
	$(cc32) $(WISH_CFLAGS) -DTCL_LINKWITHEXTENSIONS -Fo$@@ $?
!else
a447 1
!endif
d449 9
a457 3
# The following objects are part of the stub library and should not
# be built as DLL objects but none of the symbols should be exported
# and no reference made to a C runtime.
d459 2
a460 2
$(TMP_DIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
	$(cc32) $(cdebug) $(cflags) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@@ $?
d462 2
a463 2
$(TMP_DIR)\tkStubImg.obj : $(GENERICDIR)\tkStubImg.c
	$(cc32) $(cdebug) $(cflags) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@@ $?
d465 23
d489 1
a489 3
#---------------------------------------------------------------------
# Dedependency rules
#---------------------------------------------------------------------
d491 1
a491 1
$(TMP_DIR)\tk.res: \
a504 1
$(GENERICDIR)/tkPanedWindow.c: $(GENERICDIR)/default.h
a525 60
!if exist("$(OUT_DIR)\depend.mk")
!include "$(OUT_DIR)\depend.mk"
!message *** Dependency rules in effect.
!else
!message *** Dependency rules are not being used.
!endif

### add a spacer in the output
!message

#---------------------------------------------------------------------
# Implicit rules
#---------------------------------------------------------------------

{$(XLIBDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(WINDIR)}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(ROOT)\unix}.c{$(TMP_DIR)}.obj::
	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @@<<
$<
<<

{$(RCDIR)}.rc{$(TMP_DIR)}.res:
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) \
!if $(DEBUG)
		-d DEBUG \
!endif
!if $(TCL_THREADS)
		-d TCL_THREADS \
!endif
!if $(STATIC_BUILD)
		-d STATIC_BUILD \
!endif
		$<

#---------------------------------------------------------------------
# Clean up
#---------------------------------------------------------------------

clean:
	-@@$(RMDIR) $(TMP_DIR)

hose: clean
	-@@$(RMDIR) $(OUT_DIR)


.SUFFIXES:
.SUFFIXES:.c .rc
@


1.38
log
@2000-10-30  David Gravereaux  <davygrvy@@ajubasolutions.com>

	* win/configure.in:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/rc/tk.rc:
	* win/rc/tk_base.rc (new):
	* win/rc/wish.rc: Added logic to derive filenames better in the resource
	scripts based on compile options along with better support for building
	a static wish shell with cursor resources.
@
text
@d1 1
a1 1
# Visual C++ 2.x and 4.0 makefile
d7 3
a9 1
# RCS: @@(#) $Id: makefile.vc,v 1.37 2000/09/02 01:18:24 ericm Exp $
d32 1
a32 1
INSTALLDIR      = c:\progra~1\tcl
d35 2
a36 2
MACHINE	= IX86
#MACHINE	= ALPHA
d39 12
a50 5
TOOLS32		= c:\ia64sdk17
TOOLS32_rc	= c:\ia64sdk17
!ELSE IF "$(MACHINE)" == "ALPHA"
TOOLS32         = C:\Progra~1\Micros~2\vc98
TOOLS32_rc      = C:\Progra~1\Micros~2\common\MSDev98
d52 14
a65 2
TOOLS32		= c:\Progra~1\devstudio\vc
TOOLS32_rc	= c:\Progra~1\devstudio\sharedide
d68 3
a248 7

cc32		= "$(TOOLS32)\bin\cl.exe"
link32		= "$(TOOLS32)\bin\link.exe"
lib32		= "$(TOOLS32)\bin\lib.exe"
rc32		= "$(TOOLS32_rc)\bin\rc.exe"
include32	= -I"$(TOOLS32)\include"

d272 1
a272 2
!ELSE
!IF "$(MACHINE)" == "IA64"
a276 1
!ENDIF
d300 1
a300 1
lflags	= $(lcommon) /MACHINE:$(MACHINE)
a383 1
	set LIB=$(TOOLS32)\lib
a392 1
	set LIB=$(TOOLS32)\lib
a399 1
	set LIB=$(TOOLS32)\lib
a403 1
	set LIB=$(TOOLS32)\lib
a407 1
	set LIB=$(TOOLS32)\lib
a412 1
	set LIB=$(TOOLS32)\lib
a417 1
	set LIB=$(TOOLS32)\lib
@


1.37
log
@* win/makefile.vc (install-libraries):
* win/Makefile.in (install-libraries):
* unix/Makefile.in (install-libraries): Added tkPlatDecls.h to
list of header files to install.

* generic/tk.h: Added #include "tkPlatDecls.h", which declares the
platform specific component of the public Tk stubs API's.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.36 2000/08/06 00:10:56 hobbs Exp $
d460 5
a464 1
		-i "$(TCLDIR)\generic" $<
@


1.36
log
@cleaned up use of *_DIR macros
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.35 2000/07/20 15:20:52 ericm Exp $
d351 1
@


1.35
log
@Applied patch from [RFE: 5939]
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.34 2000/05/03 00:18:37 hobbs Exp $
d349 4
a352 4
	copy "$(ROOT)\generic\tk.h"             "$(INCLUDE_INSTALL_DIR)"
	copy "$(ROOT)\generic\tkDecls.h"        "$(INCLUDE_INSTALL_DIR)"
	copy "$(ROOT)\generic\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)"
	xcopy "$(ROOT)\xlib\X11\*.h"            "$(INCLUDE_INSTALL_DIR)\X11"
d423 1
a423 1
$(TMPDIR)\testMain.obj: $(ROOT)\win\winMain.c
d426 1
a426 1
$(TMPDIR)\tkTest.obj: $(ROOT)\generic\tkTest.c
d429 1
a429 1
$(TMPDIR)\tkWinTest.obj: $(ROOT)\generic\tkWinTest.c
d432 1
a432 1
$(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c
d435 1
a435 1
$(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
@


1.34
log
@	* README:
	* generic/tk.h:
	* library/tk.tcl:
	* mac/README:
	* unix/README:
	* unix/configure.in:
	* unix/tk.spec:
	* win/README:
	* win/aclocal.m4:
	* win/configure.in:
	* win/makefile.vc: updated patchlevel to 8.4a1
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.33 2000/04/08 06:59:09 hobbs Exp $
d34 1
d39 3
@


1.33
log
@	* win/makefile.vc (TKTEST_OBJS):
	* win/Makefile.in (TKTEST_OBJS): moved tkWinTest.c from normal
	objs to TKTEST_OBJS where it belonged.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.32 2000/02/10 02:54:23 hobbs Exp $
d29 1
a29 1
TCLDIR		= ..\..\tcl8.3
d59 2
a60 2
VERSION = 83
DOTVERSION = 8.3
@


1.33.2.1
log
@see ChangeLog for specific file details
@
text
@d1 1
a1 1
# Visual C++ makefile
d7 1
a7 3
# Copyright (c) 1998-2000 Ajuba Solutions.
#
# RCS: @@(#) $Id: makefile.vc,v 1.40 2001/03/30 23:50:17 hobbs Exp $
d30 1
a30 1
INSTALLDIR      = C:\Progra~1\tcl
d33 1
a33 2
# Choices: IX86, IA64, ALPHA
MACHINE		= IX86
d36 2
a37 12

# IA64 support is based on the standard setup with v2 of the
# Microsoft Platform SDK for Whistler, build 2267

TOOLS32		= C:\Progra~1\Microsoft Platform SDK
TOOLS32_rc	= C:\Progra~1\Microsoft Platform SDK

cc32		= "$(TOOLS32)\bin\Win64\cl.exe"
link32		= "$(TOOLS32)\bin\Win64\link.exe"
libpath32	= /LIBPATH:"$(TOOLS32)\lib\IA64"
lib32		= "$(TOOLS32)\bin\Win64\lib.exe"

d39 2
a40 14

# Visual Studio 5 default
#TOOLS32		= C:\Progra~1\devstudio\vc
#TOOLS32_rc	= C:\Progra~1\devstudio\sharedide

# Visual Studio 6 default
TOOLS32		= C:\Progra~1\Microsoft Visual Studio\VC98
TOOLS32_rc	= C:\Progra~1\Microsoft Visual Studio\common\MSDev98

cc32		= "$(TOOLS32)\bin\cl.exe"
link32		= "$(TOOLS32)\bin\link.exe"
libpath32	= /LIBPATH:"$(TOOLS32)\lib"
lib32		= "$(TOOLS32)\bin\lib.exe"

a42 3
rc32		= "$(TOOLS32_rc)\bin\rc.exe"
include32	= -I"$(TOOLS32)\include"

d221 7
d251 2
a252 1
!ELSE IF "$(MACHINE)" == "IA64"
d257 1
d281 1
a281 1
lflags	= $(lcommon) /MACHINE:$(MACHINE) $(libpath32)
d301 1
a301 2
winlibs    = $(baselibs) user32.lib gdi32.lib comdlg32.lib winspool.lib \
             imm32.lib
d345 4
a348 5
	copy "$(GENERICDIR)\tk.h"             "$(INCLUDE_INSTALL_DIR)"
	copy "$(GENERICDIR)\tkDecls.h"        "$(INCLUDE_INSTALL_DIR)"
	copy "$(GENERICDIR)\tkPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)"
	copy "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)"
	xcopy "$(XLIBDIR)\X11\*.h"            "$(INCLUDE_INSTALL_DIR)\X11"
d364 1
d374 1
d382 1
d387 1
d392 1
d398 1
d404 1
d419 1
a419 1
$(TMPDIR)\testMain.obj: $(WINDIR)\winMain.c
d422 1
a422 1
$(TMPDIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
d425 1
a425 1
$(TMPDIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c
d428 1
a428 1
$(TMPDIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c
d431 1
a431 1
$(TMPDIR)\winMain.obj: $(WINDIR)\winMain.c
d455 1
a455 5
		-i "$(TCLDIR)\generic" \
!if "$(NODEBUG)" == "0"
		-d DEBUG \
!endif
		$<
@


1.33.2.2
log
@updated patchlevel to 8.3.4.
updated READMEs to point to www.tcl-tk.net where applicable.
added proper Win64 support to makefiles.
@
text
@a7 1
# Copyright (c) 2001 ActiveState Corporation.
d9 1
a9 1
# RCS: @@(#) $Id: makefile.vc,v 1.33.2.1 2001/04/04 07:57:18 hobbs Exp $
d41 1
a41 1
# Microsoft SDK for XP, RC1
d43 2
a44 2
TOOLS32		= C:\Progra~1\Microsoft SDK
TOOLS32_rc	= C:\Progra~1\Microsoft SDK
d258 1
a258 1
TK_DEFINES	= $(DEBUGDEFINES) $(THREADDEFINES)
d265 3
a267 2
!IF "$(MACHINE)" == "IA64"
cdebug = -O2i -Gs
@


1.33.2.3
log
@Added missing $(TKSTUBLIB) to install-binaries target.
@
text
@d10 1
a10 1
# RCS: @@(#) $Id: makefile.vc,v 1.33.2.2 2001/10/03 22:04:53 hobbs Exp $
a360 1
	copy $(TKSTUBLIB) "$(LIB_INSTALL_DIR)"
@


1.33.2.4
log
@Added a special rule for tkStubImg.c so it always is built with _DSTATIC_BUILD for use in the Stubs library.
@
text
@d10 1
a10 1
# RCS: @@(#) $Id: makefile.vc,v 1.33.2.3 2002/04/10 17:57:26 davygrvy Exp $
d449 1
a449 4
$(TMPDIR)\tkStubLib.obj: $(GENERICDIR)\tkStubLib.c
	$(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@@ $?

$(TMPDIR)\tkStubImg.obj: $(GENERICDIR)\tkStubImg.c
@


1.32
log
@flipped debug bit
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.31 2000/02/08 11:31:49 hobbs Exp $
d108 1
a142 1
	$(TMPDIR)\tkWinTest.obj \
d423 3
@


1.31
log
@	* generic/tkDecls.h:
	* generic/tk.decls:
	* generic/tk.h: moved new public functions created in dash patch
	to the stubs interface [Bug: 4062]

	* generic/tk.h:
	* doc/CrtImgType.3:
	* doc/CrtPhImgFmt.3:
	* generic/tk.h:
	* generic/tkImgGIF.c:
	* generic/tkImgPhoto.c:
	* generic/tkStubImg.c (new file):
	* generic/tkTest.c:
	* unix/Makefile.in:
	* win/Makefile.in:
	* win/makefile.vc: improved support for moving from the old style
	image C API to the new obj'ified one with new Tk_InitImageArgs
	command and stub'ing of image code.  See docs for how to make the
	transition. [Bug: 4060]
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.30 1999/12/09 14:46:41 hobbs Exp $
d47 1
a47 1
NODEBUG = 0
@


1.30
log
@	* win/makefile.vc: removed 16bit stuff, simplified makefile.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.29 1999/10/29 03:58:39 hobbs Exp $
d219 1
@


1.29
log
@	* makefile.vc: changed 'c:/program files' to c:/progra~1
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.28 1999/10/01 22:45:31 hobbs Exp $
a28 2
TOOLS32		= c:\progra~1\devstudio\vc
TOOLS32_rc	= c:\progra~1\devstudio\sharedide
d35 8
a93 1
DUMPEXTS 	= $(TMPDIR)\dumpexts.exe
d238 25
a264 1

d273 1
a273 1
ldebug = /RELEASE
d275 1
a275 1
ldebug = -debug:full -debugtype:cv
d279 2
a280 1
lcommon = /NODEFAULTLIB /RELEASE /NOLOGO
a284 3
lflags   = $(lcommon) /MACHINE:$(MACHINE)
!ELSE
lflags   = $(lcommon) /MACHINE:$(MACHINE)
d287 3
a289 3
conlflags = $(lflags) -subsystem:console -entry:mainCRTStartup
guilflags = $(lflags) -subsystem:windows -entry:WinMainCRTStartup
dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
a305 47
# Compile flags
######################################################################

!IF "$(NODEBUG)" == "1"
!IF "$(MACHINE)" == "ALPHA"
# MSVC on Alpha doesn't understand -Ot
cdebug = -O2i -Gs -GD
!ELSE
# NOTE: Due to a bug in MSVC, we cannot use -O2 here or Tk starts to misbehave.
cdebug = -Oti -Gs -GD
!ENDIF
!ELSE
cdebug = -Z7 -Od -WX
!ENDIF

# declarations common to all compiler options
ccommon = -c -W3 -nologo -Fp$(TMPDIR)\ -YX

!IF "$(MACHINE)" == "IX86"
cflags = $(ccommon) -D_X86_=1
!ELSE
!IF "$(MACHINE)" == "MIPS"
cflags = $(ccommon) -D_MIPS_=1
!ELSE
!IF "$(MACHINE)" == "PPC"
cflags = $(ccommon) -D_PPC_=1
!ELSE
!IF "$(MACHINE)" == "ALPHA"
cflags = $(ccommon) -D_ALPHA_=1
!ENDIF
!ENDIF
!ENDIF
!ENDIF

cvars      = -DWIN32 -D_WIN32
cvarsmt    = $(cvars) -D_MT
cvarsdll   = $(cvarsmt) -D_DLL

!IF "$(NODEBUG)" == "1"
cvarsdll   = $(cvars) -MD
!ELSE
cvarsdll   = $(cvars) -MDd
!ENDIF

CON_CFLAGS	= $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE

######################################################################
d362 1
a362 1
$(TKDLL): $(TKOBJS) $(TMPDIR)\tk.res $(TMPDIR)\tk.def
d364 1
a364 1
       $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tk.def \
d372 1
a372 1
$(TKPLUGINDLL): $(TKOBJS) $(TMPDIR)\tk.res $(TMPDIR)\plugin.def
d374 1
a374 1
        $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\plugin.def \
a400 16
$(TMPDIR)\tk.def: $(DUMPEXTS) $(TKOBJS)
	$(DUMPEXTS) -o $@@ $(TKDLLNAME) @@<<
		$(TKOBJS)
<<

$(TMPDIR)\plugin.def: $(DUMPEXTS) $(TKOBJS)
	$(DUMPEXTS) -o $@@ $(TKPLUGINDLLNAME) @@<<
		$(TKOBJS)
<<

$(DUMPEXTS): $(TCLDIR)\win\winDumpExts.c
	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
	set LIB=$(TOOLS32)\lib
	$(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@@ \
		$(TMPDIR)\winDumpExts.obj 

a461 1
        -@@del $(TMPDIR)\*.def
@


1.28
log
@1999-09-24  Jeff Hobbs  <hobbs@@scriptics.com>

	* */README:
	* win/makefile.vc:
	* */configure.in:
	* generic/tk.h:
	* library/tk.tcl: up'd to 8.3a1

	* unix/Makefile.in: changed 'mkdir' to 'mkdir -p'

	* library/dialog.tcl: changed {Times 18} to {Times 12} for
	dialog font.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.27 1999/07/31 02:31:57 redman Exp $
d29 2
a30 2
TOOLS32		= c:\program files\devstudio\vc
TOOLS32_rc	= c:\program files\devstudio\sharedide
d32 1
a32 1
INSTALLDIR      = c:\program files\tcl
d41 1
a41 1
NODEBUG = 1
@


1.27
log
@
* win/makefile.vc: Corrected building threaded tktest.exe on
Windows.  Needed to link in .obj files from Tcl, needs to change
later so that code is in Tk and doesn't require a Tcl build.
Also added runtest target.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.26 1999/07/09 02:10:07 stanton Exp $
d31 1
a31 1
TCLDIR		= ..\..\tcl8.2
d53 2
a54 2
VERSION = 82
DOTVERSION = 8.2
@


1.26
log
@* tests/unixSelect.test: Fixed broken test.

* win/makefile.vc: Added special case target to ensure that
tkStubLib.obj is built with -DSTATIC_BUILD.

* win/tkWinX.c (TkWinChildProc): Changed to pass
WM_WINDOWPOSCHANGED through to DefWindowProc to make OpenGL
sub-windows happy.  This allows Windows to generate the WM_SIZE
and WM_MOVE messages.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.25 1999/06/25 23:30:27 welch Exp $
d103 1
a103 2
# the tkThreadTest.c file has not been checked it yet.
#	$(TMPDIR)\tkThreadTest.obj
d231 1
a231 1
TK_DEFINES	= $(DEBUGDEFINES)
d338 4
a341 1
#       copy $(TCLDIR)\bin\pkgIndex.tcl $(OUTDIR)
@


1.25
log
@Changed to Tk 8.2b1
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.24 1999/04/21 21:53:32 rjohnson Exp $
d463 3
@


1.24
log
@
Merged 8-1-0 into mainline.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.23 1999/04/17 00:18:41 surles Exp $
d31 1
a31 1
TCLDIR		= ..\..\tcl8.1
d53 2
a54 2
VERSION = 81
DOTVERSION = 8.1
@


1.24.2.1
log
@updated version number to 8.1.1
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.24 1999/04/21 21:53:32 rjohnson Exp $
d430 1
a430 1
	$(cc32) $(CON_CFLAGS) -DTCL_LIB_VERSION=$(VERSION) -Fo$(TMPDIR)\ $?
@


1.23
log
@fixed bugs 1785 and 1799: decl header files not installed
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.22 1999/04/16 01:51:48 stanton Exp $
d31 1
a31 1
TCLDIR		= ..\..\tcl8.1b3
@


1.22
log
@* Merged 8.1 branch into the main trunk
@
text
@d7 1
a7 1
# RCS: @@(#) $Id$
d362 4
a365 2
	copy "$(ROOT)\generic\tk.h" "$(INCLUDE_INSTALL_DIR)"
	xcopy "$(ROOT)\xlib\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11"
d370 3
a372 3
	xcopy "$(ROOT)\library" "$(SCRIPT_INSTALL_DIR)"
	xcopy "$(ROOT)\library\images" "$(SCRIPT_INSTALL_DIR)\images"
	xcopy "$(ROOT)\library\demos" "$(SCRIPT_INSTALL_DIR)\demos"
@


1.22.2.1
log
@
Merged with mainline.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.23 1999/04/17 00:18:41 surles Exp $
d362 2
a363 4
	copy "$(ROOT)\generic\tk.h"             "$(INCLUDE_INSTALL_DIR)"
	copy "$(ROOT)\generic\tkDecls.h"        "$(INCLUDE_INSTALL_DIR)"
	copy "$(ROOT)\generic\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)"
	xcopy "$(ROOT)\xlib\X11\*.h"            "$(INCLUDE_INSTALL_DIR)\X11"
d368 3
a370 3
	xcopy "$(ROOT)\library"              "$(SCRIPT_INSTALL_DIR)"
	xcopy "$(ROOT)\library\images"       "$(SCRIPT_INSTALL_DIR)\images"
	xcopy "$(ROOT)\library\demos"        "$(SCRIPT_INSTALL_DIR)\demos"
@


1.22.2.2
log
@
Updated patchlevel for final release.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.22.2.1 1999/04/21 02:30:43 rjohnson Exp $
d31 1
a31 1
TCLDIR		= ..\..\tcl8.1
@


1.21
log
@* Merged changes from 8.0.5:
    - Updated for Mac release
@
text
@d6 2
a7 2
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
# RCS: @@(#) $Id: makefile.vc,v 1.20 1999/03/10 07:04:46 stanton Exp $
d31 2
a32 2
TCLDIR		= ..\..\tcl8.0.5
INSTALLDIR	= c:\program files\tcl
d37 3
d52 4
d57 2
a58 4
TKSTUBPREFIX = $(TKNAMEPREFIX)stub
WISHNAMEPREFIX = wish
VERSION = 80
DOTVERSION = 8.0
d77 1
a77 1
TKLIB		= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib
d85 1
d89 1
d102 3
a104 1
	$(TMPDIR)\testMain.obj
d123 1
d138 1
d189 2
d211 1
d214 2
a215 6
TKSTUBOBJS = \
	$(TMPDIR)\tkStubLib.obj \
	$(TMPDIR)\tkStubs.obj \
	$(TMPDIR)\tkPlatStubs.obj \
	$(TMPDIR)\tkIntStubs.obj \
	$(TMPDIR)\tkIntPlatStubs.obj
d235 1
a235 1
			$(TK_INCLUDES) $(TK_DEFINES)
d276 1
a276 1

d330 1
a330 2
all:    setup $(WISH)
test:	setup $(TKTEST)
d333 14
a346 1
tktest: setup $(TKTEST)
a358 9
#
# Regenerate the stubs files.
#

stubs:
	$(TCLDIR)\win\$(TMPDIRNAME)\tclsh$(VERSION)$(DBGX) \
		$(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls

d373 4
a376 1
$(TKLIB): $(TKDLL)
d381 1
a381 1
		-out:$@@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLLIB) \
a385 3
$(TKSTUBLIB): $(TKSTUBOBJS)
	$(lib32) /out:$@@ $(TKSTUBOBJS)

d396 1
a396 1
$(WISH): $(WISHOBJS) $(TKSTUBLIB) $(TKLIB) $(TMPDIR)\wish.res
d398 6
a403 2
	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -stack:2300000 \
		-out:$@@ \
d408 1
a408 2
	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -stack:2300000 \
		-out:$@@ \
d412 1
a412 1
$(TKTEST): $(TKTESTOBJS) $(TKSTUBLIB) $(TMPDIR)\wish.res
d414 1
a414 2
	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -stack:2300000 \
		-out:$@@ \
d433 5
d451 1
a451 1
	$(cc32) $(TK_CFLAGS) -DTK_TEST -Fo$@@ $?
d454 1
a454 1
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?
d457 1
a457 1
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?
d479 2
a480 1
	$(rc32) -fo $@@ -r -i $(GENERICDIR) $<
@


1.20
log
@integrated stubs into 8.0 main branch
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.19.2.2 1999/03/07 00:15:47 redman Exp $
@


1.19
log
@fixed bad compiler flags
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.18.2.1 1999/02/12 00:50:21 stanton Exp $
d49 2
d69 1
d72 3
a74 1
TKLIB 		= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib
d197 1
d200 7
d209 1
d225 4
a228 1
			$(TK_INCLUDES) $(TK_DEFINES) 
d337 9
d370 3
d383 1
a383 1
$(WISH): $(WISHOBJS) $(TKLIB) $(TMPDIR)\wish.res
d396 1
a396 1
$(TKTEST): $(TKTESTOBJS) $(TKLIB) $(TMPDIR)\wish.res
d419 8
d440 1
a440 1
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?
@


1.19.2.1
log
@Modifications for Tk Stubs implementation
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.19 1999/02/12 00:51:12 stanton Exp $
a32 1
TCLBINDIR       = d:\tcl8.0\bin
a48 2
TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub
TKSTUBPREFIX = $(TKNAMEPREFIX)stub
a66 1
TCLSTUBLIBNAME  = $(TCLSTUBPREFIX)$(VERSION)$(DBGX).lib
d69 1
a69 3
TKLIB		= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib
TKSTUBLIBNAME	= $(TKSTUBPREFIX)$(VERSION)$(DBGX).lib
TKSTUBLIB	= $(OUTDIR)\$(TKSTUBLIBNAME)
d194 3
a196 10
TKSTUBOBJS = \
	$(TMDIR)\tkStubLib.obj \
	$(TMPDIR)\tkStubs.obj \
	$(TMPDIR)\tkPlatStubs.obj \
	$(TMPDIR)\tkIntStubs.obj \
	$(TMPDIR)\tkIntPlatStubs.obj

cc32		= @@"$(TOOLS32)\bin\cl.exe"
link32		= @@"$(TOOLS32)\bin\link.exe"
rc32		= @@"$(TOOLS32_rc)\bin\rc.exe"
d208 1
a208 1
TK_DEFINES	= $(DEBUGDEFINES) -DUSE_TCL_STUBS
a319 8
#
# Regenerate the stubs files.
#

stubs:
	$(TCLBINDIR)\tclsh$(VERSION) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls

a342 3

$(TKSTUBLIB): $(TKSTUBOBJS)
	$lib32) /out:$@@ $(TKSTUBOBJS)
@


1.19.2.2
log
@Stubs changes, now wish works on Windows.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.19.2.1 1999/03/06 00:07:07 redman Exp $
d33 1
d70 1
a70 1
TCLSTUBLIB	= $(TCLSTUBPREFIX)$(VERSION)$(DBGX).lib
a197 1
	$(TMPDIR)\tkStubInit.obj \
d201 1
a201 1
	$(TMPDIR)\tkStubLib.obj \
d207 3
a209 4
cc32		= "$(TOOLS32)\bin\cl.exe"
link32		= "$(TOOLS32)\bin\link.exe"
lib32		= "$(TOOLS32)\bin\lib.exe"
rc32		= "$(TOOLS32_rc)\bin\rc.exe"
d221 1
a221 1
TK_DEFINES	= $(DEBUGDEFINES)
d224 1
a224 4
			$(TK_INCLUDES) $(TK_DEFINES)

WISH_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
			$(TK_INCLUDES) $(TK_DEFINES)
d338 1
a338 2
	$(TCLDIR)\win\$(TMPDIRNAME)\tclsh$(VERSION)$(DBGX) \
		$(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
d366 1
a366 1
	$(lib32) /out:$@@ $(TKSTUBOBJS)
d378 1
a378 1
$(WISH): $(WISHOBJS) $(TKSTUBLIB) $(TKLIB) $(TMPDIR)\wish.res
d391 1
a391 1
$(TKTEST): $(TKTESTOBJS) $(TKSTUBLIB) $(TMPDIR)\wish.res
d427 1
a427 1
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?
@


1.18
log
@* win/makefile.vc: First stab at install target.  Fixed quoting so
paths with spaces work.

* win/makefile.vc:
* win/makefile.bc: Udpated version numbers
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.17 1998/11/03 02:04:06 stanton Exp $
d257 7
a263 1
cdebug = -O2 -Gs -GD
@


1.18.2.1
log
@fixed bad compiler flags
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.18 1999/02/04 21:02:58 stanton Exp $
d257 1
a257 7
!IF "$(MACHINE)" == "ALPHA"
# MSVC on Alpha doesn't understand -Ot
cdebug = -O2i -Gs -GD
!ELSE
# NOTE: Due to a bug in MSVC, we cannot use -O2 here or Tk starts to misbehave.
cdebug = -Oti -Gs -GD
!ENDIF
@


1.17
log
@updated version number to 8.0.4
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.16 1998/10/07 20:57:27 escoffon Exp $
d29 4
a32 3
TOOLS32		= c:\progra~1\devstudio\vc
TOOLS32_rc	= c:\progra~1\devstudio\sharedide
TCLDIR		= ..\..\tcl8.0.4
d51 1
d79 5
d194 4
a197 4
cc32		= $(TOOLS32)\bin\cl.exe
link32		= $(TOOLS32)\bin\link.exe
rc32		= $(TOOLS32_rc)\bin\rc.exe
include32	= -I$(TOOLS32)\include
d229 1
a229 1
lflags   = $(lcommon) -align:0x1000 /MACHINE:$(MACHINE)
d257 1
a257 6
!IF "$(MACHINE)" == "ALPHA"
# MSVC on Alpha doesn't understand -Ot
cdebug = -O2i -Gs -GD
!ELSE
cdebug = -Oti -Gs -GD
!ENDIF
d299 1
d301 1
d307 21
d388 1
a388 1
	$(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -DTK_TEST -Fo$@@ $?
d391 1
a391 1
	$(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@@ $?
d397 1
a397 1
	$(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@@ $?
@


1.16
log
@Fixed a bug that caused the Tk DLL to be linked against msvcrt.lib for
both debug and nodebug builds.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.15 1998/09/30 22:09:23 escoffon Exp $
d31 1
a31 1
TCLDIR		= ..\..\tcl8.0.3
@


1.15
log
@Increase thew stack size for executables so that runaway recursion does
not crash the process.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.14 1998/09/14 18:23:58 stanton Exp $
d232 2
a233 2
libc = libc.lib
libcdll = crtdll.lib
d235 2
a236 2
libc = libc.lib oldnames.lib
libcdll = msvcrt.lib oldnames.lib
@


1.14
log
@Replaced SCCS strings, fixed binary files
@
text
@d7 1
a7 1
# RCS: @@(#) $Id$
d325 2
a326 1
	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@@ \
d331 2
a332 1
	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@@ \
d338 2
a339 1
	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@@ \
@


1.13
log
@Fixed reference to tcl directory, ../../tcl8.0.3
@
text
@d7 1
a7 1
# SCCS: %Z% $Id$ 
@


1.12
log
@Moved "tkConsole.obj" to the Tk DLL.
@
text
@d31 1
a31 1
TCLDIR		= ..\..\tcl8.0
@


1.11
log
@Added xlib/ximage.c
@
text
@a77 1
	$(TMPDIR)\tkConsole.obj \
a80 1
	$(TMPDIR)\tkConsole.obj \
d93 1
a361 3
$(TMPDIR)\tkConsole.obj: $(ROOT)\generic\tkConsole.c
	$(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@@ $?

@


1.10
log
@a few more tweaks to fix support for specifyin the directory where binaries
are built.
@
text
@d91 1
@


1.9
log
@added the STATIC_BUILD macro for objects that are linked into executables
instead of being placed in the dll
@
text
@d53 1
a53 1
TMPDIR		= $(BINROOT)\Release
d56 1
a56 1
TMPDIR		= $(BINROOT)\Debug
d59 2
d196 1
a196 1
TCLLIBDIR       = $(TCLDIR)\win\$(OUTDIR)
@


1.8
log
@Merged changes between child workspace "/home/escoffon/ws/tk8.0" and
 parent workspace "/export/home/ws/tk8.0".
@
text
@d358 1
a358 1
	$(cc32) $(TK_CFLAGS) -DTK_TEST -Fo$@@ $?
d361 1
a361 1
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?
d364 1
a364 1
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?
d370 1
a370 1
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?
@


1.7
log
@Merged changes between child workspace "/home/welch/ws/tk8.0.3" and
 parent workspace "/net/pop/export/home/ws/tk8.0".
@
text
@d305 1
a305 1
        $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tk.def \
d360 12
d377 1
a377 1
	$(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d380 1
a380 1
	$(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d383 1
a383 1
	$(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d386 1
a386 1
	$(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
@


1.6
log
@Merged changes between child workspace "/home/rjohnson/ws/tk8.0" and
 parent workspace "/export/home/ws/tk8.0".
@
text
@d47 1
a47 1
TKNAMEPREFIX = tcl
@


1.5
log
@Merged changes between child workspace "/home/welch/ws/tk8.0.3" and
 parent workspace "/export/home/ws/tk8.0".
@
text
@a88 1
	$(TMPDIR)\ximage.obj \
@


1.5.1.1
log
@*** empty log message ***
@
text
@d47 1
a47 1
TKNAMEPREFIX = tk
@


1.4
log
@the MD flag for DLL builds needs to be MDd for Debug builds
@
text
@d249 4
d254 1
@


1.4.2.1
log
@added makefile support for export/import of DLL symbols.
Defines DLL_BUILD and BUILD_tk on the compiler command line.
@
text
@d301 1
a301 1
       $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tk.def \
a355 12
$(TMPDIR)\tkConsole.obj: $(ROOT)\generic\tkConsole.c
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?

$(TMPDIR)\tkTest.obj: $(ROOT)\generic\tkTest.c
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?

$(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?

$(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?

d361 1
a361 1
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d364 1
a364 1
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d367 1
a367 1
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d370 1
a370 1
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
@


1.4.1.1
log
@got rid of ximage.c
@
text
@d89 1
@


1.3
log
@added the ability to specify the name prefix for the generated binaries
instead of fixing it at "tcl".
@
text
@d277 6
@


1.2
log
@Added changes to support builds of different configurations in parallel:
- the NODEBUG flag controls Debug/Release builds
- different values of NODEBUG create temp files in either Debug or
Release subdirectories.
- Debug DLLs and executables follow the Windows convention of a 'd' at
the end of the name (e.g. tcl80d.dll)
- put the DLLs, LIBs, and EXEs in the Debug/Release subdirs rather than
in win.
@
text
@d46 3
d51 1
d53 1
a53 1
TMPDIR		= Release
d56 1
a56 1
TMPDIR		= Debug
d61 3
a63 3
TCLLIB 		= tcl$(VERSION)$(DBGX).lib
TCLPLUGINLIB 	= tcl$(VERSION)p.lib
TKDLLNAME	= tk$(VERSION)$(DBGX).dll
d65 2
a66 2
TKLIB 		= $(OUTDIR)\tk$(VERSION)$(DBGX).lib
TKPLUGINDLLNAME	= tk$(VERSION)p$(DBG).dll
d68 1
a68 1
TKPLUGINLIB 	= $(OUTDIR)\tk$(VERSION)p$(DBGX).lib
d70 3
a72 3
WISH 		= $(OUTDIR)\wish$(VERSION)$(DBGX).exe
WISHP 		= $(OUTDIR)\wishp$(VERSION)$(DBGX).exe
TKTEST 		= $(OUTDIR)\tktest.exe
@


1.2.1.1
log
@Added NT/Alpha hook
@
text
@a244 4
!IF "$(MACHINE)" == "ALPHA"
# MSVC on Alpha doesn't understand -Ot
cdebug = -O2i -Gs -GD
!ELSE
a245 1
!ENDIF
@


1.1
log
@Initial revision
@
text
@d7 1
a7 1
# SCCS: @@(#) makefile.vc 1.64 97/10/27 17:27:20
d28 4
a31 4
ROOT	= ..
TMPDIR	= .
TOOLS32	= c:\msdev
TCLDIR	= ..\..\tcl8.0
d36 2
a37 2
# Comment the following line to compile with symbols
NODEBUG=1
d48 8
a55 8
TCLDLL = tcl$(VERSION).dll
TCLLIB = tcl$(VERSION).lib
TCLPLUGINDLL = tcl$(VERSION)p.dll
TCLPLUGINLIB = tcl$(VERSION)p.lib
TKDLL = tk$(VERSION).dll
TKLIB = tk$(VERSION).lib
TKPLUGINDLL = tk$(VERSION)p.dll
TKPLUGINLIB = tk$(VERSION)p.lib
d57 8
a64 4
WISH = wish$(VERSION).exe
WISHP = wishp$(VERSION).exe
TKTEST = tktest.exe
DUMPEXTS = $(TMPDIR)\dumpexts.exe
d66 5
d184 1
a184 1
rc32		= $(TOOLS32)\bin\rc.exe
d191 1
a191 1
TCLLIBDIR       = $(TCLDIR)\win
d205 1
a205 1
!IFDEF NODEBUG
d244 1
a244 1
!IFDEF NODEBUG
d251 1
a251 1
ccommon = -c -W3 -nologo -YX
d279 3
a281 3
all:    $(WISH)
test:	$(TKTEST)
plugin:	$(TKPLUGINDLL) $(WISHP)
d283 4
d324 1
a324 1
	$(DUMPEXTS) -o $@@ $(TKDLL) @@<<
d329 1
a329 1
	$(DUMPEXTS) -o $@@ $(TKPLUGINDLL) @@<<
d366 7
a372 5
	-@@del *.exp
	-@@del *.lib
	-@@del *.dll
	-@@del *.exe
        -@@del $(TMPDIR)\*.obj 
d375 3
@


1.1.4.1
log
@initial tk8.1a2 version
@
text
@d6 2
a7 2
# Copyright (c) 1995-1997 Sun Microsystems, Inc.
# SCCS: @@(#) makefile.vc 1.67 98/02/18 18:32:52
d31 1
a31 1
TCLDIR	= ..\..\tcl8.1a2
d46 1
a46 1
VERSION = 81
a87 1
	$(TMPDIR)\tkWinConfig.obj \
a101 1
	$(TMPDIR)\tkWinTest.obj \
a151 2
	$(TMPDIR)\tkObj.obj \
	$(TMPDIR)\tkOldConfig.obj \
@


1.1.4.2
log
@Merged 8.0.3 changes into 8.1
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.14 1998/09/14 18:23:58 stanton Exp $
d28 4
a31 4
ROOT		= ..
TOOLS32		= c:\progra~1\devstudio\vc
TOOLS32_rc	= c:\progra~1\devstudio\sharedide
TCLDIR		= ..\..\tcl8.1a2
d36 2
a37 2
# Set NODEBUG to 0 to compile with symbols
NODEBUG = 1
d46 15
a60 30
TCLNAMEPREFIX = tcl
TKNAMEPREFIX = tk
WISHNAMEPREFIX = wish
VERSION = 80

BINROOT		= .
!IF "$(NODEBUG)" == "1"
TMPDIRNAME	= Release
DBGX		=
!ELSE
TMPDIRNAME	= Debug
DBGX		= d
!ENDIF
TMPDIR		= $(BINROOT)\$(TMPDIRNAME)
OUTDIRNAME	= $(TMPDIRNAME)
OUTDIR		= $(TMPDIR)

TCLLIB 		= $(TCLNAMEPREFIX)$(VERSION)$(DBGX).lib
TCLPLUGINLIB 	= $(TCLNAMEPREFIX)$(VERSION)p.lib
TKDLLNAME	= $(TKNAMEPREFIX)$(VERSION)$(DBGX).dll
TKDLL 		= $(OUTDIR)\$(TKDLLNAME)
TKLIB 		= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib
TKPLUGINDLLNAME	= $(TKNAMEPREFIX)$(VERSION)p$(DBG).dll
TKPLUGINDLL 	= $(OUTDIR)\$(TKPLUGINDLLNAME)
TKPLUGINLIB 	= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)p$(DBGX).lib

WISH 		= $(OUTDIR)\$(WISHNAMEPREFIX)$(VERSION)$(DBGX).exe
WISHP 		= $(OUTDIR)\$(WISHNAMEPREFIX)p$(VERSION)$(DBGX).exe
TKTEST 		= $(OUTDIR)\$(TKNAMEPREFIX)test.exe
DUMPEXTS 	= $(TMPDIR)\dumpexts.exe
d63 1
d67 1
a79 1
	$(TMPDIR)\tkConsole.obj \
d179 1
a179 1
rc32		= $(TOOLS32_rc)\bin\rc.exe
d186 1
a186 1
TCLLIBDIR       = $(TCLDIR)\win\$(OUTDIRNAME)
d200 1
a200 1
!IF "$(NODEBUG)" == "1"
d239 1
a239 5
!IF "$(NODEBUG)" == "1"
!IF "$(MACHINE)" == "ALPHA"
# MSVC on Alpha doesn't understand -Ot
cdebug = -O2i -Gs -GD
!ELSE
a240 1
!ENDIF
d246 1
a246 1
ccommon = -c -W3 -nologo -Fp$(TMPDIR)\ -YX
a267 6
!IF "$(NODEBUG)" == "1"
cvarsdll   = $(cvars) -MD
!ELSE
cvarsdll   = $(cvars) -MDd
!ENDIF

d274 3
a276 7
all:    setup $(WISH)
test:	setup $(TKTEST)
plugin:	setup $(TKPLUGINDLL) $(WISHP)

setup:
	@@mkd $(TMPDIR)
	@@mkd $(OUTDIR)
d282 1
a282 1
       $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tk.def \
d315 1
a315 1
	$(DUMPEXTS) -o $@@ $(TKDLLNAME) @@<<
d320 1
a320 1
	$(DUMPEXTS) -o $@@ $(TKPLUGINDLLNAME) @@<<
d335 1
a335 10
	$(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -DTK_TEST -Fo$@@ $?

$(TMPDIR)\tkTest.obj: $(ROOT)\generic\tkTest.c
	$(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@@ $?

$(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?

$(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
	$(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@@ $?
d342 1
a342 1
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d345 1
a345 1
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d348 1
a348 1
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d351 1
a351 1
	$(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
d357 5
a361 7
        -@@del $(OUTDIR)\*.exp 
	-@@del $(OUTDIR)\*.lib 
	-@@del $(OUTDIR)\*.dll 
	-@@del $(OUTDIR)\*.exe
	-@@del $(OUTDIR)\*.pdb
	-@@del $(TMPDIR)\*.pch
        -@@del $(TMPDIR)\*.obj
a363 3
        -@@del $(TMPDIR)\*.exe
	-@@rmd $(OUTDIR)
	-@@rmd $(TMPDIR)
@


1.1.4.3
log
@merged 8.0.4 into 8.1
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.2 1998/09/30 02:19:26 stanton Exp $
d31 1
a31 1
TCLDIR		= ..\..\tcl8.1
d300 1
a302 2
test:	setup $(TKTEST)

d392 1
a392 1
	$(rc32) -fo $@@ -r -i $(GENERICDIR) -i $(TOOLS32)\include $<
@


1.1.4.4
log
@updated version number to 8.1
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.3 1998/10/06 03:27:36 stanton Exp $
d49 1
a49 1
VERSION = 81
@


1.1.4.5
log
@* integrated tk8.0.4 changes.

* generic/tkBind.c: fixed deletion order bug where a crash would
result if a binding deleted "."
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.4 1998/10/06 20:34:11 stanton Exp $
d236 2
a237 2
libc = libc$(DBGX).lib
libcdll = crtdll$(DBGX).lib
d239 2
a240 2
libc = libc$(DBGX).lib oldnames.lib
libcdll = msvcrt$(DBGX).lib oldnames.lib
@


1.1.4.6
log
@more release engineering
@
text
@d7 1
a7 1
# RCS: @@(#) $Id$
d31 1
a31 1
TCLDIR		= ..\..\tcl8.1b1
@


1.1.4.7
log
@* Various cleanup related to the Tcl_Eval and Tcl_ObjSetVar
changes in Tcl.

* Integrated patches from 8.0.5b2
@
text
@d29 2
a30 2
TOOLS32		= c:\program files\devstudio\vc
TOOLS32_rc	= c:\program files\devstudio\sharedide
a49 1
DOTVERSION = 8.1
a76 5
BIN_INSTALL_DIR = $(INSTALLDIR)\bin
INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include
LIB_INSTALL_DIR = $(INSTALLDIR)\lib
SCRIPT_INSTALL_DIR = $(LIB_INSTALL_DIR)\tk$(DOTVERSION)

d191 4
a194 4
cc32		= "$(TOOLS32)\bin\cl.exe"
link32		= "$(TOOLS32)\bin\link.exe"
rc32		= "$(TOOLS32_rc)\bin\rc.exe"
include32	= -I"$(TOOLS32)\include"
d226 1
a226 1
lflags   = $(lcommon) /MACHINE:$(MACHINE)
d254 6
a259 1
cdebug = -O2 -Gs -GD
d300 2
a302 3
install: install-binaries install-libraries
plugin:	setup $(TKPLUGINDLL) $(WISHP)
tktest: setup $(TKTEST)
a307 21
install-binaries:
	@@mkd "$(BIN_INSTALL_DIR)"
	copy $(TKDLL) "$(BIN_INSTALL_DIR)"
	copy $(WISH) "$(BIN_INSTALL_DIR)"
	@@mkd "$(LIB_INSTALL_DIR)"
	copy $(TKLIB) "$(LIB_INSTALL_DIR)"

install-libraries:
	@@mkd "$(INCLUDE_INSTALL_DIR)"
	@@mkd "$(INCLUDE_INSTALL_DIR)\X11"
	copy "$(ROOT)\generic\tk.h" "$(INCLUDE_INSTALL_DIR)"
	xcopy "$(ROOT)\xlib\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11"
	@@mkd "$(SCRIPT_INSTALL_DIR)"
	@@mkd "$(SCRIPT_INSTALL_DIR)\images"
	@@mkd "$(SCRIPT_INSTALL_DIR)\demos"
	@@mkd "$(SCRIPT_INSTALL_DIR)\demos\images"
	xcopy "$(ROOT)\library" "$(SCRIPT_INSTALL_DIR)"
	xcopy "$(ROOT)\library\images" "$(SCRIPT_INSTALL_DIR)\images"
	xcopy "$(ROOT)\library\demos" "$(SCRIPT_INSTALL_DIR)\demos"
	xcopy "$(ROOT)\library\demos\images" "$(SCRIPT_INSTALL_DIR)\demos\images"

d365 1
a365 1
	$(cc32) $(TK_CFLAGS) -DTK_TEST -Fo$@@ $?
d368 1
a368 1
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?
d374 1
a374 1
	$(cc32) $(TK_CFLAGS) -Fo$@@ $?
d393 1
a393 1
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" -i "$(TOOLS32)\include" $<
@


1.1.4.8
log
@fixed bad compiler flags
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.7 1999/02/11 04:13:50 stanton Exp $
d260 1
a260 7
!IF "$(MACHINE)" == "ALPHA"
# MSVC on Alpha doesn't understand -Ot
cdebug = -O2i -Gs -GD
!ELSE
# NOTE: Due to a bug in MSVC, we cannot use -O2 here or Tk starts to misbehave.
cdebug = -Oti -Gs -GD
!ENDIF
@


1.1.4.9
log
@* README:
* generic/tk.h:
* unix/configure.in:
* win/README:
* win/makefile.bc:
* win/makefile.vc: Updated version to 8.1b2.

* unix/tkUnixSend.c: Fixed one more Tcl_*ObjVar instance.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id$
d31 1
a31 1
TCLDIR		= ..\..\tcl8.1b2
@


1.1.4.10
log
@Add wishc81.exe and wishc81d.exe, console-based wish executables (console
subsystem instead of windows subsystem).  This required adding a main() function
and adding code to disable calling Tk_ConsoleInit().

Add code to hook windows-based wish81.exe and wish81d.exe to stdin/stdout/stderr
if they are actually there (usually this happens if it's a pipe, file, lpt or com
port).

Modified makefile to be able to run tests from the makefile.  Added cat32.exe
for this purpose.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.9 1999/02/12 01:09:03 stanton Exp $
a73 1
WISHC 		= $(OUTDIR)\$(WISHNAMEPREFIX)c$(VERSION)$(DBGX).exe
a76 1
CAT32           = $(TMPDIR)\cat32.exe
d252 1
a252 1
conlibs    = $(libc) $(baselibs)
d306 2
a307 1
all:    setup $(WISH) $(WISHC) $(CAT32)
d310 1
a310 8
tktest: setup $(TKTEST) $(CAT32)
test:	setup $(TKTEST) $(TKLIB) $(CAT32)
	copy $(TCLDIR)\bin\pkgIndex.tcl $(OUTDIR)
	set TCL_LIBRARY=$(TCLDIR)/library
	$(TKTEST) << | $(CAT32)
		cd ../tests
		source all
<<
a319 1
	copy $(WISHC) "$(BIN_INSTALL_DIR)"
a361 5
$(WISHC): $(WISHOBJS) $(TKLIB) $(TMPDIR)\wish.res
	set LIB=$(TOOLS32)\lib
	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\wish.res -out:$@@ \
		$(guilibsdll) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB) $(WISHOBJS) 

a387 5

$(CAT32): $(WINDIR)\cat.c
	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
	set LIB=$(TOOLS32)\lib
	$(link32) $(conlflags) -out:$@@ -stack:16384 $(TMPDIR)\cat.obj $(conlibs)
@


1.1.4.11
log
@Remove wishc from default targets, add console-wish target to build it manually.
We don't want people using it unless they really, really need to.

Use the cat.c in the tcl sources, remove the one I copied into Tk.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.10 1999/02/26 02:24:45 redman Exp $
d308 1
a308 1
all:    setup $(WISH) $(CAT32)
a319 2
console-wish : all $(WISHC)

d328 1
d403 1
a403 1
$(CAT32): $(TCLDIR)\win\cat.c
@


1.1.4.12
log
@Added THREADDEFINES for building with threads enabled.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.11 1999/02/26 19:08:04 redman Exp $
a34 3

# Uncomment the following line to compile with thread support
#THREADDEFINES = -DTCL_THREADS=1
@


1.1.4.13
log
@* win/makefile.vc: Added THREADDEFINES for building with
threads enabled.  Added tclThreadTest.obj to list of
targets for building tktest.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.12 1999/03/09 01:34:50 lfb Exp $
d94 1
a94 2
	$(TMPDIR)\testMain.obj \
	$(TMPDIR)\tkThreadTest.obj
@


1.1.4.14
log
@integrated stubs from development branch
@
text
@d7 1
a7 1
# RCS: @@(#) $Id$
a31 1
INSTALLDIR      = c:\program files\tcl
a54 4
TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub
TKSTUBPREFIX  = $(TKNAMEPREFIX)stub


a68 1
TCLSTUBLIB	= $(TCLSTUBPREFIX)$(VERSION)$(DBGX).lib
a71 2
TKSTUBLIBNAME	= $(TKSTUBPREFIX)$(VERSION)$(DBGX).lib
TKSTUBLIB	= $(OUTDIR)\$(TKSTUBLIBNAME)
a200 1
	$(TMPDIR)\tkStubInit.obj \
a202 9
TKSTUBOBJS = \
	$(TMPDIR)\tkStubLib.obj \
	$(TMPDIR)\tkStubs.obj \
	$(TMPDIR)\tkPlatStubs.obj \
	$(TMPDIR)\tkIntStubs.obj \
	$(TMPDIR)\tkIntPlatStubs.obj \
	$(TMPDIR)\tkIntXlibStubs.obj


a204 1
lib32		= "$(TOOLS32)\bin\lib.exe"
d220 1
a220 4
			$(TK_INCLUDES) $(TK_DEFINES) -DUSE_TCL_STUBS

WISH_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
			$(TK_INCLUDES) $(TK_DEFINES)
a325 5
stubs:
	$(TCLDIR)\win\$(TMPDIRNAME)\tclsh$(VERSION)$(DBGX) \
		$(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls

d351 1
a351 4
$(TKLIB): $(TKDLL) $(TKSTUBLIB)

$(TKSTUBLIB): $(TKSTUBOBJS)
        $(lib32) /out:$@@ $(TKSTUBOBJS)
d356 1
a356 1
		-out:$@@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLSTUBLIB) \
a413 8
# Regenerate the stubs files.
#

genstubs:
	tclsh$(VERSION) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls

#
d427 1
a427 1
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?
@


1.1.4.15
log
@"make test" now invokes the test suite from the current working dir so
that you can call "make test" on multiple platforms simultaneously.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.14 1999/03/10 07:13:51 stanton Exp $
d342 2
a343 1
		source ../tests/all.tcl
@


1.1.4.16
log
@changed hardcoded reference to ../tests/all.tcl to use variable in its path.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.15 1999/03/11 19:02:10 hershey Exp $
d103 1
a103 2
# the tkThreadTest.c file has not been checked it yet.
#	$(TMPDIR)\tkThreadTest.obj
d339 1
d341 3
a343 4
	set PATH=$(TCLDIR)\win\$(TMPDIRNAME);$(PATH)
	$(TKTEST) $(ROOT)/tests/all.tcl

#       copy $(TCLDIR)\bin\pkgIndex.tcl $(OUTDIR)
d455 1
a455 1
	$(cc32) $(WISH_CFLAGS) -DTK_TEST -Fo$@@ $?
d458 1
a458 1
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?
d461 1
a461 1
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?
@


1.1.4.17
log
@"make test" pipes output to "CAT32" which is xterm.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.16 1999/03/11 23:48:11 hershey Exp $
d342 1
a342 1
	$(TKTEST) $(ROOT)/tests/all.tcl | $(CAT32)
@


1.1.4.18
log
@Updated version to 8.1b3.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id$
d31 1
a31 1
TCLDIR		= ..\..\tcl8.1b3
@


1.1.4.19
log
@* win/makefile.vc:
* generic/tk.h: Changed to use TCL_BETA_RELEASE macro, and fixed
so this works in rc files.
@
text
@d484 1
a484 2
	$(rc32) -fo $@@ -r -i "$(GENERICDIR)" -i "$(TOOLS32)\include" \
		-i "$(TCLDIR)\generic" $<
@


1.1.4.20
log
@Removed the stubs functions.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.19 1999/03/18 00:43:01 stanton Exp $
d213 7
a219 1
TKSTUBOBJS = $(TMPDIR)\tkStubLib.obj \
@


1.1.4.21
log
@Remove the DDE code.

Modified stubs based on Jan's patch.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.20 1999/03/30 02:30:19 redman Exp $
a210 1
	$(TMPDIR)\tkStubLib.obj \
@


1.1.4.13.2.1
log
@Changes to support stubs in 8.1. Merged from 8.0.6 code base.
@
text
@d7 1
a7 1
# RCS: @@(#) $Id: makefile.vc,v 1.1.4.13 1999/03/09 02:48:44 lfb Exp $
a31 1
INSTALLDIR      = c:\program files\tcl
a54 4
TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub
TKSTUBPREFIX  = $(TKNAMEPREFIX)stub


a68 1
TCLSTUBLIB	= $(TCLSTUBPREFIX)$(VERSION)$(DBGX).lib
a71 2
TKSTUBLIBNAME	= $(TKSTUBPREFIX)$(VERSION)$(DBGX).lib
TKSTUBLIB	= $(OUTDIR)\$(TKSTUBLIBNAME)
a200 1
	$(TMPDIR)\tkStubInit.obj \
a202 9
TKSTUBOBJS = \
	$(TMPDIR)\tkStubLib.obj \
	$(TMPDIR)\tkStubs.obj \
	$(TMPDIR)\tkPlatStubs.obj \
	$(TMPDIR)\tkIntStubs.obj \
	$(TMPDIR)\tkIntPlatStubs.obj \
	$(TMPDIR)\tkIntXlibStubs.obj


a204 1
lib32		= "$(TOOLS32)\bin\lib.exe"
d220 1
a220 4
			$(TK_INCLUDES) $(TK_DEFINES) -DUSE_TCL_STUBS

WISH_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
			$(TK_INCLUDES) $(TK_DEFINES)
a325 5
stubs:
	$(TCLDIR)\win\$(TMPDIRNAME)\tclsh$(VERSION)$(DBGX) \
		$(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls

d351 1
a351 4
$(TKLIB): $(TKDLL) $(TKSTUBLIB)

$(TKSTUBLIB): $(TKSTUBOBJS)
        $(lib32) /out:$@@ $(TKSTUBOBJS)
d356 1
a356 1
		-out:$@@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLSTUBLIB) \
d427 1
a427 1
	$(cc32) $(WISH_CFLAGS) -Fo$@@ $?
@


1.1.1.1
log
@fixes for VC++ 5.0
@
text
@d30 1
a30 2
TOOLS32		= c:\progra~1\devstudio\vc
TOOLS32_rc	= c:\progra~1\devstudio\sharedide
d175 1
a175 1
rc32		= $(TOOLS32_rc)\bin\rc.exe
@
