Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: fix mac builds #1711

Merged
merged 1 commit into from
Oct 14, 2024
Merged

build: fix mac builds #1711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Initial build:

- Compile the project (described in the next section)
- Copy all executable files from `build/` to your game directory
- Copy the contents of `data/ship/` to your game directory
- Copy the contents of `data/*/ship/` to your game directory

Subsequent builds:

Expand Down
1 change: 1 addition & 0 deletions docs/tr1/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## [Unreleased](https://github.com/LostArtefacts/TRX/compare/tr1-4.5...develop) - ××××-××-××
- fixed mac builds missing embedded resources (#1710, regression from 4.5)

## [4.5](https://github.com/LostArtefacts/TRX/compare/tr1-4.4...tr1-4.5) - 2024-10-08
- added a photo mode feature (#1669)
Expand Down
6 changes: 3 additions & 3 deletions src/tr1/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ executable(
)

if host_machine.system() == 'darwin'
install_subdir('../../data/ship/cfg', install_dir : 'Contents/Resources')
install_subdir('../../data/ship/data', install_dir : 'Contents/Resources')
install_subdir('../../data/ship/shaders', install_dir : 'Contents/Resources')
install_subdir('../../data/tr1/ship/cfg', install_dir : 'Contents/Resources')
install_subdir('../../data/tr1/ship/data', install_dir : 'Contents/Resources')
install_subdir('../../data/tr1/ship/shaders', install_dir : 'Contents/Resources')
install_data('../../data/tr1/mac/icon.icns', install_dir : 'Contents/Resources')
install_data('../../data/tr1/mac/Info.plist', install_dir : 'Contents')
meson.add_install_script('../../tools/tr1/mac/bundle_dylibs')
Expand Down