Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge trunk |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | novem-support |
| Files: | files | file ages | folders |
| SHA1: |
547503ad5c2e4a7418870d1f455eaa13 |
| User & Date: | jan.nijtmans 2014-02-11 14:00:07 |
Context
|
2019-10-03
| ||
| 15:04 | Update version number to 1.1.1 for release. Complete Tcl 9.0 compatibility (by merging "novem-support" branch, which was already almost done) check-in: 19c8f6675a user: jan.nijtmans tags: trunk | |
|
2014-02-11
| ||
| 14:00 | merge trunk Closed-Leaf check-in: 547503ad5c user: jan.nijtmans tags: novem-support | |
| 13:59 | Update to latest TEA. Eliminate use of __WIN32__ macro: _WIN32 is more portable check-in: 94b7037067 user: jan.nijtmans tags: trunk | |
|
2013-11-14
| ||
| 14:29 | merge trunk check-in: dd4b16afe9 user: jan.nijtmans tags: novem-support | |
Changes
Changes to configure.
8701 8702 8703 8704 8705 8706 8707 8708 8709 8710 8711 8712 8713 8714 8715 |
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef __WIN32__
#error cross-compiler
#endif
int
main ()
{
|
| |
8701 8702 8703 8704 8705 8706 8707 8708 8709 8710 8711 8712 8713 8714 8715 |
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef _WIN32
#error cross-compiler
#endif
int
main ()
{
|
Changes to tools/genStubs.tcl.
264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 |
#
# Results:
# Returns the original text inside an appropriate #ifdef.
proc genStubs::addPlatformGuard {plat text} {
switch $plat {
win {
return "#ifdef __WIN32__\n${text}#endif /* __WIN32__ */\n"
}
unix {
return "#if !defined(__WIN32__) /* UNIX */\n${text}#endif /* UNIX */\n"
}
macosx {
return "#ifdef MAC_OSX_TCL\n${text}#endif /* MAC_OSX_TCL */\n"
}
aqua {
return "#ifdef MAC_OSX_TK\n${text}#endif /* MAC_OSX_TK */\n"
}
x11 {
return "#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n"
}
}
return "$text"
}
# genStubs::emitSlots --
#
|
| | | |
264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 |
#
# Results:
# Returns the original text inside an appropriate #ifdef.
proc genStubs::addPlatformGuard {plat text} {
switch $plat {
win {
return "#ifdef _WIN32\n${text}#endif /* _WIN32 */\n"
}
unix {
return "#if !defined(_WIN32) /* UNIX */\n${text}#endif /* UNIX */\n"
}
macosx {
return "#ifdef MAC_OSX_TCL\n${text}#endif /* MAC_OSX_TCL */\n"
}
aqua {
return "#ifdef MAC_OSX_TK\n${text}#endif /* MAC_OSX_TK */\n"
}
x11 {
return "#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n"
}
}
return "$text"
}
# genStubs::emitSlots --
#
|
Changes to win/makefile.vc.
427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 |
{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::
$(cc32) $(TCL_CFLAGS) -DBUILD_$(PROJECT) -Fo$(TMP_DIR)\ @<<
$<
<<
{$(WINDIR)}.rc{$(TMP_DIR)}.res:
$(rc32) -fo [email protected] -r -i "$(GENERICDIR)" -D__WIN32__ \
-DCOMMAVERSION=$(DOTVERSION:.=,),0 \
-DDOTVERSION=\"$(DOTVERSION)\" \
-DVERSION=\"$(VERSION)$(SUFX)\" \
!if $(DEBUG)
-d DEBUG \
!endif
!if $(TCL_THREADS)
|
| |
427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 |
{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::
$(cc32) $(TCL_CFLAGS) -DBUILD_$(PROJECT) -Fo$(TMP_DIR)\ @<<
$<
<<
{$(WINDIR)}.rc{$(TMP_DIR)}.res:
$(rc32) -fo [email protected] -r -i "$(GENERICDIR)" -D_WIN32 -D__WIN32__ \
-DCOMMAVERSION=$(DOTVERSION:.=,),0 \
-DDOTVERSION=\"$(DOTVERSION)\" \
-DVERSION=\"$(VERSION)$(SUFX)\" \
!if $(DEBUG)
-d DEBUG \
!endif
!if $(TCL_THREADS)
|