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: | 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
Modified zlib/build.sh from [13b1c7bf71] to [e9c0794475].
40 40 fi 41 41 42 42 ( 43 43 cd 'build' || exit 1 44 44 45 45 if [ ! -d '../buildsrc' ]; then 46 46 gzip -dc "../${SRC}" | tar -xf - 47 - else 47 + else 48 48 cp -rp ../buildsrc/* './' 49 49 fi 50 50 51 51 cd "${BUILDDIR}" || exit 1 52 52 53 - # If we are building for KitDLL, compile with '-fPIC' 54 - if [ "${KITTARGET}" = "kitdll" ]; then 55 - CFLAGS="${CFLAGS} -fPIC" 56 - export CFLAGS 57 - fi 53 + case $(uname -s 2> /dev/null) in 54 + MINGW* | mingw*) 55 + # use win32/Makefile.gcc instead. 56 + echo "Running: cp win32/Makefile.gcc Makefile" 57 + cp win32/Makefile.gcc Makefile 58 + 59 + echo "Running: ${MAKE:-make}" 60 + ${MAKE:-make} || exit 1 61 + 62 + echo "Running: BINARY_PATH=${INSTDIR}/bin INCLUDE_PATH=${INSTDIR}/include LIBRARY_PATH=${INSTDIR}/lib ${MAKE:-make} install" 63 + BINARY_PATH=${INSTDIR}/bin INCLUDE_PATH=${INSTDIR}/include LIBRARY_PATH=${INSTDIR}/lib ${MAKE:-make} install 64 + ;; 65 + *) 66 + # If we are building for KitDLL, compile with '-fPIC' 67 + if [ "${KITTARGET}" = "kitdll" ]; then 68 + CFLAGS="${CFLAGS} -fPIC" 69 + export CFLAGS 70 + fi 71 + 72 + # We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf 73 + # script and will puke 74 + echo "Running: ./configure --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --static" 75 + ./configure --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --static 58 76 59 - # We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf 60 - # script and will puke 61 - echo "Running: ./configure --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --static" 62 - ./configure --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --static 77 + echo "Running: ${MAKE:-make}" 78 + ${MAKE:-make} || exit 1 63 79 64 - echo "Running: ${MAKE:-make}" 65 - ${MAKE:-make} || exit 1 66 - 67 - echo "Running: ${MAKE:-make} install" 68 - ${MAKE:-make} install 80 + echo "Running: ${MAKE:-make} install" 81 + ${MAKE:-make} install 82 + ;; 83 + esac 69 84 70 85 # We don't really care too much about failure in zlib 71 86 exit 0 72 87 ) || exit 1 73 88 74 89 exit 0