Commit 7237708a authored by Brannon King's avatar Brannon King
Browse files

tweak windows build just a bit

parent 1b5d2105
......@@ -18,10 +18,10 @@ icu_linux_dir=$staging_dir/build_icu_linux
mkdir -p $staging_dir
pushd $staging_dir
wget -c
tar -xvzf icu4c-57_1-src.tgz
tar -xzf icu4c-57_1-src.tgz
pushd icu/source
CC="gcc" CXX="g++" ./runConfigureICU Linux --prefix=$icu_linux_dir --enable-extras=no --enable-strict=no -enable-static --enable-shared=no --enable-tests=no --enable-samples=no --enable-dyload=no
CC="gcc" CXX="g++" ./runConfigureICU Linux --prefix=$icu_linux_dir --enable-extras=no --enable-strict=no --enable-static --enable-shared=no --enable-tests=no --enable-samples=no --enable-dyload=no
make -j4
make install
......@@ -30,21 +30,23 @@ pushd depends
# Remove the dir saying that dependencies are built (although ccache
# is still enabled).
rm -rf built
mkdir -p sources
cp "$staging_dir/icu4c-57_1-src.tgz" sources/
# Build and install the cross compiled ICU package.
make HOST=i686-w64-mingw32 NO_QT=1 ICU_ONLY=1
make -j4 HOST=i686-w64-mingw32 NO_QT=1 ICU_ONLY=1
# Then build the rest of the dependencies (now that it exists and we
# can determine the location for it).
icu_mingw_dir=$(find /tmp/icu_install -name i686-w64-mingw32 -type d)
make HOST=i686-w64-mingw32 NO_QT=1 ICU_DIR=$icu_mingw_dir
make -j4 HOST=i686-w64-mingw32 NO_QT=1 ICU_DIR=$icu_mingw_dir V=1
echo "Using --with-icu=$icu_mingw_dir"
CC="i686-w64-mingw32-gcc" CXX="i686-w64-mingw32-g++" ./configure --prefix=$PREFIX --host=i686-w64-mingw32 --build=i686-w64-mingw32 --without-gui --with-icu=$icu_mingw_dir --enable-static --disable-shared
make -j12
make -j4
rm -rf $staging_dir
# Remove hardcoded cross compiled ICU package path.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment