Skip to content

Commit 6fb0e05

Browse files
author
jan.nijtmans
committed
Update to latest TEA files
1 parent fa699bf commit 6fb0e05

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

configure

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9289,6 +9289,11 @@ rm -rf conftest*
92899289

92909290
printf "%s\n" "#define TCL_MAJOR_VERSION 8" >>confdefs.h
92919291

9292+
fi
9293+
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tk8}" != x; then
9294+
9295+
printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
9296+
92929297
fi
92939298
if test "${TEA_PLATFORM}" = "windows" ; then
92949299
if test "${SHARED_BUILD}" = "1" ; then

win/rules.vc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ _RULES_VC = 1
2424
# For modifications that are not backward-compatible, you *must* change
2525
# the major version.
2626
RULES_VERSION_MAJOR = 1
27-
RULES_VERSION_MINOR = 12
27+
RULES_VERSION_MINOR = 13
2828

2929
# The PROJECT macro must be defined by parent makefile.
3030
!if "$(PROJECT)" == ""
@@ -881,6 +881,10 @@ USE_THREAD_ALLOC= 0
881881
!message *** Build for Tcl8
882882
TCL_BUILD_FOR = 8
883883
!endif
884+
!if [nmakehlp -f $(OPTS) "tk8"]
885+
!message *** Build for Tk8
886+
TK_BUILD_FOR = 8
887+
!endif
884888

885889
!if $(TCL_MAJOR_VERSION) == 8
886890
!if [nmakehlp -f $(OPTS) "time64bit"]
@@ -1451,6 +1455,9 @@ OPTDEFINES = $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
14511455
!if "$(TCL_BUILD_FOR)" == "8"
14521456
OPTDEFINES = $(OPTDEFINES) /DTCL_MAJOR_VERSION=8
14531457
!endif
1458+
!if "$(TK_BUILD_FOR)" == "8"
1459+
OPTDEFINES = $(OPTDEFINES) /DTK_MAJOR_VERSION=8
1460+
!endif
14541461

14551462
# Like the TEA system only set this non empty for non-Tk extensions
14561463
# Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME

0 commit comments

Comments
 (0)