diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-27 21:09:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-27 21:09:36 (GMT) |
| commit | 4ab699dc03e99cad5c3b1c8d09eca9f6f4039327 (patch) | |
| tree | bfdc867121184c66238315f7a183844b0d2ee29d | |
| parent | 38e41ac6efe5e129d33858e95e8ba6da2cdd593e (diff) | |
| parent | 0c50d57d0866b97891c2864bc5d03288f80ff595 (diff) | |
| download | tcl-4ab699dc03e99cad5c3b1c8d09eca9f6f4039327.zip tcl-4ab699dc03e99cad5c3b1c8d09eca9f6f4039327.tar.gz tcl-4ab699dc03e99cad5c3b1c8d09eca9f6f4039327.tar.bz2 | |
Merge 8.7. Tweak makefile.vc for detection of stdint.h/inttypes.h/stdbool.h
| -rw-r--r-- | unix/Makefile.in | 5 | ||||
| -rw-r--r-- | win/rules.vc | 9 | ||||
| -rw-r--r-- | win/tclWinPort.h | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 3d9fcfa..afb92b7 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -774,12 +774,11 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} @mkdir -p ${TCL_VFS_PATH} @echo "creating ${TCL_VFS_PATH} (prepare compression)" @if \ - ln -s $(TOP_DIR)/library/* ${TCL_VFS_PATH}/ && \ - ln ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl; \ + ln -s $(TOP_DIR)/library/* ${TCL_VFS_PATH}/; \ then : ; else \ cp -a $(TOP_DIR)/library/* ${TCL_VFS_PATH}; \ - cp -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl; \ fi + mv ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl rm -rf ${TCL_VFS_PATH}/dde ${TCL_VFS_PATH}/reg @find ${TCL_VFS_ROOT} -type d -empty -delete @echo "creating ${TCL_ZIP_FILE} from ${TCL_VFS_PATH}" diff --git a/win/rules.vc b/win/rules.vc index 02b2b71..75bc185 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1297,6 +1297,15 @@ INCLUDE_INSTALL_DIR = $(_INSTALLDIR)\..\include # define PRJ_LIBS before including rules.rc if additional libs are needed
OPTDEFINES = /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS
+!if $(VCVERSION) >= 1600
+OPTDEFINES = $(OPTDEFINES) /DHAVE_STDINT_H=1
+!endif
+!if $(VCVERSION) >= 1700
+OPTDEFINES = $(OPTDEFINES) /DHAVE_INTTYPES_H=1
+!endif
+!if $(VCVERSION) >= 1800
+OPTDEFINES = $(OPTDEFINES) /DHAVE_STDBOOL_H=1
+!endif
!if $(TCL_MEM_DEBUG)
OPTDEFINES = $(OPTDEFINES) /DTCL_MEM_DEBUG
diff --git a/win/tclWinPort.h b/win/tclWinPort.h index bae48b9..5c57953 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -87,7 +87,7 @@ typedef DWORD_PTR * PDWORD_PTR; #include <malloc.h> #include <process.h> #include <signal.h> -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include <inttypes.h> #endif #include <limits.h> |