0ad/0ad
0ad/0ad
4
5
Fork 14
Code Issues 1.5k Pull Requests 29 Actions Projects Releases Wiki Activity

Fix build on recent macOS. #6974

Closed
Stan wants to merge 1 commits from Stan/0ad:macos-build-fixes into main
pull from: Stan/0ad:macos-build-fixes
merge into: 0ad:main
Conversation 2 Commits 1 Files Changed 2 +21
Stan commented 2024-08-25 23:53:26 +02:00
Owner
Copy Link

Fixes #6797
Fixes #6902
Fixes #6915
Fixes #6916
Refs #4362

Fixes #6797 Fixes #6902 Fixes #6915 Fixes #6916 Refs #4362
Stan added 1 commit 2024-08-25 23:53:29 +02:00
Fix build on recent macOS.
Some checks failed
0ad-freebsd/pipeline/pr-main This commit is unstable
Details
pre-commit / build (pull_request) Successful in 55s
Details
0ad-checkrefs/pipeline/pr-main There was a failure building this commit
Details
0ad-windows/pipeline/pr-main This commit looks good
Details
0ad-linux/pipeline/pr-main This commit looks good
Details
0ad-macos/pipeline/pr-main There was a failure building this commit
Details
57f1f1017d 
Fixes #6797
Fixes #6902
Fixes #6915
Fixes #6916
Refs #4362
Stan requested review from Itms 2024-08-25 23:53:29 +02:00
Stan requested review from xone47 2024-08-25 23:54:00 +02:00
Stan force-pushed macos-build-fixes from 57f1f1017d to f11c9726cc 2024-08-27 22:15:46 +02:00 Compare
Stan force-pushed macos-build-fixes from f11c9726cc to 9ed4a77b70 2024-08-27 22:31:04 +02:00 Compare
Itms requested changes 2024-09-02 22:01:02 +02:00
libraries/macos-patches/patch-sm-linker.diff Outdated
@ -0,0 +1,29 @@
diff --git a/build.sh b/build.sh
Itms commented 2024-09-02 21:56:00 +02:00
Owner
Copy Link

This file must never be committed to git, so I strongly advice against putting it in macos-patches. I would call it "SVN-changes.diff" or something in that fashion and place it in libraries. I also recommend this is made an SVN patch, created using svn diff in the checkout of source-libs. Whenever this PR is accepted, this change must be committed to the source-libs SVN, and this commit must be updated with a change to SVN revision in get-source-libs.

This file must never be committed to git, so I strongly advice against putting it in macos-patches. I would call it "SVN-changes.diff" or something in that fashion and place it in libraries. I also recommend this is made an SVN patch, created using `svn diff` in the checkout of `source-libs`. Whenever this PR is accepted, this change must be committed to the source-libs SVN, and this commit must be updated with a change to SVN revision in get-source-libs.
Stan force-pushed macos-build-fixes from 9ed4a77b70 to 7856098af5 2024-09-09 11:26:45 +02:00 Compare
Itms commented 2024-09-09 20:41:15 +02:00
Owner
Copy Link

I will include this when fixing #6895 πŸ‘ Can I close the PR to reduce the review queue?

I will include this when fixing #6895 πŸ‘ Can I close the PR to reduce the review queue?
Stan commented 2024-09-09 21:13:40 +02:00
Author
Owner
Copy Link

Sure. :)

Sure. :)
Stan closed this pull request 2024-09-09 21:13:40 +02:00
All checks were successful
0ad-freebsd/pipeline/pr-main This commit looks good
Details
checkrefs / checkrefs (pull_request) Successful in 54s
Required
Details
pre-commit / build (pull_request) Successful in 1m10s
Required
Details
0ad-linux/pipeline/pr-main This commit looks good
Required
Details
0ad-windows/pipeline/pr-main This commit looks good
Details
0ad-macos/pipeline/pr-main This commit looks good
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
xone47
Itms
Labels
Clear labels   
Closed
Duplicate

  
Closed
Fixed

  
Closed
Invalid

  
Closed
Needs info

  
Closed
Won't fix

  
Closed
Works for me

  
Difficulty
Hard

  
Difficulty
Medium

  
Difficulty
Simple

  
Needed for Beta

   
Needs Design Input

   
Needs Info

   
Pathfinding
  
Priority
1: Release Blocker

  
Priority
2: Must Have

  
Priority
3: Should Have

  
Priority
4: Nice To Have

  
Priority
5: If Time Permits

  
Regression
  
Theme
AI

  
Theme
Art & Animation

  
Theme
Atlas editor

  
Theme
Build & Packages

  
Theme
Core engine

  
Theme
Internationalization & Localization

  
Theme
Maps

  
Theme
Multiplayer Lobby

  
Theme
Music & Sound FX

  
Theme
Network

  
Theme
Non-game systems

  
Theme
Simulation

  
Theme
UI & Simulation

  
Theme
UI – Game setup

  
Theme
UI – In-game

  
Theme
UI – Miscellaneous

  
Theme
Website & Forum

  
Type
Defect

  
Type
Enhancement

  
Type
Task

No Label
Closed
Duplicate
Closed
Fixed
Closed
Invalid
Closed
Needs info
Closed
Won't fix
Closed
Works for me
Difficulty
Hard
Difficulty
Medium
Difficulty
Simple
Needed for Beta
Needs Design Input
Needs Info
Pathfinding
Priority
1: Release Blocker
Priority
2: Must Have
Priority
3: Should Have
Priority
4: Nice To Have
Priority
5: If Time Permits
Regression
Theme
AI
Theme
Art & Animation
Theme
Atlas editor
Theme
Build & Packages
Theme
Core engine
Theme
Internationalization & Localization
Theme
Maps
Theme
Multiplayer Lobby
Theme
Music & Sound FX
Theme
Network
Theme
Non-game systems
Theme
Simulation
Theme
UI & Simulation
Theme
UI – Game setup
Theme
UI – In-game
Theme
UI – Miscellaneous
Theme
Website & Forum
Type
Defect
Type
Enhancement
Type
Task
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: 0ad/0ad#6974
No description provided.
Delete Branch "Stan/0ad:macos-build-fixes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?