build: fix mac builds

Resolves #1710.
LostArtefacts · Oct 14, 2024 · 05d567b · 05d567b
1 parent c9760a7
commit 05d567b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -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:
 

diff --git a/docs/tr1/CHANGELOG.md b/docs/tr1/CHANGELOG.md
@@ -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)

diff --git a/src/tr1/meson.build b/src/tr1/meson.build
@@ -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')