Overview
| Comment: | Updated to support accepting extra objects supplied by the EXTRA_OBJS environment variable |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
fc9a2d46949c452356966a26e18e6dc6 |
| User & Date: | rkeene on 2010-09-26 04:43:20 |
| Other Links: | manifest | tags |
Context
|
2010-09-26
| ||
| 04:43 |
Fixed issue with zlib checking
Added support for checking for "tkbase.res.o" (present on Win32 builds) and adding to EXTRA_OBJS to link to the "kit" application check-in: fd276919ad user: rkeene tags: trunk | |
| 04:43 | Updated to support accepting extra objects supplied by the EXTRA_OBJS environment variable check-in: fc9a2d4694 user: rkeene tags: trunk | |
| 04:43 | Updated to create "tkbase.res.o" if building for Win32 check-in: d7a9831961 user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/Makefile.in from [ec9cb72516] to [28bd753a6b].
1 2 3 4 5 6 | CC = @CC@ CFLAGS = @CFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit CPPFLAGS = @CPPFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ARCHS = @ARCHS@ | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | CC = @CC@ CFLAGS = @CFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit CPPFLAGS = @CPPFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ARCHS = @ARCHS@ OBJS = kitInit.o main.o pwb.o rechan.o zlib.o winMain.o @EXTRA_OBJS@ all: kit kit: $(OBJS) $(ARCHS) $(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(ARCHS) $(LDFLAGS) $(LIBS) mk4tcl.tcl.h: mk4tcl.tcl |
| ︙ | ︙ |
Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [dc10e35060] to [66c2193783].
| ︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
DC_STATIC_LIBGCC
dnl Find the appropriate Tcl headers and libraries
DC_DO_TCL
dnl Find archives we need to link to
DC_FIND_TCLKIT_LIBS
dnl Determine if we have "Tcl_SetStartupScript" (8.6.x) or "TclSetStartupScriptPath" (8.4.x)
SAVE_LIBS="${LIBS}"
LIBS="${ARCHS} ${LIBS}"
AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
LIBS="${SAVE_LIBS}"
| > > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
DC_STATIC_LIBGCC
dnl Find the appropriate Tcl headers and libraries
DC_DO_TCL
dnl Find archives we need to link to
DC_FIND_TCLKIT_LIBS
dnl Find extra objects we need to link as a part of "kit"
AC_SUBST(EXTRA_OBJS)
dnl Determine if we have "Tcl_SetStartupScript" (8.6.x) or "TclSetStartupScriptPath" (8.4.x)
SAVE_LIBS="${LIBS}"
LIBS="${ARCHS} ${LIBS}"
AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
LIBS="${SAVE_LIBS}"
|
| ︙ | ︙ |