diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-03-31 20:17:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-03-31 20:17:46 (GMT) |
| commit | 449ea437180bc44e39e63c8126f8f654aeb98b0a (patch) | |
| tree | 8605c4cb1e2d105904e3f8e5486415b6629ed2a5 /unix | |
| parent | 11593d64b8c9f241f43da823c00c9999cf84fcd5 (diff) | |
| parent | 260c2634b9c296b79c7c6adc8326214233e38d87 (diff) | |
| download | tcl-449ea437180bc44e39e63c8126f8f654aeb98b0a.zip tcl-449ea437180bc44e39e63c8126f8f654aeb98b0a.tar.gz tcl-449ea437180bc44e39e63c8126f8f654aeb98b0a.tar.bz2 | |
Going forward trying to define a better Tcl_InitStubsystems()
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | unix/tclAppInit.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 0eea33a..d570b23 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -633,9 +633,9 @@ tclLibObjs: # This targets actually build the objects needed for the lib in the above case objs: ${OBJS} -${TCL_EXE}: ${TCLSH_OBJS} ${TCL_LIB_FILE} +${TCL_EXE}: ${TCLSH_OBJS} ${TCL_LIB_FILE} ${STUB_LIB_FILE} ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} \ - @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \ + @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ ${STUB_LIB_FILE} \ ${CC_SEARCH_FLAGS} -o ${TCL_EXE} # Must be empty so it doesn't conflict with rule for ${TCL_EXE} above diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c index f3edcff..171c1a4 100644 --- a/unix/tclAppInit.c +++ b/unix/tclAppInit.c @@ -12,8 +12,7 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#undef BUILD_tcl -#undef STATIC_BUILD +#define USE_TCL_STUBS #include "tcl.h" #ifdef TCL_TEST @@ -150,10 +149,10 @@ Tcl_AppInit( */ #ifdef DJGPP - (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL, + Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL, Tcl_NewStringObj("~/tclsh.rc", -1), TCL_GLOBAL_ONLY); #else - (Tcl_ObjSetVar2)(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL, + Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL, Tcl_NewStringObj("~/.tclshrc", -1), TCL_GLOBAL_ONLY); #endif |