Check-in [4b893326f5]
Overview
SHA1:4b893326f56664347e00b18e27de5c082a24bdaf
Date: 2014-05-04 17:58:24
User: rkeene
Comment:Updated to support linking Tk dynamically
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2014-05-05
02:46
[c24deea7f7] Updated tests (user: rkeene, tags: trunk)
2014-05-04
17:58
[4b893326f5] Updated to support linking Tk dynamically (user: rkeene, tags: trunk)
2014-04-29
11:46
[9ec7dcbb26] Updated to fail to build TCC on unsupported platforms (user: rkeene, tags: trunk)
Changes

Modified tk/build.sh from [65e5d2673e] to [d87b27b303].

172
173
174
175
176
177
178
179

180

181
182
183
184
185
186
187
		cd "${BUILDDIR}/${dir}" || exit 1

		# Remove broken pre-generated Makfiles
		rm -f GNUmakefile Makefile makefile

		if [ "${dir}" = "win" ]; then
			# Statically link Tk to Tclkit if we are compiling for
			# Windows

			STATICTK="1"


			if [ "${win64}" = "1" ]; then
				# Mingw32 for AMD64 requires this, apparently
				CPPFLAGS="${CPPFLAGS} -D_WIN32_IE=0x0501"
				CFLAGS="${CFLAGS} -D_WIN32_IE=0x0501"
				export CPPFLAGS CFLAGS
			fi







|
>
|
>







172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
		cd "${BUILDDIR}/${dir}" || exit 1

		# Remove broken pre-generated Makfiles
		rm -f GNUmakefile Makefile makefile

		if [ "${dir}" = "win" ]; then
			# Statically link Tk to Tclkit if we are compiling for
			# Windows unless otherwise requested
			if [ -z "${STATICTK}" ]; then
				STATICTK="1"
			fi

			if [ "${win64}" = "1" ]; then
				# Mingw32 for AMD64 requires this, apparently
				CPPFLAGS="${CPPFLAGS} -D_WIN32_IE=0x0501"
				CFLAGS="${CFLAGS} -D_WIN32_IE=0x0501"
				export CPPFLAGS CFLAGS
			fi