diff options
| author | Ray Donnelly <mingw.android@laptop.com> | 2011-09-01 19:48:15 +0100 |
|---|---|---|
| committer | Ray Donnelly <mingw.android@laptop.com> | 2011-09-01 19:48:38 +0100 |
| commit | 25900a0ea64a0060979e8ff11c9a8ca5269d2ad5 (patch) | |
| tree | df879a4180ec1512453ba4ffd38651e861bf9cbe | |
| parent | 35d03d72e828a078ee8435f084a92215146cf1f4 (diff) | |
Use iconv-1.14 for windows, new config flags for windows host Qt
| -rwxr-xr-x | Necessitas_SDK/build_sdk.sh | 4 | ||||
| -rw-r--r-- | Necessitas_SDK/setup_mingw_for_necessitas_build.sh | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh index 3cbd2c3..e6c6f5e 100755 --- a/Necessitas_SDK/build_sdk.sh +++ b/Necessitas_SDK/build_sdk.sh @@ -82,8 +82,8 @@ EXE_EXT="" export PYTHONHOME="" if [ "$OSTYPE" = "msys" ] ; then - HOST_CFG_OPTIONS=" -platform win32-g++ -reduce-exports -ms-bitfields -prefix . " - HOST_QM_CFG_OPTIONS="CONFIG+=ms_bitfields CONFIG+=static_gcclibs" + HOST_CFG_OPTIONS=" -platform win32-g++ -reduce-exports -ms-bitfields -tools-fully-static -prefix . " + HOST_QM_CFG_OPTIONS="CONFIG+=ms_bitfields CONFIG+=static_clibs" HOST_TAG=windows HOST_TAG_NDK=windows EXE_EXT=.exe diff --git a/Necessitas_SDK/setup_mingw_for_necessitas_build.sh b/Necessitas_SDK/setup_mingw_for_necessitas_build.sh index 0361f72..d2746b7 100644 --- a/Necessitas_SDK/setup_mingw_for_necessitas_build.sh +++ b/Necessitas_SDK/setup_mingw_for_necessitas_build.sh @@ -70,12 +70,14 @@ mkdir -p /usr/local/include mv /usr/bin/iconv.exe /usr/local/bin/ mv /usr/bin/libiconv-2.dll /usr/local/bin/ mv /usr/include/iconv.h /usr/local/include/ +mv /usr/lib/libintl.dll.a /usr/local/lib +mv /usr/lib/libintl.a /usr/local/lib # Download and compile new iconv. -wget -c http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.tar.gz -rm -rf libiconv-1.13 -tar -xvzf libiconv-1.13.tar.gz -pushd libiconv-1.13 +wget -c http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz +rm -rf libiconv-1.14 +tar -xvzf libiconv-1.14.tar.gz +pushd libiconv-1.14 CFLAGS=-O2 && ./configure --enable-static --disable-shared --with-curses=$install_dir --enable-multibyte --prefix=/usr CFLAGS=-O3 make # Without the /mingw folder, this fails, but only after copying libiconv.a to the right place. @@ -83,6 +85,15 @@ make install cp include/iconv.h /usr/include popd +wget -c http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz +rm -rf gettext-0.18.1.1 +tar -xvzf gettext-0.18.1.1.tar.gz +pushd gettext-0.18.1.1 +CFLAGS=-O2 && ./configure --enable-static --disable-shared --with-curses=$install_dir --enable-multibyte --prefix=/usr CFLAGS=-O3 +make +make install +popd + # For mingw Python. Generate libmsi.a and copy msi.h, msidefs.h, msimcntl.h, msimcsdk.h, msiquery.h, fci.h to /usr/include. wget -c http://downloads.sourceforge.net/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/sezero_20101003/mingw-w32-bin_i686-mingw_20101003_sezero.zip mkdir mingw64-w32-temp |