Merge pull request #501 from cortex-command-community/bug/500-fix-meson-builds-on-macos

Bug/500 fix meson builds on macos

Author: garethyr

README.md

@@ -101,9 +101,10 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
 
    `cd $DATA_REPOSITORY; ln -s ../Cortex-Command-Community-Project-Source/build/CortexCommand . `
 
-2. Copy all `libfmod` files from `external/lib/linux/x86_64` into the **Data Repository**.
+2. (*optional*) Copy (link) all `libfmod` files from `external/lib/[os]/[arch]` into the **Data Repository**.
+  - Linux: `cd $DATA_REPOSITORY; ln -s ../Cortex-Command-Community-Project-Source/external/lib/linux/x86_64/libfmod.so* .`
+  - macOS: `cd $DATA_REPOSITORY; ln -s ../Cortex-Command-Community-Project-Source/external/lib/macOS/libfmod.dylib .`
 
-   `cd $DATA_REPOSITORY; ln -s ../Cortex-Command-Community-Project-Source/external/lib/linux/x86_64/libfmod.so* .`
 
 4. Run `./CortexCommand` or `./CortexCommand_debug` in the **Data Repository**.
 

external/lib/linux/x86_64/meson.build

@@ -4,6 +4,6 @@ if get_option('install_fmod')
   install_data(fmod_so, install_dir:get_option('fmod_dir'), install_mode:'rwxr-xr-x')
 endif
 
-fmod = compiler.find_library('libfmod', dirs: meson.current_source_dir())
+fmod = compiler.find_library('fmod', dirs: meson.current_source_dir())
 
 deps += fmod

external/lib/macos/meson.build

@@ -1,3 +1,2 @@
-fmod_so = files('libfmod.dylib')
-
-external_objects += fmod_so
+fmod = compiler.find_library('fmod', dirs:meson.current_source_dir())
+deps += fmod

meson.build

@@ -33,11 +33,16 @@ if compiler.get_argument_syntax()== 'gcc' # used for gcc compatible compilers
   # Build against system libraries on linux
   message('gcc detected')
 
-  build_rpath = '$ORIGIN:$ORIGIN/../external/lib/linux/x86_64' # Set RUNPATH so that CCCP can find libfmod.so without needing to set LD_LIBRARY_PATH
+  if host_machine.system() == 'linux'
+    build_rpath = '$ORIGIN:$ORIGIN/../external/lib/linux/x86_64' # Set RUNPATH so that CCCP can find libfmod.so without needing to set LD_LIBRARY_PATH
+  elif host_machine.system()=='darwin'
+    build_rpath = '@executable_path/../external/lib/macos' # Add a new R_PATH CCCP can find libfmod.dylib on Darwin TODO: Confirm and validate this.
+  endif
+
   #suffix = 'x86_64'
-	if host_machine.system()=='linux'
-  link_args += ['-Wl,--enable-new-dtags'] # Set RUNPATH instead of RPATH
-	endif
+  if host_machine.system()=='linux'
+    link_args += ['-Wl,--enable-new-dtags'] # Set RUNPATH instead of RPATH
+  endif
 
   # Set preprocessor flags and cpp arguments according to build options
   buildtype_debug = get_option('debug')
@@ -175,16 +180,16 @@ endif
 
 #### Installing #####
 base_exclude_files = [
-	'Base.rte/Settings.ini',
-	'Launch Actor Editor.bat',
-	'Launch Area Editor.bat',
-	'Launch Assembly Editor.bat',
-	'Launch Gib Editor.bat',
-	'Launch Scene Editor.bat',
-	'LogConsole.txt',
-	'LogLoading.txt',
-	'LogLoadingWarning.txt',
-	'Start Dedicated Server.bat'
+  'Base.rte/Settings.ini',
+  'Launch Actor Editor.bat',
+  'Launch Area Editor.bat',
+  'Launch Assembly Editor.bat',
+  'Launch Gib Editor.bat',
+  'Launch Scene Editor.bat',
+  'LogConsole.txt',
+  'LogLoading.txt',
+  'LogLoadingWarning.txt',
+  'Start Dedicated Server.bat'
 ]
 
 if get_option('install_data')