Check-in [56d1fd1c50]
Overview
SHA1:56d1fd1c504fef053c70a00cb7c49a32f2ac5025
Date: 2015-03-26 04:39:56
User: mistachkin
Comment:Allow zlib 1.2.8 to build and integrate properly on Windows using MinGW.
Timelines: family | ancestors | winZlib128
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2015-03-30
23:54
[9ad5a7514f] Allow zlib 1.2.8 to build and integrate properly on Windows using MinGW. (user: mistachkin, tags: trunk)
2015-03-26
19:05
[d263c81271] Combine current Windows fixes for testing purposes. (user: mistachkin, tags: winAll)
04:39
[56d1fd1c50] Closed-Leaf: Allow zlib 1.2.8 to build and integrate properly on Windows using MinGW. (user: mistachkin, tags: winZlib128)
2015-03-16
01:07
[4f42c11e1e] Updated default target to be 8.6.4 (user: rkeene, tags: trunk)
Changes

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