KitCreator
Changes On Branch winAll
Login
HomeDownloadsSource CodeTicketsWiki
Hide Diff Patch Unified Diff

Changes In Branch winAll Excluding Merge-Ins

This is equivalent to a diff from 1fafbabd1a to 43234c377e

2015-03-30
21:59
Updated to always copy to a new file Closed-Leaf check-in: 683995c0ec user: rkeene tags: winNoRunKit
2015-03-26
20:45
Merge Tk build fix. Closed-Leaf check-in: 43234c377e user: mistachkin tags: winAll
20:44
Permit Tk 8.6.4 to build successfully on Windows using MinGW. Patch is fix for Tk ticket [2a70627a03]. Closed-Leaf check-in: 4db3c24480 user: mistachkin tags: tkt-2a70627a03
19:05
Combine current Windows fixes for testing purposes. check-in: d263c81271 user: mistachkin tags: winAll
04:40
On Windows, stop trying to run 'kit.exe' before it has a functional VFS. check-in: 1fafbabd1a user: mistachkin tags: winNoRunKit
2015-03-16
01:07
Updated default target to be 8.6.4 check-in: 4f42c11e1e user: rkeene tags: trunk

Added tk/patches/all/tk-8.6-fix-shobjidl-bug2a70627a03.diff version [2d617fe4d0]. 

























>
>
>
>
>
>
>
>
>
>
>

1
2
3
4
5
6
7
8
9
10
11

diff -u tk.orig/win/tkWinDialog.c tk.fixed/win/tkWinDialog.c
--- tk.orig/win/tkWinDialog.c	2015-03-26 11:59:50 -0700
+++ tk.fixed/win/tkWinDialog.c	2015-03-26 12:00:02 -0700
@@ -18,7 +18,6 @@
 #include <cderr.h>		/* includes the common dialog error codes */
 
 #include <shlobj.h>		/* includes SHBrowseForFolder */
-#include <shobjidl.h>
 
 #ifdef _MSC_VER
 #   pragma comment (lib, "shell32.lib")

Modified zlib/build.sh from [13b1c7bf71] to [e9c0794475].

︙︙
40
41
42
43
44
45
46
47
48
49
50
51
52













53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68


69
70
71
72
73
74

fi

(
	cd 'build' || exit 1

	if [ ! -d '../buildsrc' ]; then
		gzip -dc "../${SRC}" | tar -xf -
	else    
		cp -rp ../buildsrc/* './'
	fi

	cd "${BUILDDIR}" || exit 1














	# If we are building for KitDLL, compile with '-fPIC'
	if [ "${KITTARGET}" = "kitdll" ]; then
		CFLAGS="${CFLAGS} -fPIC"
		export CFLAGS
	fi

	# We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf
	# script and will puke
	echo "Running: ./configure --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --static"
	./configure --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --static

	echo "Running: ${MAKE:-make}"
	${MAKE:-make} || exit 1

	echo "Running: ${MAKE:-make} install"
	${MAKE:-make} install



	# We don't really care too much about failure in zlib
	exit 0
) || exit 1

exit 0








|





>
>
>
>
>
>
>
>
>
>
>
>
>
|
|
|
|
|

|
|
|
|

|
|

|
|
>
>







40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

fi

(
	cd 'build' || exit 1

	if [ ! -d '../buildsrc' ]; then
		gzip -dc "../${SRC}" | tar -xf -
	else
		cp -rp ../buildsrc/* './'
	fi

	cd "${BUILDDIR}" || exit 1

	case $(uname -s 2> /dev/null) in
		MINGW* | mingw*)
			# use win32/Makefile.gcc instead.
			echo "Running: cp win32/Makefile.gcc Makefile"
			cp win32/Makefile.gcc Makefile

			echo "Running: ${MAKE:-make}"
			${MAKE:-make} || exit 1

			echo "Running: BINARY_PATH=${INSTDIR}/bin INCLUDE_PATH=${INSTDIR}/include LIBRARY_PATH=${INSTDIR}/lib ${MAKE:-make} install"
			BINARY_PATH=${INSTDIR}/bin INCLUDE_PATH=${INSTDIR}/include LIBRARY_PATH=${INSTDIR}/lib ${MAKE:-make} install
			;;
		*)
			# If we are building for KitDLL, compile with '-fPIC'
			if [ "${KITTARGET}" = "kitdll" ]; then
				CFLAGS="${CFLAGS} -fPIC"
				export CFLAGS
			fi

			# We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf
			# script and will puke
			echo "Running: ./configure --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --static"
			./configure --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --static

			echo "Running: ${MAKE:-make}"
			${MAKE:-make} || exit 1

			echo "Running: ${MAKE:-make} install"
			${MAKE:-make} install
			;;
	esac

	# We don't really care too much about failure in zlib
	exit 0
) || exit 1

exit 0

Powered by Fossil · RSS