Commit Graph

25 Commits

Author SHA1 Message Date
Zack Middleton 847dfe1211 Fix running make-macosx{,-ub2}.sh on Linux
osxcross doesn't support ppc so it's not possible to compile Universal
Binary 1.
2023-02-19 13:08:36 -05:00
Zack Middleton 02a12f2dec Update to SDL 2.24.0 and add separate macOS UB2 dylib
Update mingw and macOS SDL libraries to 2.24.0. (MSVC .lib files and
Xcode project haven't been updated.)

There is now a separate SDL dylib for macOS Universal Binary 1 and 2
because SDL 2.24.0 dropped support for macOS 10.6 (which is last to
support x86). Documentation says SDL 2.24.0 also dropped macOS 10.7
and 10.8 too. So UB2 is now 10.9 or later while 10.5 to 10.8 live in
UB1.

Compiled using osxcross with macOS 11.3 SDK. Ran "strip -x" on Windows
and macOS libraries. Ad-hoc signed dylib using PyOxidizer rcodesign to
fix digest checksums after strip.
2023-02-19 13:08:36 -05:00
Tom Kidd 3d06d07516 Addressed PR suggestions 2021-10-22 10:00:20 -05:00
Tom Kidd 6133df65fc Added shell script to compile Universal 2 binary (x86_64+arm64) 2021-07-06 17:30:27 -05:00
Tom Kidd 52a43ae1c4 Upgrades to Xcode project and Apple Silicon support
- Reorganized Xcode project
- Added missionpack support to Xcode project
- Incorporated changes from MaddTheSane for Apple Silicon support https://github.com/maddthesane/ioq3
- Built SDL 2.0.14 for Apple Siicon, added to existing SDL dylib
- Built SDLMain for Apple Silicon, added to existing libSDL2main.a
2021-07-06 17:30:27 -05:00
Zack Middleton 9a0ee67e04 Make macOS Universal Bundle target 10.6 for x86 and x86_64
SDL 2.0.5 dropped support for macOS 10.5 so target 10.6 instead. The
PPC build uses SDL 2.0.1 so it still targets 10.5. macOS 10.5 (x86,
x86_64) should automatically run the PPC build using Rosetta.

Revert MAN-AT-ARMS' change to SDL 2.0.8 SDL_platform.h that allowed
targeting macOS 10.5 for the sake of PPC. It also incorrectly allowed
x86 and x86_64 to target 10.5 as well. (Also macOS PPC uses separate
headers now.)
2018-04-26 11:21:36 -05:00
Edward Betts fe42b8653d Correct spelling mistakes. 2017-11-22 01:40:20 -06:00
Zack Middleton c04cf19b77 Fix minimum macOS version not being set in AppBundle Info.plist
make-macosx-app.sh reads MACOSX_DEPLOYMENT_TARGET variable but
it wasn't ever set.
2017-09-14 16:51:47 -05:00
Zack Middleton 0a599268bb Fix specifying minimum mac os version in make-macosx.sh
Use newer method of telling Makefile instead of specifying CFLAGS
and LDFLAGS which results in using both Makefile's and scripts flags.
2017-09-14 16:48:09 -05:00
Zack Middleton 6d5041a960 Remove 5 unused variables from make-macosx scripts 2013-08-04 12:06:38 -05:00
jeremiah sypult b7f5971ab8 Another pass at the Mac OS X make scripts.
Ironed out issues with generating an application bundle with universal
binaries on supported systems. Fall back to bundling a single
architecture when support for universal binary generation is not
available. Tested on Mac OS X 10.5.8 (and 10.5 SDK).
2013-07-18 10:39:08 -05:00
jeremiah sypult 260233d4ec bug 5986 - Configure jenkins to spit out mac .app
https://bugzilla.icculus.org/show_bug.cgi?id=5986
Created make-macosx-app.sh to handle manually creating an app bundle from other scripts.
Updated make-macosx.sh to create bundle with make-macosx-app.sh (TODO: make-macosx-ub.sh support).
Updated Makefile to create bundle with make-macosx-app.sh and zip up the resulting ioquake3.app if ARCHIVE is defined.
2013-07-18 00:11:10 -05:00
Tim Angus 8d70929d12 Ditch 'historical compatibility' and use 'logic' instead 2013-03-22 11:33:27 +00:00
Zachary Slater 2819712bf0 Fixed build for mac (s/rend2/opengl2/) 2013-02-15 15:57:32 -08:00
Tim Angus 517c65d85e Fix some SMP bits I missed 2013-01-26 21:40:45 +00:00
Ryan C. Gordon 16952ee08e Fixed a typo in a comment. 2013-01-06 19:19:58 -05:00
Richard Allen ba54979c0d Fixed a small bug in my new version of this script. 2013-01-06 22:18:48 +00:00
Zachary Slater 2d02694749 Lets list all the valid options. 2013-01-01 22:40:08 +00:00
Richard Allen b54c331d7d Have make-macosx.sh require the user to specify which architecture she/he wants to build for and suggest building UB's if the user is unaware of what architectures are 2013-01-01 22:39:05 +00:00
Richard Allen 6a7a67a497 More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice. 2012-12-31 01:32:15 +00:00
Richard Allen 1c8fa31c0d Changed the MacOS-X build system to make UB's containing i386 and x86_64 arches and made make-macosx.sh not build UB's but only standard binaries 2012-12-20 00:15:17 +00:00
Zack Middleton 8e28ff954c - Include Rend2 renderer in MacOSX bundle
- Include OpenGL1 and Rend2 renderers in MacOSX UB
2012-12-09 00:25:47 +00:00
Zachary Slater 3221ed291f specifying gcc to see if that fixes the mac build... 2012-04-14 05:14:39 +00:00
Zachary Slater 011fcabb22 Fixed that, still do not run this. I'm not sure why but the video mode handling doesn't work today in Mac OS X 10.7 and recovering is difficult. 2011-11-24 23:19:04 +00:00
Zachary Slater 508f54854c I made an awful variant of the old make script, it removes everything universal. Just to get a quick .app build again.
Don't use this for anything.
2011-11-20 08:59:21 +00:00