[quake3-commits] [ioquake/ioq3] a19115: Upgrades to Xcode project and Apple Silicon support

Tom Kidd noreply at github.com
Fri Oct 22 17:30:56 EDT 2021


  Branch: refs/heads/main
  Home:   https://github.com/ioquake/ioq3
  Commit: a191158375e51c141d671ca4ddcf927933a55a69
      https://github.com/ioquake/ioq3/commit/a191158375e51c141d671ca4ddcf927933a55a69
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-01-28 (Thu, 28 Jan 2021)

  Changed paths:
    M Makefile
    M code/asm/ftola.c
    M code/asm/snapvector.c
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M code/libs/macosx/libSDL2main.a
    M code/opus-1.2.1/celt/x86/celt_lpc_sse.c
    M code/opus-1.2.1/celt/x86/pitch_sse2.c
    M code/opus-1.2.1/celt/x86/pitch_sse4_1.c
    M code/opus-1.2.1/celt/x86/vq_sse2.c
    M code/opus-1.2.1/silk/x86/VAD_sse.c
    M code/qcommon/q_platform.h
    M code/qcommon/vm_x86.c
    M code/sys/sys_osx.m
    M make-macosx-app.sh
    M make-macosx.sh
    M misc/xcode/botlib.xcodeproj/project.pbxproj
    M misc/xcode/cgame.xcodeproj/project.pbxproj
    M misc/xcode/game.xcodeproj/project.pbxproj
    M misc/xcode/ioquake3-Info.plist
    M misc/xcode/ioquake3.xcodeproj/project.pbxproj
    M misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata
    M misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
    M misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme
    M misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all ioquake3.xcscheme
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/Contents.json
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512 at 2x.png
    M misc/xcode/jpeg8.xcodeproj/project.pbxproj
    M misc/xcode/opus.xcodeproj/project.pbxproj
    R misc/xcode/q3_ui.xcodeproj/project.pbxproj
    M misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj
    M misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj
    M misc/xcode/ui.xcodeproj/project.pbxproj
    M misc/xcode/xcode-readme.txt

  Log Message:
  -----------
  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


  Commit: 1fda818511f145794d82d67621511480a3a0da90
      https://github.com/ioquake/ioq3/commit/1fda818511f145794d82d67621511480a3a0da90
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-03-03 (Wed, 03 Mar 2021)

  Changed paths:
    M code/SDL2/include/SDL.h
    M code/SDL2/include/SDL_assert.h
    M code/SDL2/include/SDL_atomic.h
    M code/SDL2/include/SDL_audio.h
    M code/SDL2/include/SDL_bits.h
    M code/SDL2/include/SDL_blendmode.h
    M code/SDL2/include/SDL_config.h
    M code/SDL2/include/SDL_config.h.cmake
    M code/SDL2/include/SDL_config.h.in
    M code/SDL2/include/SDL_config_android.h
    M code/SDL2/include/SDL_config_iphoneos.h
    M code/SDL2/include/SDL_config_macosx.h
    M code/SDL2/include/SDL_config_minimal.h
    A code/SDL2/include/SDL_config_os2.h
    M code/SDL2/include/SDL_config_pandora.h
    M code/SDL2/include/SDL_config_psp.h
    M code/SDL2/include/SDL_config_windows.h
    M code/SDL2/include/SDL_config_winrt.h
    M code/SDL2/include/SDL_config_wiz.h
    M code/SDL2/include/SDL_cpuinfo.h
    M code/SDL2/include/SDL_egl.h
    M code/SDL2/include/SDL_endian.h
    M code/SDL2/include/SDL_error.h
    M code/SDL2/include/SDL_events.h
    M code/SDL2/include/SDL_gamecontroller.h
    M code/SDL2/include/SDL_haptic.h
    M code/SDL2/include/SDL_hints.h
    M code/SDL2/include/SDL_joystick.h
    M code/SDL2/include/SDL_keycode.h
    A code/SDL2/include/SDL_locale.h
    M code/SDL2/include/SDL_log.h
    M code/SDL2/include/SDL_main.h
    M code/SDL2/include/SDL_messagebox.h
    A code/SDL2/include/SDL_metal.h
    A code/SDL2/include/SDL_misc.h
    M code/SDL2/include/SDL_opengl_glext.h
    M code/SDL2/include/SDL_pixels.h
    M code/SDL2/include/SDL_rect.h
    M code/SDL2/include/SDL_render.h
    M code/SDL2/include/SDL_revision.h
    M code/SDL2/include/SDL_rwops.h
    A code/SDL2/include/SDL_sensor.h
    M code/SDL2/include/SDL_stdinc.h
    M code/SDL2/include/SDL_surface.h
    M code/SDL2/include/SDL_system.h
    M code/SDL2/include/SDL_syswm.h
    M code/SDL2/include/SDL_test_common.h
    M code/SDL2/include/SDL_test_memory.h
    M code/SDL2/include/SDL_thread.h
    M code/SDL2/include/SDL_touch.h
    M code/SDL2/include/SDL_version.h
    M code/SDL2/include/SDL_video.h
    M code/SDL2/include/SDL_vulkan.h
    M code/SDL2/include/begin_code.h
    M code/SDL2/include/close_code.h
    M code/libs/macosx/libSDL2-2.0.0.dylib

  Log Message:
  -----------
  Update SDL2 to 2.0.14


  Commit: 3d357346fc3e16d72aac6deef5d0e36cc9a52e9c
      https://github.com/ioquake/ioq3/commit/3d357346fc3e16d72aac6deef5d0e36cc9a52e9c
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-03-16 (Tue, 16 Mar 2021)

  Changed paths:
    M make-macosx-app.sh

  Log Message:
  -----------
  Added another mention of arm64 to command line help

