Always build a universal binary on OS X. This requires wxWidgets >= 2.9.

Enable -Werror (OS X only so far - please test and enable on other platforms).
Clean up library handling a bit.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5504 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-05-26 21:31:50 +00:00
parent 5f9cdad7cd
commit 774035d715
3 changed files with 31 additions and 64 deletions

View File

@ -30,7 +30,7 @@ fix_shared_object_depends() {
done
done
# wxw shoves all the paths into one stringso the looping is really just for dealing with wxw crap
# wxw shoves all the paths into one string, so the looping is really just for dealing with wxw crap
orig_paths=(`otool -L $temp_dir/Dolphin.app/Contents/MacOS/Dolphin | grep ${search_string} | awk '{print $1}'`)
for orig_path in ${orig_paths[@]}; do
@ -51,6 +51,7 @@ cp -r Darwin-i386/Dolphin.app $temp_dir
fix_shared_object_depends libwx
fix_shared_object_depends libSDL
fix_shared_object_depends libGLEW
fix_shared_object_depends libz
mkdir -p $temp_dir/Dolphin.app/Contents/Library/Frameworks/Cg.framework
cp /Library/Frameworks/Cg.framework/Cg $temp_dir/Dolphin.app/Contents/Library/Frameworks/Cg.framework/Cg
@ -59,4 +60,4 @@ find $temp_dir -name .svn -exec rm -fr {} \; 2>/dev/null
rm $temp_dir.dmg 2>/dev/null
echo "Creating dmg"
hdiutil create -srcfolder $temp_dir -format UDBZ $temp_dir.dmg
rm -rf $temp_dir
rm -rf $temp_dir