Code

Add Support for macOS#441

Code

Merged

louist103 merged 81 commits intoHarbourMasters:developHarbourMasters/Shipwright:developfrom dcvz:zelda64_macdcvz/Shipwright:zelda64_macCopy head branch name to clipboardJun 22, 2022

+441-69

Commits

Commits on May 19, 2022

• Fixed soh filters

  

  KiritoDv

  authored and

  crowell

  committed
  acb57f1

  Copy full SHA for acb57f1

• add more makefile changes

  crowell

  committed
  f3496a0

  Copy full SHA for f3496a0

• almost ready

  crowell

  committed
  f5af934

  Copy full SHA for f5af934

• more updates

  crowell

  committed
  97ba6a4

  Copy full SHA for 97ba6a4

• update

  crowell

  committed
  91d89f7

  Copy full SHA for 91d89f7

• update

  crowell

  committed
  e495961

  Copy full SHA for e495961

Commits on May 30, 2022

• Update Makefiles to handle both platforms

  dcvz

  committed
  3bf32d1

  Copy full SHA for 3bf32d1

• Allow for overriding the CXX and CC executables

  dcvz

  committed
  44eb8d4

  Copy full SHA for 44eb8d4

• Restore original structure while supporting custom CXX flags

  dcvz

  committed
  f3a66ea

  Copy full SHA for f3a66ea

• Remove some platform specific libs

  dcvz

  committed
  686e5b3

  Copy full SHA for 686e5b3

• Dynamic target name

  dcvz

  committed
  acebb20

  Copy full SHA for acebb20

• Make X11 paths package-agnostic

  dcvz

  committed
  780ed6d

  Copy full SHA for 780ed6d

• Remove changes to gfx_opengl.cpp

  dcvz

  committed
  401a344

  Copy full SHA for 401a344

• Merge pull request #1 from crowell/chore/update-make

  Show description for a87a5b9
  crowell

  authored
  a87a5b9

  Copy full SHA for a87a5b9

• Use OpenGL2 on MacOS instead of OpenGL3

  crowell

  committed
  91da461

  Copy full SHA for 91da461

• make it actually render something

  crowell

  committed
  9e082fd

  Copy full SHA for 9e082fd

• render at least the first texture, still need to figure out the second

  Show description for ba882b2
  crowell

  committed
  ba882b2

  Copy full SHA for ba882b2

• Let’s use OpenGL 3 again

  dcvz

  committed
  8ab2a0d

  Copy full SHA for 8ab2a0d

• maybe this works to get the right texture? link's eyes still look off a bit

  crowell

  committed
  dbacf38

  Copy full SHA for dbacf38

• did this work?

  crowell

  committed
  f7b7de7

  Copy full SHA for f7b7de7

• set the platform to macos

  crowell

  committed
  4177721

  Copy full SHA for 4177721

• actual numbers are right, but logic is ugly XXX/TODO, i know

  crowell

  committed
  508b5c7

  Copy full SHA for 508b5c7

• add zlib to ldflags for ZAPDUtils

  crowell

  committed
  447b28c

  Copy full SHA for 447b28c

• A bit of cleanup

  dcvz

  committed
  831cd63

  Copy full SHA for 831cd63

• Revert unneeded changes

  dcvz

  committed
  1232e00

  Copy full SHA for 1232e00

• Remove GL_CHECK

  dcvz

  committed
  8b58050

  Copy full SHA for 8b58050

• Merge remote-tracking branch 'upstream/zelda64' into zelda64_mac

  dcvz

  committed
  0e0577d

  Copy full SHA for 0e0577d

• Fix issues with z64 branch

  dcvz

  committed
  094c2b0

  Copy full SHA for 094c2b0

Commits on Jun 1, 2022

• Merge branch 'zelda64' into zelda64_mac

  Show description for 01d5e06
  dcvz

  committed
  01d5e06

  Copy full SHA for 01d5e06

• use an std::map instead of a giant array

  crowell

  committed
  c17e3da

  Copy full SHA for c17e3da

Commits on Jun 2, 2022

