forked from 0ad/0ad
Remove tinygettext from the build-osx-libs.sh file.
That's not needed anymore in the latest i18n branch. We build tinygettext as a static library with the game now. This was SVN commit r14952.
This commit is contained in:
parent
1b3261b8f4
commit
30d5b572a6
@ -49,7 +49,6 @@ ICU_VERSION="icu4c-52_1"
|
||||
# * NVTT
|
||||
# * FCollada
|
||||
# * MiniUPnPc
|
||||
# * tinygettext
|
||||
# --------------------------------------------------------------
|
||||
# Provided by OS X:
|
||||
# * OpenAL
|
||||
@ -767,34 +766,3 @@ else
|
||||
already_built
|
||||
fi
|
||||
popd > /dev/null
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# tinygettext - no install
|
||||
echo -e "Building tinygettext..."
|
||||
|
||||
pushd ../source/tinygettext > /dev/null
|
||||
|
||||
if [[ "$force_rebuild" = "true" ]] || [[ ! -e .already-built ]]
|
||||
then
|
||||
rm -f .already-built
|
||||
rm -f lib/*.a
|
||||
pushd src
|
||||
rm -rf build
|
||||
mkdir -p build
|
||||
mkdir -p ../lib
|
||||
|
||||
pushd build
|
||||
|
||||
# TODO: pass in various flags we need on OS X
|
||||
# Use our previously built iconv insread of OS X bundled version
|
||||
(cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS="$CPPFLAGS" -DCMAKE_BUILD_TYPE=Release -DICONV_LIBRARY="${ICONV_DIR}/lib/libiconv.a" -DICONV_INCLUDE_DIR="${ICONV_DIR}/include" -G "Unix Makefiles" && make clean && make ${JOBS}) || die "tinygettext build failed"
|
||||
popd
|
||||
|
||||
cp build/libtinygettext.a ../lib/
|
||||
|
||||
popd
|
||||
touch .already-built
|
||||
else
|
||||
already_built
|
||||
fi
|
||||
popd > /dev/null
|
||||
|
Loading…
Reference in New Issue
Block a user