KitCreator
Check-in [d263c81271]
Login
HomeDownloadsSource CodeTicketsWiki
Overview
Comment:Combine current Windows fixes for testing purposes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | winAll
Files: files | file ages | folders
SHA1: d263c8127134d8260df54df7b38b35e28117d133
User & Date: mistachkin on 2015-03-26 19:05:09
Other Links: branch diff | manifest | tags
Context
2015-03-26
20:45
Merge Tk build fix. Closed-Leaf check-in: 43234c377e user: mistachkin tags: winAll
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
04:39
Allow zlib 1.2.8 to build and integrate properly on Windows using MinGW. Closed-Leaf check-in: 56d1fd1c50 user: mistachkin tags: winZlib128
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

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

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    
	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
			# 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
			# 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}"
			${MAKE:-make} || exit 1

	echo "Running: ${MAKE:-make} install"
	${MAKE:-make} install
			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