• three point filter fix (#2)

  dcvz

  authored
  d533319

  Copy full SHA for d533319

• Merge branch 'zelda64' into zelda64_mac

  Show description for d066fbf
  dcvz

  committed
  d066fbf

  Copy full SHA for d066fbf

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  54f1bbf

  Copy full SHA for 54f1bbf

• Fix mac compilation

  dcvz

  committed
  de4f2fb

  Copy full SHA for de4f2fb

Commits on Jun 3, 2022

• fix audio for 64 bit

  crowell

  committed
  33bb174

  Copy full SHA for 33bb174

• revert audio heap size, keep bigger pools

  crowell

  committed
  b80d1f1

  Copy full SHA for b80d1f1

• Add more Apple specific checks to our modifications

  dcvz

  committed
  5205363

  Copy full SHA for 5205363

• Add building instructions for macOS

  dcvz

  committed
  8fd50af

  Copy full SHA for 8fd50af

• Remove unecessary step from building instructions

  dcvz

  committed
  09025a3

  Copy full SHA for 09025a3

Commits on Jun 4, 2022

• Add missing SDL2 & GLEW to Linux LDLIBS

  dcvz

  committed
  9c6f10f

  Copy full SHA for 9c6f10f

• Update BUILDING.md

  Show description for 8f635c2
  

  dcvz

  and

  BountyChocolate123456

  authored
  8f635c2

  Copy full SHA for 8f635c2

• Update soh/.gitignore to include other arch binaries

  Show description for 5fbed02
  

  dcvz

  and

  BountyChocolate123456

  authored
  5fbed02

  Copy full SHA for 5fbed02

• Use right platform name for debugging window

  Show description for d22c6b1
  

  dcvz

  and

  BountyChocolate123456

  authored
  d22c6b1

  Copy full SHA for d22c6b1

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  941c09b

  Copy full SHA for 941c09b

Commits on Jun 5, 2022

• Merge branch 'zelda64' into zelda64_mac

  Show description for af6fc6f
  dcvz

  committed
  af6fc6f

  Copy full SHA for af6fc6f

• Fix stormlib on macos (arm64)

  dcvz

  committed
  0c8cc18

  Copy full SHA for 0c8cc18

• Simplify some of the ifdef checks

  dcvz

  committed
  b7e7032

  Copy full SHA for b7e7032

• Revert an older no longer necessary fix

  dcvz

  committed
  db59329

  Copy full SHA for db59329

• Remove remaining unecessary deviations

  dcvz

  committed
  9b9ec2b

  Copy full SHA for 9b9ec2b

• Update building instructions after StormLib changes

  dcvz

  committed
  67a8ca0

  Copy full SHA for 67a8ca0

Commits on Jun 9, 2022

• Feature: Use OpenGL 4.1 (#1)

  dcvz

  authored
  361a2be

  Copy full SHA for 361a2be

• Further tweak the BUILDING

  dcvz

  committed
  86975fe

  Copy full SHA for 86975fe

• Tidy up

  dcvz

  committed
  554e85d

  Copy full SHA for 554e85d

• reword -j message

  dcvz

  committed
  5302776

  Copy full SHA for 5302776

Commits on Jun 13, 2022

• Merge branch 'zelda64' into zelda64_mac

  Show description for 15dbb06
  dcvz

  committed
  15dbb06

  Copy full SHA for 15dbb06

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  fb7ce12

  Copy full SHA for fb7ce12

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  2bf7b3e

  Copy full SHA for 2bf7b3e

• Add Jenkins CI Support (#2)

  dcvz

  authored
  5bb2605

  Copy full SHA for 5bb2605

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  9694177

  Copy full SHA for 9694177

Commits on Jun 14, 2022

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  a109535

  Copy full SHA for a109535

Commits on Jun 15, 2022

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  784bb74

  Copy full SHA for 784bb74

• Fix type issues

  dcvz

  committed
  cd89807

  Copy full SHA for cd89807

Commits on Jun 16, 2022

• add target <appbundle> and <filledappbundle>

  Show description for 7517785
  crowell

  committed
  7517785

  Copy full SHA for 7517785

• pull gcc's rpath from otool output

  crowell

  committed
  5205c25

  Copy full SHA for 5205c25

• move make target to the end so it's not default

  crowell

  committed
  dd47590

  Copy full SHA for dd47590

• Add Jenkins and make exe in par with other platforms

  dcvz

  committed
  1be6ae7

  Copy full SHA for 1be6ae7

• Actually save build artefacts

  dcvz

  committed
  3900b6b

  Copy full SHA for 3900b6b

• Fix artefact path

  dcvz

  committed
  2260137

  Copy full SHA for 2260137

• Remove x11 mentions and linking (not used)

  dcvz

  committed
  29a7820

  Copy full SHA for 29a7820

• Update building instructions for generating app

  dcvz

  committed
  f2bd020

  Copy full SHA for f2bd020

Commits on Jun 17, 2022

• use appsupport directory

  crowell

  committed
  253db5a

  Copy full SHA for 253db5a

• Add new app icon

  dcvz

  committed
  e1cd6c9

  Copy full SHA for e1cd6c9

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  caf1c25

  Copy full SHA for caf1c25

Commits on Jun 18, 2022

• Update target to match macOS types

  dcvz

  committed
  888c074

  Copy full SHA for 888c074

• Update more audio types

  dcvz

  committed
  fba7a89

  Copy full SHA for fba7a89

Commits on Jun 19, 2022

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  7e149d6

  Copy full SHA for 7e149d6

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  committed
  a7c2d2c

  Copy full SHA for a7c2d2c

Commits on Jun 20, 2022

• fix null deref in Audio_PlayFanfare

  crowell

  committed
  5001da6

  Copy full SHA for 5001da6

Commits on Jun 22, 2022

• Merge branch 'zelda64' into zelda64_mac

  dcvz

  authored
  7e20272

  Copy full SHA for 7e20272

• Remove old import from z64

  dcvz

  committed
  3693992

  Copy full SHA for 3693992

• address final nit with apple ifdefs

  crowell

  committed
  a514d23

  Copy full SHA for a514d23