Another one caught by MaddTheSane


  Commit: c00f7c1710d14d102313fda7c1f7aaa52e9a1617
      https://github.com/ioquake/ioq3/commit/c00f7c1710d14d102313fda7c1f7aaa52e9a1617
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-03-17 (Wed, 17 Mar 2021)

  Changed paths:
    M code/opus-1.2.1/celt/x86/celt_lpc_sse.c
    M code/opus-1.2.1/celt/x86/pitch_sse2.c
    M code/opus-1.2.1/celt/x86/pitch_sse4_1.c
    M code/opus-1.2.1/celt/x86/vq_sse2.c
    M code/opus-1.2.1/silk/x86/VAD_sse.c
    M make-macosx-app.sh
    M misc/xcode/ioquake3.xcodeproj/project.pbxproj
    M misc/xcode/opus.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Restored original opus sse files, excluded from Xcode

Also added line break in script for consistency, thanks @zturtleman


  Commit: 5fb718611661cb47bd7284665eaf904411b95c78
      https://github.com/ioquake/ioq3/commit/5fb718611661cb47bd7284665eaf904411b95c78
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-04-22 (Thu, 22 Apr 2021)

  Changed paths:
    M misc/xcode/ioquake3.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Added arm64 to the post-build symlinking step


  Commit: 25492264f85c6d4fd8759545dd66270c510c4b7a
      https://github.com/ioquake/ioq3/commit/25492264f85c6d4fd8759545dd66270c510c4b7a
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-06-26 (Sat, 26 Jun 2021)

  Changed paths:
    M code/asm/vm_x86_64.asm
    M code/game/ai_dmq3.c
    M code/renderergl1/tr_model_iqm.c
    M code/renderergl2/tr_model_iqm.c
    M code/sdl/sdl_snd.c

  Log Message:
  -----------
  Merge branch 'main' into xcode


  Commit: db8883d9e29ec3d33d51e75600f380a5cfbd63cc
      https://github.com/ioquake/ioq3/commit/db8883d9e29ec3d33d51e75600f380a5cfbd63cc
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-06-26 (Sat, 26 Jun 2021)

  Changed paths:
    M Makefile
    M make-macosx-app.sh
    A make-macosx-ub2.sh
    M make-macosx.sh

  Log Message:
  -----------
  Added shell script to compile Universal 2 binary (x86_64+arm64)


  Commit: bf5866719322bad0f4662a69d59b2ece85987a17
      https://github.com/ioquake/ioq3/commit/bf5866719322bad0f4662a69d59b2ece85987a17
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-06-26 (Sat, 26 Jun 2021)

  Changed paths:
    M code/sys/sys_osx.m

  Log Message:
  -----------
  Reverting alert style to deprecated methods

