1.1 --- a/scripts/build/libc/mingw.sh	Sun Mar 20 01:16:34 2011 +0100
     1.2 +++ b/scripts/build/libc/mingw.sh	Mon Aug 01 00:16:12 2011 +0200
     1.3 @@ -29,7 +29,7 @@
     1.4      fi
     1.5      if [ -n "${CT_MINGW_GNURX}" ]; then
     1.6          CT_Extract "mingw-libgnurx-${CT_MINGW_GNURX_VERSION}-src"
     1.7 -        CT_Patch "mingw-libgnurx" "${CT_MINGW_GNURX_VERSION}"
     1.8 +        CT_Patch "mingw-libgnurx" "${CT_MINGW_GNURX_VERSION}-src"
     1.9      fi
    1.10  }
    1.11  
    1.12 @@ -42,7 +42,7 @@
    1.13  
    1.14      CT_DoLog EXTRA "Installing MinGW Runtime headers"
    1.15      mkdir -p "${CT_HEADERS_DIR}"
    1.16 -    cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/include/* \
    1.17 +    cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32-src/include/* \
    1.18            ${CT_HEADERS_DIR}
    1.19  
    1.20      # It seems mingw is strangely set up to look into /mingw instead of
    1.21 @@ -61,12 +61,12 @@
    1.22      mkdir -p "${CT_BUILD_DIR}/build-w32api"
    1.23      cd "${CT_BUILD_DIR}/build-w32api"
    1.24  
    1.25 -    CT_DoExecLog CFG                                              \
    1.26 -    CFLAGS="-I${CT_HEADERS_DIR}"                                  \
    1.27 -    LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                             \
    1.28 -    "${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/configure" \
    1.29 -        --prefix=${CT_SYSROOT_DIR}                                \
    1.30 -        --includedir=${CT_HEADERS_DIR}                            \
    1.31 +    CT_DoExecLog CFG                                                  \
    1.32 +    CFLAGS="-I${CT_HEADERS_DIR}"                                      \
    1.33 +    LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                                 \
    1.34 +    "${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32-src/configure" \
    1.35 +        --prefix=${CT_SYSROOT_DIR}                                    \
    1.36 +        --includedir=${CT_HEADERS_DIR}                                \
    1.37          --host=${CT_TARGET}
    1.38  
    1.39      CT_DoLog EXTRA "Building W32-API"
    1.40 @@ -80,12 +80,12 @@
    1.41      mkdir -p "${CT_BUILD_DIR}/build-mingwrt"
    1.42      cd "${CT_BUILD_DIR}/build-mingwrt"
    1.43  
    1.44 -    CT_DoExecLog CFG                                                \
    1.45 -    CFLAGS="-I${CT_HEADERS_DIR}"                                    \
    1.46 -    LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                               \
    1.47 -    "${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/configure" \
    1.48 -        --prefix=${CT_SYSROOT_DIR}/                                 \
    1.49 -        --includedir=${CT_HEADERS_DIR}                              \
    1.50 +    CT_DoExecLog CFG                                                    \
    1.51 +    CFLAGS="-I${CT_HEADERS_DIR}"                                        \
    1.52 +    LDFLAGS="-L${CT_SYSROOT_DIR}/lib"                                   \
    1.53 +    "${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32-src/configure" \
    1.54 +        --prefix=${CT_SYSROOT_DIR}/                                     \
    1.55 +        --includedir=${CT_HEADERS_DIR}                                  \
    1.56          --host=${CT_TARGET}
    1.57  
    1.58      CT_DoLog EXTRA "Building MinGW Runtime"
    1.59 @@ -134,14 +134,14 @@
    1.60          mkdir -p "${CT_BUILD_DIR}/build-gnurx"
    1.61          cd "${CT_BUILD_DIR}/build-gnurx"
    1.62  
    1.63 -        CT_DoExecLog CFG                                                    \
    1.64 -        CFLAGS="${CT_CFLAGS_FOR_TARGET}"                                    \
    1.65 -        "${CT_SRC_DIR}/mingw-libgnurx-${CT_MINGW_GNURX_VERSION}/configure"  \
    1.66 -            --build=${CT_BUILD}                                             \
    1.67 -            --host=${CT_TARGET}                                             \
    1.68 -            --prefix=${CT_SYSROOT_DIR}                                      \
    1.69 -            --includedir=${CT_HEADERS_DIR}                                  \
    1.70 -            --enable-shared                                                 \
    1.71 +        CT_DoExecLog CFG                                                        \
    1.72 +        CFLAGS="${CT_CFLAGS_FOR_TARGET}"                                        \
    1.73 +        "${CT_SRC_DIR}/mingw-libgnurx-${CT_MINGW_GNURX_VERSION}-src/configure"  \
    1.74 +            --build=${CT_BUILD}                                                 \
    1.75 +            --host=${CT_TARGET}                                                 \
    1.76 +            --prefix=${CT_SYSROOT_DIR}                                          \
    1.77 +            --includedir=${CT_HEADERS_DIR}                                      \
    1.78 +            --enable-shared                                                     \
    1.79              --enable-static
    1.80  
    1.81          CT_DoLog EXTRA "Building GnuRX development files"