mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-01 07:46:11 +00:00
BUILD: Use xcode-select to determine the path to the Xcode tools on OS X
We hardcoded the path as /Developer/Tools, but that path changed with more recent versions of Xcode. There is actually a command line tool to get this path, so use that. But also add an undocumented configure option to allow specifying the path manually.
This commit is contained in:
parent
716dcbc1d8
commit
8f0f9daeb7
17
configure
vendored
17
configure
vendored
@ -182,6 +182,7 @@ _stagingpath="staging"
|
|||||||
_win32path="c:/scummvm"
|
_win32path="c:/scummvm"
|
||||||
_amigaospath="Games:ScummVM"
|
_amigaospath="Games:ScummVM"
|
||||||
_staticlibpath=
|
_staticlibpath=
|
||||||
|
_xcodetoolspath=
|
||||||
_sdlconfig=sdl-config
|
_sdlconfig=sdl-config
|
||||||
_freetypeconfig=freetype-config
|
_freetypeconfig=freetype-config
|
||||||
_sdlpath="$PATH"
|
_sdlpath="$PATH"
|
||||||
@ -1235,6 +1236,9 @@ for ac_option in $@; do
|
|||||||
--with-staticlib-prefix=*)
|
--with-staticlib-prefix=*)
|
||||||
_staticlibpath=`echo $ac_option | cut -d '=' -f 2`
|
_staticlibpath=`echo $ac_option | cut -d '=' -f 2`
|
||||||
;;
|
;;
|
||||||
|
--with-xcodetools-path=*)
|
||||||
|
_xcodetoolspath=`echo $ac_option | cut -d '=' -f 2`
|
||||||
|
;;
|
||||||
--host=*)
|
--host=*)
|
||||||
_host=`echo $ac_option | cut -d '=' -f 2`
|
_host=`echo $ac_option | cut -d '=' -f 2`
|
||||||
;;
|
;;
|
||||||
@ -2350,6 +2354,18 @@ case $_host_os in
|
|||||||
echo "Could not determine prefix for static libraries"
|
echo "Could not determine prefix for static libraries"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# If _xcodetoolspath is not set yet try first /Developers/Tools and then
|
||||||
|
# /Applications/Xcode.app/Contents/Developer/Tools
|
||||||
|
if test -z "$_xcodetoolspath"; then
|
||||||
|
_xcodetoolspath=`xcode-select -print-path`/Tools
|
||||||
|
if test -d "$_xcodetoolspath"; then
|
||||||
|
echo "Set xcodetools-path to ${_xcodetoolspath}"
|
||||||
|
else
|
||||||
|
_xcodetoolspath=
|
||||||
|
echo "Could not determine path for Xcode Tools"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
dreamcast)
|
dreamcast)
|
||||||
append_var DEFINES "-D__DC__"
|
append_var DEFINES "-D__DC__"
|
||||||
@ -4732,6 +4748,7 @@ STAGINGPATH=$_stagingpath
|
|||||||
WIN32PATH=$_win32path
|
WIN32PATH=$_win32path
|
||||||
AMIGAOSPATH=$_amigaospath
|
AMIGAOSPATH=$_amigaospath
|
||||||
STATICLIBPATH=$_staticlibpath
|
STATICLIBPATH=$_staticlibpath
|
||||||
|
XCODETOOLSPATH=$_xcodetoolspath
|
||||||
SDLCONFIG=$_sdlconfig
|
SDLCONFIG=$_sdlconfig
|
||||||
|
|
||||||
ABI := $ABI
|
ABI := $ABI
|
||||||
|
8
ports.mk
8
ports.mk
@ -341,7 +341,7 @@ osxsnap: bundle
|
|||||||
mkdir ScummVM-snapshot/doc/se
|
mkdir ScummVM-snapshot/doc/se
|
||||||
cp $(srcdir)/doc/se/LasMig ./ScummVM-snapshot/doc/se/LasMig
|
cp $(srcdir)/doc/se/LasMig ./ScummVM-snapshot/doc/se/LasMig
|
||||||
cp $(srcdir)/doc/se/Snabbstart ./ScummVM-snapshot/doc/se/Snabbstart
|
cp $(srcdir)/doc/se/Snabbstart ./ScummVM-snapshot/doc/se/Snabbstart
|
||||||
/Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
|
$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
|
||||||
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/cz/*
|
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/cz/*
|
||||||
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/da/*
|
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/da/*
|
||||||
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/de/*
|
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/de/*
|
||||||
@ -350,11 +350,11 @@ osxsnap: bundle
|
|||||||
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/it/*
|
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/it/*
|
||||||
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/no-nb/*
|
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/no-nb/*
|
||||||
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/se/*
|
xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/se/*
|
||||||
/Developer/Tools/CpMac -r $(bundle_name) ./ScummVM-snapshot/
|
$(XCODETOOLSPATH)/CpMac -r $(bundle_name) ./ScummVM-snapshot/
|
||||||
cp $(srcdir)/dists/macosx/DS_Store ./ScummVM-snapshot/.DS_Store
|
cp $(srcdir)/dists/macosx/DS_Store ./ScummVM-snapshot/.DS_Store
|
||||||
cp $(srcdir)/dists/macosx/background.jpg ./ScummVM-snapshot/background.jpg
|
cp $(srcdir)/dists/macosx/background.jpg ./ScummVM-snapshot/background.jpg
|
||||||
/Developer/Tools/SetFile -a V ./ScummVM-snapshot/.DS_Store
|
$(XCODETOOLSPATH)/SetFile -a V ./ScummVM-snapshot/.DS_Store
|
||||||
/Developer/Tools/SetFile -a V ./ScummVM-snapshot/background.jpg
|
$(XCODETOOLSPATH)/SetFile -a V ./ScummVM-snapshot/background.jpg
|
||||||
hdiutil create -ov -format UDZO -imagekey zlib-level=9 -fs HFS+ \
|
hdiutil create -ov -format UDZO -imagekey zlib-level=9 -fs HFS+ \
|
||||||
-srcfolder ScummVM-snapshot \
|
-srcfolder ScummVM-snapshot \
|
||||||
-volname "ScummVM" \
|
-volname "ScummVM" \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user