1.1 --- a/scripts/build/kernel/mingw32.sh Sun Jul 31 22:19:21 2011 +0200
1.2 +++ b/scripts/build/kernel/mingw32.sh Mon Aug 01 00:16:12 2011 +0200
1.3 @@ -20,7 +20,7 @@
1.4 CT_DoStep INFO "Installing kernel headers"
1.5
1.6 mkdir -p "${CT_HEADERS_DIR}"
1.7 - cp -r ${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/include/* \
1.8 + cp -r ${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32-src/include/* \
1.9 ${CT_HEADERS_DIR}
1.10
1.11 CT_EndStep
2.1 --- a/scripts/build/libc/mingw.sh Sun Jul 31 22:19:21 2011 +0200
2.2 +++ b/scripts/build/libc/mingw.sh Mon Aug 01 00:16:12 2011 +0200
2.3 @@ -29,7 +29,7 @@
2.4 fi
2.5 if [ -n "${CT_MINGW_GNURX}" ]; then
2.6 CT_Extract "mingw-libgnurx-${CT_MINGW_GNURX_VERSION}-src"
2.7 - CT_Patch "mingw-libgnurx" "${CT_MINGW_GNURX_VERSION}"
2.8 + CT_Patch "mingw-libgnurx" "${CT_MINGW_GNURX_VERSION}-src"
2.9 fi
2.10 }
2.11
2.12 @@ -42,7 +42,7 @@
2.13
2.14 CT_DoLog EXTRA "Installing MinGW Runtime headers"
2.15 mkdir -p "${CT_HEADERS_DIR}"
2.16 - cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/include/* \
2.17 + cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32-src/include/* \
2.18 ${CT_HEADERS_DIR}
2.19
2.20 # It seems mingw is strangely set up to look into /mingw instead of
2.21 @@ -61,12 +61,12 @@
2.22 mkdir -p "${CT_BUILD_DIR}/build-w32api"
2.23 cd "${CT_BUILD_DIR}/build-w32api"
2.24
2.25 - CT_DoExecLog CFG \
2.26 - CFLAGS="-I${CT_HEADERS_DIR}" \
2.27 - LDFLAGS="-L${CT_SYSROOT_DIR}/lib" \
2.28 - "${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/configure" \
2.29 - --prefix=${CT_SYSROOT_DIR} \
2.30 - --includedir=${CT_HEADERS_DIR} \
2.31 + CT_DoExecLog CFG \
2.32 + CFLAGS="-I${CT_HEADERS_DIR}" \
2.33 + LDFLAGS="-L${CT_SYSROOT_DIR}/lib" \
2.34 + "${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32-src/configure" \
2.35 + --prefix=${CT_SYSROOT_DIR} \
2.36 + --includedir=${CT_HEADERS_DIR} \
2.37 --host=${CT_TARGET}
2.38
2.39 CT_DoLog EXTRA "Building W32-API"
2.40 @@ -80,12 +80,12 @@
2.41 mkdir -p "${CT_BUILD_DIR}/build-mingwrt"
2.42 cd "${CT_BUILD_DIR}/build-mingwrt"
2.43
2.44 - CT_DoExecLog CFG \
2.45 - CFLAGS="-I${CT_HEADERS_DIR}" \
2.46 - LDFLAGS="-L${CT_SYSROOT_DIR}/lib" \
2.47 - "${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/configure" \
2.48 - --prefix=${CT_SYSROOT_DIR}/ \
2.49 - --includedir=${CT_HEADERS_DIR} \
2.50 + CT_DoExecLog CFG \
2.51 + CFLAGS="-I${CT_HEADERS_DIR}" \
2.52 + LDFLAGS="-L${CT_SYSROOT_DIR}/lib" \
2.53 + "${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32-src/configure" \
2.54 + --prefix=${CT_SYSROOT_DIR}/ \
2.55 + --includedir=${CT_HEADERS_DIR} \
2.56 --host=${CT_TARGET}
2.57
2.58 CT_DoLog EXTRA "Building MinGW Runtime"
2.59 @@ -134,14 +134,14 @@
2.60 mkdir -p "${CT_BUILD_DIR}/build-gnurx"
2.61 cd "${CT_BUILD_DIR}/build-gnurx"
2.62
2.63 - CT_DoExecLog CFG \
2.64 - CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
2.65 - "${CT_SRC_DIR}/mingw-libgnurx-${CT_MINGW_GNURX_VERSION}/configure" \
2.66 - --build=${CT_BUILD} \
2.67 - --host=${CT_TARGET} \
2.68 - --prefix=${CT_SYSROOT_DIR} \
2.69 - --includedir=${CT_HEADERS_DIR} \
2.70 - --enable-shared \
2.71 + CT_DoExecLog CFG \
2.72 + CFLAGS="${CT_CFLAGS_FOR_TARGET}" \
2.73 + "${CT_SRC_DIR}/mingw-libgnurx-${CT_MINGW_GNURX_VERSION}-src/configure" \
2.74 + --build=${CT_BUILD} \
2.75 + --host=${CT_TARGET} \
2.76 + --prefix=${CT_SYSROOT_DIR} \
2.77 + --includedir=${CT_HEADERS_DIR} \
2.78 + --enable-shared \
2.79 --enable-static
2.80
2.81 CT_DoLog EXTRA "Building GnuRX development files"