diff --git a/mingw32.sh b/mingw32.sh index 67744051c..25c86a879 100755 --- a/mingw32.sh +++ b/mingw32.sh @@ -14,9 +14,10 @@ unset PKG_CONFIG_PATH # Removed -static from the following export CFLAGS="-static-libgcc" export CXXFLAGS="-static-libgcc -static-libstdc++" -export CPPFLAGS="-I$HOME/.local/$target/include -O2" +export CPPFLAGS="-I$HOME/.local/$target/include" export LDFLAGS=-L$HOME/.local/$target/lib -export PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig -export PATH=$HOME/.local/$target/bin:$PATH +export PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig:/usr/$target/sys-root/mingw/lib/pkgconfig/ +export PKG_CONFIG_PATH=$HOME/.local/$target/share/pkgconfig:/usr/$target/sys-root/mingw/share/pkgconfig/ +export PATH=$HOME/.local/$target/bin:/usr/$target/sys-root/mingw/bin:/usr/$target/bin:$PATH -../configure --build=`../config.guess` --host=$target --prefix=$HOME/.local/$target "$@" +../configure --build=`../config.guess` --host=$target --prefix=$HOME/.local/$target --with-uniscribe "$@" diff --git a/mingw64.sh b/mingw64.sh index 49a143179..2b891f8dc 100755 --- a/mingw64.sh +++ b/mingw64.sh @@ -14,9 +14,10 @@ unset PKG_CONFIG_PATH # Removed -static from the following export CFLAGS="-static-libgcc" export CXXFLAGS="-static-libgcc -static-libstdc++" -export CPPFLAGS="-I$HOME/.local/$target/include -O2" +export CPPFLAGS="-I$HOME/.local/$target/include" export LDFLAGS=-L$HOME/.local/$target/lib -export PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig -export PATH=$HOME/.local/$target/bin:$PATH +export PKG_CONFIG_LIBDIR=$HOME/.local/$target/lib/pkgconfig:/usr/$target/sys-root/mingw/lib/pkgconfig/ +export PKG_CONFIG_PATH=$HOME/.local/$target/share/pkgconfig:/usr/$target/sys-root/mingw/share/pkgconfig/ +export PATH=$HOME/.local/$target/bin:/usr/$target/sys-root/mingw/bin:/usr/$target/bin:$PATH -../configure --build=`../config.guess` --host=$target --prefix=$HOME/.local/$target "$@" +../configure --build=`../config.guess` --host=$target --prefix=$HOME/.local/$target --with-uniscribe "$@"