From 2f02159dccee5ba360e6c003e49b5d85939e754f Mon Sep 17 00:00:00 2001 From: Struma Date: Thu, 13 Jan 2022 16:29:17 -0500 Subject: [PATCH] try to fix building steamshim with meson Shot in the dark, no PC --- meson.build | 8 ++++++-- meson_options.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 18397d70..18227958 100644 --- a/meson.build +++ b/meson.build @@ -147,7 +147,12 @@ if steamworks == true if build_static == true la = '-static' endif - shim_args = ['-DGAME_LAUNCH_NAME="' + exe_name + '"'] + + shim_args = [ + '-DGAME_LAUNCH_NAME="' + exe_name + '"', + '-I' + steamworks_path + '/public' + ] + if get_option('steam_appid') != '' shim_args += '-DSTEAM_APPID=' + get_option('steam_appid') endif @@ -159,7 +164,6 @@ if steamworks == true executable(meson.project_name(), sources: files('steamshim/steamshim_parent.cpp'), dependencies: steamlib, - include_directories: (steamworks_path + '/public'), cpp_args: shim_args, link_args: la.split(), gui_app: (get_option('steamshim_debug') == false), diff --git a/meson_options.txt b/meson_options.txt index 359889c6..59803339 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('mri_version', type: 'string', value: '3.0', description: 'Version of MRI to link with') +option('mri_version', type: 'string', value: '3.1', description: 'Version of MRI to link with') option('mri_includes', type: 'string', value: '', description: 'Ruby manual include path') option('mri_libpath', type: 'string', value: '', description: 'Ruby manual lib path') option('mri_library', type: 'string', value: '', description: 'Ruby manual link name')