Until I can find a way to branch around this in a way Xcode 3 is cool with we'll just have to use the deprecated version


  Commit: 52a43ae1c46d3d0e776e5598ab363b8b727e84f5
      https://github.com/ioquake/ioq3/commit/52a43ae1c46d3d0e776e5598ab363b8b727e84f5
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-06 (Tue, 06 Jul 2021)

  Changed paths:
    M Makefile
    M code/asm/ftola.c
    M code/asm/snapvector.c
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M code/libs/macosx/libSDL2main.a
    M code/opus-1.2.1/celt/x86/celt_lpc_sse.c
    M code/opus-1.2.1/celt/x86/pitch_sse2.c
    M code/opus-1.2.1/celt/x86/pitch_sse4_1.c
    M code/opus-1.2.1/celt/x86/vq_sse2.c
    M code/opus-1.2.1/silk/x86/VAD_sse.c
    M code/qcommon/q_platform.h
    M code/qcommon/vm_x86.c
    M code/sys/sys_osx.m
    M make-macosx-app.sh
    M make-macosx.sh
    M misc/xcode/botlib.xcodeproj/project.pbxproj
    M misc/xcode/cgame.xcodeproj/project.pbxproj
    M misc/xcode/game.xcodeproj/project.pbxproj
    M misc/xcode/ioquake3-Info.plist
    M misc/xcode/ioquake3.xcodeproj/project.pbxproj
    M misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata
    M misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
    M misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme
    M misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all ioquake3.xcscheme
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/Contents.json
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512 at 2x.png
    M misc/xcode/jpeg8.xcodeproj/project.pbxproj
    M misc/xcode/opus.xcodeproj/project.pbxproj
    R misc/xcode/q3_ui.xcodeproj/project.pbxproj
    M misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj
    M misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj
    M misc/xcode/ui.xcodeproj/project.pbxproj
    M misc/xcode/xcode-readme.txt

  Log Message:
  -----------
  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


  Commit: 1ab25673c5950743d59c173856a2e1f3e0fc1735
      https://github.com/ioquake/ioq3/commit/1ab25673c5950743d59c173856a2e1f3e0fc1735
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-06 (Tue, 06 Jul 2021)

  Changed paths:
    M code/SDL2/include/SDL.h
    M code/SDL2/include/SDL_assert.h
    M code/SDL2/include/SDL_atomic.h
    M code/SDL2/include/SDL_audio.h
    M code/SDL2/include/SDL_bits.h
    M code/SDL2/include/SDL_blendmode.h
    M code/SDL2/include/SDL_config.h
    M code/SDL2/include/SDL_config.h.cmake
    M code/SDL2/include/SDL_config.h.in
    M code/SDL2/include/SDL_config_android.h
    M code/SDL2/include/SDL_config_iphoneos.h
    M code/SDL2/include/SDL_config_macosx.h
    M code/SDL2/include/SDL_config_minimal.h
    A code/SDL2/include/SDL_config_os2.h
    M code/SDL2/include/SDL_config_pandora.h
    M code/SDL2/include/SDL_config_psp.h
    M code/SDL2/include/SDL_config_windows.h
    M code/SDL2/include/SDL_config_winrt.h
    M code/SDL2/include/SDL_config_wiz.h
    M code/SDL2/include/SDL_cpuinfo.h
    M code/SDL2/include/SDL_egl.h
    M code/SDL2/include/SDL_endian.h
    M code/SDL2/include/SDL_error.h
    M code/SDL2/include/SDL_events.h
    M code/SDL2/include/SDL_gamecontroller.h
    M code/SDL2/include/SDL_haptic.h
    M code/SDL2/include/SDL_hints.h
    M code/SDL2/include/SDL_joystick.h
    M code/SDL2/include/SDL_keycode.h
    A code/SDL2/include/SDL_locale.h
    M code/SDL2/include/SDL_log.h
    M code/SDL2/include/SDL_main.h
    M code/SDL2/include/SDL_messagebox.h
    A code/SDL2/include/SDL_metal.h
    A code/SDL2/include/SDL_misc.h
    M code/SDL2/include/SDL_opengl_glext.h
    M code/SDL2/include/SDL_pixels.h
    M code/SDL2/include/SDL_rect.h
    M code/SDL2/include/SDL_render.h
    M code/SDL2/include/SDL_revision.h
    M code/SDL2/include/SDL_rwops.h
    A code/SDL2/include/SDL_sensor.h
    M code/SDL2/include/SDL_stdinc.h
    M code/SDL2/include/SDL_surface.h
    M code/SDL2/include/SDL_system.h
    M code/SDL2/include/SDL_syswm.h
    M code/SDL2/include/SDL_test_common.h
    M code/SDL2/include/SDL_test_memory.h
    M code/SDL2/include/SDL_thread.h
    M code/SDL2/include/SDL_touch.h
    M code/SDL2/include/SDL_version.h
    M code/SDL2/include/SDL_video.h
    M code/SDL2/include/SDL_vulkan.h
    M code/SDL2/include/begin_code.h
    M code/SDL2/include/close_code.h
    M code/libs/macosx/libSDL2-2.0.0.dylib

  Log Message:
  -----------
  Update SDL2 to 2.0.14


  Commit: f68fc6fa6f6c2250803bab08a66f183f4a86eb0d
      https://github.com/ioquake/ioq3/commit/f68fc6fa6f6c2250803bab08a66f183f4a86eb0d
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-06 (Tue, 06 Jul 2021)

  Changed paths:
    M make-macosx-app.sh

  Log Message:
  -----------
  Added another mention of arm64 to command line help

