Commit Graph

13 Commits

Author SHA1 Message Date
sholdee bd22074ec8 Move macOS to parallel stage 2022-06-22 18:22:59 -04:00
David Chavez e42b18cf71
Add Support for macOS (#441)
* Fixed soh filters

* add more makefile changes

* almost ready

* more updates

* update

* update

* Update Makefiles to handle both platforms

* Allow for overriding the CXX and CC executables

* Restore original structure while supporting custom CXX flags

* Remove some platform specific libs

* Dynamic target name

* Make X11 paths package-agnostic

* Remove changes to `gfx_opengl.cpp`

* Use OpenGL2 on MacOS instead of OpenGL3

* make it actually render something

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

* Let’s use OpenGL 3 again

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

* did this work?

* set the platform to macos

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

* add zlib to ldflags for ZAPDUtils

* A bit of cleanup

* Revert unneeded changes

* Remove GL_CHECK

* Fix issues with z64 branch

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

* three point filter fix (#2)

* Fix mac compilation

* fix audio for 64 bit

* revert audio heap size, keep bigger pools

* Add more Apple specific checks to our modifications

* Add building instructions for macOS

* Remove unecessary step from building instructions

* Add missing SDL2 & GLEW to Linux LDLIBS

* Update BUILDING.md

Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>

* Update soh/.gitignore to include other arch binaries

Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>

* Use right platform name for debugging window

Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>

* Fix stormlib on macos (arm64)

* Simplify some of the ifdef checks

* Revert an older no longer necessary fix

* Remove remaining unecessary deviations

* Update building instructions after StormLib changes

* Feature: Use OpenGL 4.1 (#1)

* Further tweak the BUILDING

* Tidy up

* reword -j message

* Add Jenkins CI Support (#2)

* Fix type issues

* add target <appbundle> and <filledappbundle>

add makefile targets to create an .app
`filledappbundle` creates the target with the .otr included

this should perhaps be moved to Application Support though

* pull gcc's rpath from otool output

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

* Add Jenkins and make exe in par with other platforms

* Actually save build artefacts

* Fix artefact path

* Remove x11 mentions and linking (not used)

* Update building instructions for generating app

* use appsupport directory

* Add new app icon

* Update target to match macOS types

* Update more audio types

* fix null deref in Audio_PlayFanfare

* Remove old import from z64

* address final nit with apple ifdefs

Co-authored-by: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Co-authored-by: Jeffrey Crowell <github@crowell.biz>
Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>
2022-06-22 14:59:21 -04:00
David Chavez f8e3dcd7c0 Jenkins: Fix path to soh.exe 2022-06-21 22:10:24 -04:00
Kenix3 1435b5d314
Merge branch 'develop' into zelda64 2022-06-21 19:27:46 -04:00
David Chavez 1763d0bfce
Enable parallel stages on Jenkins (#476) 2022-06-18 09:43:16 -04:00
briaguya dd42cca2cf Merge branch 'develop' into z64-devmerge 2022-06-17 00:39:07 -04:00
sholdee 73ebcf2b1b
Add failsafe in case of hang (#465)
Aborts stage if hung, which extract_assets.py seems to do on rare occasion
2022-06-16 20:55:26 -04:00
sholdee 6ccd3ede1a
Update soh path for z64 branch (#344)
This check will fail on Windows before it gets merged btw
2022-05-21 13:16:12 -04:00
sholdee e6c959e500
Update platform for z64 branch (#338) 2022-05-15 14:53:00 -04:00
sholdee 3013c18e13 Get rid of timeout
Just causing problems
2022-05-11 16:02:22 -04:00
sholdee 8ba5d827c5 Increase build pipeline timeout
30min could possibly be too low in some instances
2022-05-11 15:45:23 -04:00
sholdee ea78c7ea1e
Add Linux build stage to Jenkinsfile (#270)
* Add Linux build stage to Jenkinsfile

* Update Jenkinsfile

* Add OTRGui

* Pull in ZAPD.out to assets/extractor

* Switch to 7z for artifacts
2022-05-11 13:20:25 -04:00
sholdee 5b52e7e570 Commit Jenkinsfile to develop 2022-04-30 10:36:16 -04:00