Small changes to the macOS build scripts.
Patch By: smiley, Tobbi and trompetin17. Differential Revision: https://code.wildfiregames.com/D1609 This was SVN commit r21931.
This commit is contained in:
parent
dd57ba436d
commit
2b847a520a
@ -211,7 +211,7 @@ PlistBuddy -c "Add :CFBundleDevelopmentRegion string English" ${INFO_PLIST}
|
|||||||
PlistBuddy -c "Add :CFBundleInfoDictionaryVersion string 6.0" ${INFO_PLIST}
|
PlistBuddy -c "Add :CFBundleInfoDictionaryVersion string 6.0" ${INFO_PLIST}
|
||||||
PlistBuddy -c "Add :CFBundleIconFile string 0ad" ${INFO_PLIST}
|
PlistBuddy -c "Add :CFBundleIconFile string 0ad" ${INFO_PLIST}
|
||||||
PlistBuddy -c "Add :LSMinimumSystemVersion string ${BUNDLE_MIN_OSX_VERSION}" ${INFO_PLIST}
|
PlistBuddy -c "Add :LSMinimumSystemVersion string ${BUNDLE_MIN_OSX_VERSION}" ${INFO_PLIST}
|
||||||
PlistBuddy -c "Add :NSHumanReadableCopyright string Copyright © 2015 Wildfire Games" ${INFO_PLIST}
|
PlistBuddy -c "Add :NSHumanReadableCopyright string Copyright © $(date +%Y) Wildfire Games" ${INFO_PLIST}
|
||||||
|
|
||||||
# TODO: Automatically create compressed DMG with hdiutil?
|
# TODO: Automatically create compressed DMG with hdiutil?
|
||||||
# (this is a bit complicated so I do it manually for now)
|
# (this is a bit complicated so I do it manually for now)
|
||||||
|
@ -196,7 +196,7 @@ then
|
|||||||
tar -xf $LIB_ARCHIVE
|
tar -xf $LIB_ARCHIVE
|
||||||
pushd $LIB_DIRECTORY
|
pushd $LIB_DIRECTORY
|
||||||
|
|
||||||
(./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --prefix="$INSTALL_DIR" --enable-ipv6 --with-darwinssl --without-gssapi --without-libmetalink --without-librtmp --without-libssh2 --without-nss --without-polarssl --without-spnego --disable-ares --disable-ldap --disable-ldaps --without-libidn2 --with-zlib="${ZLIB_DIR}" --enable-shared=no && make ${JOBS} && make install) || die "libcurl build failed"
|
(./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --prefix="$INSTALL_DIR" --enable-ipv6 --with-darwinssl --without-gssapi --without-libmetalink --without-libpsl --without-librtmp --without-libssh2 --without-nss --without-polarssl --without-spnego --disable-ares --disable-ldap --disable-ldaps --without-libidn2 --with-zlib="${ZLIB_DIR}" --enable-shared=no && make ${JOBS} && make install) || die "libcurl build failed"
|
||||||
popd
|
popd
|
||||||
touch .already-built
|
touch .already-built
|
||||||
else
|
else
|
||||||
@ -516,7 +516,7 @@ then
|
|||||||
tar -xf $LIB_ARCHIVE
|
tar -xf $LIB_ARCHIVE
|
||||||
pushd $LIB_DIRECTORY/nspr
|
pushd $LIB_DIRECTORY/nspr
|
||||||
|
|
||||||
(CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" ./configure --prefix="$NSPR_DIR" && make ${JOBS} && make install) || die "NSPR build failed"
|
(CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" ./configure --prefix="$NSPR_DIR" --enable-64bit && make ${JOBS} && make install) || die "NSPR build failed"
|
||||||
popd
|
popd
|
||||||
# TODO: how can we not build the dylibs?
|
# TODO: how can we not build the dylibs?
|
||||||
rm -f lib/*.dylib
|
rm -f lib/*.dylib
|
||||||
|
Loading…
Reference in New Issue
Block a user