Another one caught by MaddTheSane


  Commit: eef3a40ed606be98451ad393a9f3d9de204f69d3
      https://github.com/ioquake/ioq3/commit/eef3a40ed606be98451ad393a9f3d9de204f69d3
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-06 (Tue, 06 Jul 2021)

  Changed paths:
    M code/opus-1.2.1/celt/x86/celt_lpc_sse.c
    M code/opus-1.2.1/celt/x86/pitch_sse2.c
    M code/opus-1.2.1/celt/x86/pitch_sse4_1.c
    M code/opus-1.2.1/celt/x86/vq_sse2.c
    M code/opus-1.2.1/silk/x86/VAD_sse.c
    M make-macosx-app.sh
    M misc/xcode/ioquake3.xcodeproj/project.pbxproj
    M misc/xcode/opus.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Restored original opus sse files, excluded from Xcode

Also added line break in script for consistency, thanks @zturtleman


  Commit: a1b1c7d5eb6bde89edf577053da63c4428083419
      https://github.com/ioquake/ioq3/commit/a1b1c7d5eb6bde89edf577053da63c4428083419
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-06 (Tue, 06 Jul 2021)

  Changed paths:
    M misc/xcode/ioquake3.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Added arm64 to the post-build symlinking step


  Commit: 6133df65fc3fc20b67faf57a0cdde3baf0b77fc7
      https://github.com/ioquake/ioq3/commit/6133df65fc3fc20b67faf57a0cdde3baf0b77fc7
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-06 (Tue, 06 Jul 2021)

  Changed paths:
    M Makefile
    M make-macosx-app.sh
    A make-macosx-ub2.sh
    M make-macosx.sh

  Log Message:
  -----------
  Added shell script to compile Universal 2 binary (x86_64+arm64)


  Commit: 46a793b5b39c35c09b245b9b0621985f1345e148
      https://github.com/ioquake/ioq3/commit/46a793b5b39c35c09b245b9b0621985f1345e148
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-06 (Tue, 06 Jul 2021)

  Changed paths:
    M code/sys/sys_osx.m

  Log Message:
  -----------
  Reverting alert style to deprecated methods

