Skip to content

Commit 4169fe6

Browse files
committed
Don't build simplexlib as a static library
1 parent c6b8cfe commit 4169fe6

File tree

5 files changed

+10
-20
lines changed

5 files changed

+10
-20
lines changed

quick_compile.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if not exist %BUILDDIR%\ (
1515

1616
if exist %BUILDDIR%\ (
1717
meson compile -C %BUILDDIR%
18-
meson install -C %BUILDDIR%
18+
meson install --skip-subprojects -C %BUILDDIR%
1919
)
2020

2121
pause

src/maya/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ simplex_maya = shared_library(
3131
install: true,
3232
install_dir : meson.global_source_root() / 'output_Maya' + maya_version,
3333
include_directories : simplex_maya_inc,
34-
dependencies : [maya_dep, simplexlib_dep, rapidjson_dep],
34+
dependencies : [maya_dep, simplexlib_dep],
3535
name_prefix : '',
3636
name_suffix : maya_name_suffix,
3737
)

src/python/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ endif
1313
simplex_python = py_inst.extension_module(
1414
'simplex_python',
1515
simplex_python_files,
16-
dependencies : [simplexlib_dep, rapidjson_dep],
16+
dependencies : simplexlib_dep,
1717
install: true,
1818
install_dir : meson.global_source_root() / 'output_Python',
1919
limited_api : lapi,

src/simplexlib/meson.build

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,10 @@ simplexlib_files = files([
1212

1313
rapidjson_dep = dependency('rapidjson')
1414
eigen_dep = dependency('eigen3')
15-
inc = include_directories(['include'])
16-
17-
simplexlib = static_library(
18-
'simplexlib',
19-
simplexlib_files,
20-
include_directories : inc,
21-
dependencies : [
22-
rapidjson_dep,
23-
eigen_dep,
24-
]
25-
)
15+
simplexlib_inc = include_directories(['include'])
2616

2717
simplexlib_dep = declare_dependency(
28-
include_directories : inc,
29-
link_with : simplexlib,
18+
include_directories : simplexlib_inc,
19+
sources : simplexlib_files,
20+
dependencies : [eigen_dep, rapidjson_dep],
3021
)

subprojects/maya/meson.build

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ elif os_name == 'darwin'
2727
endif
2828
maya_compile_args += ['-DOSMac_']
2929
if meson.get_compiler('cpp').get_id() == 'clang'
30-
maya_compile_args += ['--std', 'c++17', '--stdlib', 'libc++']
30+
maya_compile_args += ['--stdlib', 'libc++']
3131
maya_compile_args += ['-arch', 'x86_64']
3232
maya_link_args += ['-arch', 'x86_64']
3333
if maya_version.version_compare('>=2024')
34-
# build both the arm and x86 plugins when compiling for mac
34+
# clang will build for both x86 and arm
35+
# if both arches are in the command line args
3536
maya_compile_args += ['-arch', 'arm64']
3637
maya_link_args += ['-arch', 'arm64']
37-
else
3838
endif
3939
endif
4040

@@ -101,7 +101,6 @@ maya_dep = declare_dependency(
101101
variables : {'name_suffix' : maya_plugin_ext, 'maya_version' : maya_version},
102102
compile_args : maya_compile_args,
103103
link_args : maya_link_args,
104-
105104
)
106105

107106
meson.override_dependency('maya', maya_dep)

0 commit comments

Comments
 (0)