Merge pull request #1 from cortex-command-community/meson-fixes

Meson updates for monorepo

Author: Causeless

external/sources/luabind-0.7.1/meson.build

@@ -20,17 +20,12 @@ elif cxx.get_argument_syntax() == 'msvc'
   cpp_options = ['cpp_std=vc++20']
 endif
 
-if not get_option('use_prebuilt_libraries') or host_machine.system() in ['darwin', 'linux']
-  luabind = static_library('luabind071', luabind_src, dependencies: luabind_dependencies, include_directories:luabind_include, cpp_args:cpp_args+ luabind_args, override_options: ['warning_level=0']+ cpp_options)
-else
-  luabind = []
-  if get_option('debug')
-    deps = cxx.find_library('luabind-debug' , dirs: meson.current_source_dir()/'_Bin')
-  else
-    deps = cxx.find_library('luabind-release', dirs: meson.current_source_dir()/'_Bin')
-  endif
+if (not get_option('debug')) or get_option('debug_type') == 'release'
+  luabind_args += ['-DLUABIND_NO_ERROR_CHECKING=1']
 endif
 
+luabind = static_library('luabind071', luabind_src, dependencies: luabind_dependencies, include_directories:luabind_include, cpp_args:cpp_args+ luabind_args, override_options: ['warning_level=0']+ cpp_options)
+
 luabind_dep = declare_dependency(link_with: luabind, dependencies: deps, include_directories: luabind_include, compile_args: luabind_args)
 
 meson.override_dependency('luabind', luabind_dep)

external/sources/luabind-0.7.1/meson_options.txt

@@ -1 +1,2 @@
-option('use_prebuilt_libraries', type: 'boolean', value: true, yield: true, description: 'On windows use the prebuilt libraries')
+option('use_prebuilt_libraries', type: 'boolean', value: true, yield: true, description: 'On windows use the prebuilt libraries')
+option('debug_type', type: 'combo', choices: ['full','minimal','release'], value:'minimal', yield: true, description: 'Enable certain Debug features, that might slow down the game')

meson.build

@@ -73,6 +73,7 @@ elif compiler.get_argument_syntax()== 'msvc'
   message('cl detected')
   elfname = 'Cortex Command'
   extra_args += ['-D_HAS_ITERATOR_DEBUGGING=0', '-D_HAS_AUTO_PTR_ETC=1', '-bigobj']
+  add_global_arguments('-D_ITERATOR_DEBUG_LEVEL=0', language:'cpp')
   add_project_link_arguments(['winmm.lib', 'ws2_32.lib', 'dinput8.lib', 'ddraw.lib', 'dxguid.lib', 'dsound.lib', 'dbghelp.lib'], language:'cpp')
   if host_machine.cpu_family() == 'x86'
     elfname += ' x86'
@@ -246,9 +247,9 @@ base_exclude_files = [
 ]
 
 if get_option('install_data')
-install_subdir(get_option('cccpdatadir'),
-               exclude_directories:['.git', '.github', 'Metagames.rte', 'Scenes.rte'],
+install_subdir('Data',
+               exclude_directories:['.git', '.github'],
                exclude_files:base_exclude_files,
-               install_dir:get_option('data_install_dir'),
+               install_dir:get_option('data_install_dir')/'Data',
                strip_directory:true)
 endif

meson_darwin.ini

@@ -1,5 +1,4 @@
 option('debug_type', type: 'combo', choices: ['full','minimal','release'], value:'minimal', description: 'Enable certain Debug features, that might slow down the game')
-option('cccpdatadir', type:'string', value:'.', description: 'Path to the Cortex Command Data Repository')
 option('data_install_dir', type:'string', value:'share/CortexCommand', description: 'Where to install the data files relative to prefix directory')
 option('install_fmod', type:'boolean', value: true, description: 'Wether to install the fmod library.')
 option('fmod_dir', type:'string', value:'lib/CortexCommand/', description: 'Where to install the fmod library relative to prefix directory.')