Until I can find a way to branch around this in a way Xcode 3 is cool with we'll just have to use the deprecated version


  Commit: 2e66ba073787d109edd578cac5d9db803ee14949
      https://github.com/ioquake/ioq3/commit/2e66ba073787d109edd578cac5d9db803ee14949
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-06 (Tue, 06 Jul 2021)

  Changed paths:

  Log Message:
  -----------
  Merge branch 'xcode' of https://github.com/tomkidd/ioq3 into xcode


  Commit: b1ffdd1be09d26dca5d918d2f22fafb3f8058f42
      https://github.com/ioquake/ioq3/commit/b1ffdd1be09d26dca5d918d2f22fafb3f8058f42
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-10 (Sat, 10 Jul 2021)

  Changed paths:
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M make-macosx-app.sh

  Log Message:
  -----------
  Removed signature from SDL dylib, enabled dark mode on macOS.


  Commit: 4143697bd443838b9f8e70bde83a9adc895b516f
      https://github.com/ioquake/ioq3/commit/4143697bd443838b9f8e70bde83a9adc895b516f
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-14 (Wed, 14 Jul 2021)

  Changed paths:
    M make-macosx-app.sh

  Log Message:
  -----------
  spaces > tabs


  Commit: 96db7a064f0ca19c90c8460df6ebad5c953e1663
      https://github.com/ioquake/ioq3/commit/96db7a064f0ca19c90c8460df6ebad5c953e1663
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-07-19 (Mon, 19 Jul 2021)

  Changed paths:
    M code/libs/macosx/libSDL2-2.0.0.dylib

  Log Message:
  -----------
  Ad-hoc signed libSDL2-2.0.0.dylib


  Commit: 5c5a599929ea50d580791a0082a98017dae9b8f7
      https://github.com/ioquake/ioq3/commit/5c5a599929ea50d580791a0082a98017dae9b8f7
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-09-18 (Sat, 18 Sep 2021)

  Changed paths:
    M .gitignore
    M code/SDL2/include/SDL_assert.h
    M code/SDL2/include/SDL_audio.h
    M code/SDL2/include/SDL_bits.h
    M code/SDL2/include/SDL_config.h.cmake
    M code/SDL2/include/SDL_config.h.in
    M code/SDL2/include/SDL_config_android.h
    M code/SDL2/include/SDL_config_iphoneos.h
    M code/SDL2/include/SDL_config_macosx.h
    M code/SDL2/include/SDL_config_os2.h
    M code/SDL2/include/SDL_config_pandora.h
    M code/SDL2/include/SDL_config_windows.h
    M code/SDL2/include/SDL_config_winrt.h
    M code/SDL2/include/SDL_config_wiz.h
    M code/SDL2/include/SDL_cpuinfo.h
    M code/SDL2/include/SDL_endian.h
    M code/SDL2/include/SDL_events.h
    M code/SDL2/include/SDL_gamecontroller.h
    M code/SDL2/include/SDL_hints.h
    M code/SDL2/include/SDL_joystick.h
    M code/SDL2/include/SDL_keycode.h
    M code/SDL2/include/SDL_mutex.h
    M code/SDL2/include/SDL_platform.h
    M code/SDL2/include/SDL_render.h
    M code/SDL2/include/SDL_revision.h
    M code/SDL2/include/SDL_rwops.h
    M code/SDL2/include/SDL_stdinc.h
    M code/SDL2/include/SDL_surface.h
    M code/SDL2/include/SDL_system.h
    M code/SDL2/include/SDL_syswm.h
    M code/SDL2/include/SDL_test_common.h
    M code/SDL2/include/SDL_thread.h
    M code/SDL2/include/SDL_version.h
    M code/SDL2/include/SDL_video.h
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M code/libs/macosx/libSDL2main.a
    M make-macosx-ub2.sh
    M misc/xcode/ioquake3.xcodeproj/project.pbxproj
    A misc/xcode/ioquake3/ioquake3.entitlements

  Log Message:
  -----------
  UB2 now signs and notarizes, upgraded to SDL 2.0.16

Also works on Apple Silicon. Specific signing values are in a non-committed file, and the ub2 script only notarizes if a "notarize" flag is passed in on the command line.

NOTE: the SDL dylib currently only has x86_64 and arm64, will need extra work to graft those back in and keep the Notary service happy.


  Commit: 2dc9f006df7054904a053cb7fcbcdea7fcddd3a5
      https://github.com/ioquake/ioq3/commit/2dc9f006df7054904a053cb7fcbcdea7fcddd3a5
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-09-25 (Sat, 25 Sep 2021)

  Changed paths:
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M code/libs/macosx/libSDL2main.a

  Log Message:
  -----------
  Architectures in libSDL2 restored for ppc and i386

