diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-03-28 13:30:53 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-03-28 13:30:53 (GMT) |
| commit | e558a67aff6d71e40e64a1b49f23341e53062bc4 (patch) | |
| tree | 35f8922b46b33a26720eca7b667c6aed392e90a3 /unix | |
| parent | f6c5510decd1542854455c65cc77a663df0c68f2 (diff) | |
| parent | 76355c598beb1f86dd374d44e2391378abae9c06 (diff) | |
| download | tcl-e558a67aff6d71e40e64a1b49f23341e53062bc4.zip tcl-e558a67aff6d71e40e64a1b49f23341e53062bc4.tar.gz tcl-e558a67aff6d71e40e64a1b49f23341e53062bc4.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 0a22a58..81185b4 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1541,6 +1541,10 @@ tclMacOSXFCmd.o: $(MAC_OSX_DIR)/tclMacOSXFCmd.c tclMacOSXNotify.o: $(MAC_OSX_DIR)/tclMacOSXNotify.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tclMacOSXNotify.c +# The following is a CYGWIN only source: +tclWinError.o: $(TOP_DIR)/win/tclWinError.c + $(CC) -c $(CC_SWITCHES) $(TOP_DIR)/win/tclWinError.c + # DTrace support $(TCL_OBJS) $(STUB_LIB_OBJS) $(TCLSH_OBJS) $(TCLTEST_OBJS) $(XTTEST_OBJS): @DTRACE_HDR@ diff --git a/unix/configure b/unix/configure index 72d5d73..e737bd5 100755 --- a/unix/configure +++ b/unix/configure @@ -7057,7 +7057,7 @@ fi SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" - DL_OBJS="tclLoadDl.o" + DL_OBJS="tclLoadDl.o tclWinError.o" DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 39f8ca1..f6e002e 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1224,7 +1224,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" - DL_OBJS="tclLoadDl.o" + DL_OBJS="tclLoadDl.o tclWinError.o" DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" |