The ppc arch is the 2.0.1 that was there originaly.
The i386 arch is 2.0.16, now compiled with an SDK later than 10.9 so the Notarization process is cool with it.
So now all post-ppc SDL libraries are 2.0.16.


  Commit: 2fef57fffab884f2c5af310bfcb20d3da85c3ccf
      https://github.com/ioquake/ioq3/commit/2fef57fffab884f2c5af310bfcb20d3da85c3ccf
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-10-02 (Sat, 02 Oct 2021)

  Changed paths:
    M .github/workflows/build.yml
    M code/qcommon/files.c
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/main' into xcode


  Commit: 3d06d075164a38a68630e91badb119f5e9ffedda
      https://github.com/ioquake/ioq3/commit/3d06d075164a38a68630e91badb119f5e9ffedda
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-10-22 (Fri, 22 Oct 2021)

  Changed paths:
    M .gitignore
    M code/sys/sys_osx.m
    M make-macosx-ub2.sh
    M make-macosx.sh
    M misc/xcode/xcode-readme.txt

  Log Message:
  -----------
  Addressed PR suggestions


  Commit: 0b8670411d2c75eb5137907166ae670a70a10771
      https://github.com/ioquake/ioq3/commit/0b8670411d2c75eb5137907166ae670a70a10771
  Author: Tom Kidd <tomkidd at gmail.com>
  Date:   2021-10-22 (Fri, 22 Oct 2021)

  Changed paths:
    M .gitignore
    M Makefile
    M code/SDL2/include/SDL.h
    M code/SDL2/include/SDL_assert.h
    M code/SDL2/include/SDL_atomic.h
    M code/SDL2/include/SDL_audio.h
    M code/SDL2/include/SDL_bits.h
    M code/SDL2/include/SDL_blendmode.h
    M code/SDL2/include/SDL_config.h
    M code/SDL2/include/SDL_config.h.cmake
    M code/SDL2/include/SDL_config.h.in
    M code/SDL2/include/SDL_config_android.h
    M code/SDL2/include/SDL_config_iphoneos.h
    M code/SDL2/include/SDL_config_macosx.h
    M code/SDL2/include/SDL_config_minimal.h
    A code/SDL2/include/SDL_config_os2.h
    M code/SDL2/include/SDL_config_pandora.h
    M code/SDL2/include/SDL_config_psp.h
    M code/SDL2/include/SDL_config_windows.h
    M code/SDL2/include/SDL_config_winrt.h
    M code/SDL2/include/SDL_config_wiz.h
    M code/SDL2/include/SDL_cpuinfo.h
    M code/SDL2/include/SDL_egl.h
    M code/SDL2/include/SDL_endian.h
    M code/SDL2/include/SDL_error.h
    M code/SDL2/include/SDL_events.h
    M code/SDL2/include/SDL_gamecontroller.h
    M code/SDL2/include/SDL_haptic.h
    M code/SDL2/include/SDL_hints.h
    M code/SDL2/include/SDL_joystick.h
    M code/SDL2/include/SDL_keycode.h
    A code/SDL2/include/SDL_locale.h
    M code/SDL2/include/SDL_log.h
    M code/SDL2/include/SDL_main.h
    M code/SDL2/include/SDL_messagebox.h
    A code/SDL2/include/SDL_metal.h
    A code/SDL2/include/SDL_misc.h
    M code/SDL2/include/SDL_mutex.h
    M code/SDL2/include/SDL_opengl_glext.h
    M code/SDL2/include/SDL_pixels.h
    M code/SDL2/include/SDL_platform.h
    M code/SDL2/include/SDL_rect.h
    M code/SDL2/include/SDL_render.h
    M code/SDL2/include/SDL_revision.h
    M code/SDL2/include/SDL_rwops.h
    A code/SDL2/include/SDL_sensor.h
    M code/SDL2/include/SDL_stdinc.h
    M code/SDL2/include/SDL_surface.h
    M code/SDL2/include/SDL_system.h
    M code/SDL2/include/SDL_syswm.h
    M code/SDL2/include/SDL_test_common.h
    M code/SDL2/include/SDL_test_memory.h
    M code/SDL2/include/SDL_thread.h
    M code/SDL2/include/SDL_touch.h
    M code/SDL2/include/SDL_version.h
    M code/SDL2/include/SDL_video.h
    M code/SDL2/include/SDL_vulkan.h
    M code/SDL2/include/begin_code.h
    M code/SDL2/include/close_code.h
    M code/asm/ftola.c
    M code/asm/snapvector.c
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M code/libs/macosx/libSDL2main.a
    M code/qcommon/q_platform.h
    M code/qcommon/vm_x86.c
    M make-macosx-app.sh
    A make-macosx-ub2.sh
    M make-macosx.sh
    M misc/xcode/botlib.xcodeproj/project.pbxproj
    M misc/xcode/cgame.xcodeproj/project.pbxproj
    M misc/xcode/game.xcodeproj/project.pbxproj
    M misc/xcode/ioquake3-Info.plist
    M misc/xcode/ioquake3.xcodeproj/project.pbxproj
    M misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata
    M misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
    M misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme
    M misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all ioquake3.xcscheme
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/Contents.json
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32 at 2x.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512.png
    A misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512 at 2x.png
    A misc/xcode/ioquake3/ioquake3.entitlements
    M misc/xcode/jpeg8.xcodeproj/project.pbxproj
    M misc/xcode/opus.xcodeproj/project.pbxproj
    R misc/xcode/q3_ui.xcodeproj/project.pbxproj
    M misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj
    M misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj
    M misc/xcode/ui.xcodeproj/project.pbxproj
    M misc/xcode/xcode-readme.txt

  Log Message:
  -----------
  Merge pull request #481 from tomkidd/xcode

Upgrades to Xcode project and Apple Silicon support


Compare: https://github.com/ioquake/ioq3/compare/26780805c80c...0b8670411d2c


More information about the quake3-commits mailing list