Skip to content

Commit

Permalink
build: use static linking for imgui, stb, vma and tol
Browse files Browse the repository at this point in the history
  • Loading branch information
LDAP committed Aug 7, 2024
1 parent e143d5a commit da48ec6
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ glfw = dependency('glfw3', version: ['>=3.4.0'], fallback: ['glfw', 'glfw_dep'])
glm = dependency('glm', fallback : ['glm', 'glm_dep'], version: ['>=0.9.9.8'])
tol = dependency('tinyobjloader', fallback : ['tinyobjloader', 'tinyobjloader_dep'])
tgltf = dependency('tinygltf', required: get_option('tinygltf'), fallback: ['tinygltf', 'tinygltf_dep'])
imgui = dependency('imgui', version: ['>=1.90.9'], fallback: ['imgui', 'imgui_dep'])
imgui = dependency('imgui', version: ['>=1.90.9'], fallback: ['imgui', 'imgui_dep'], static: true)
nlohmann_json = dependency('nlohmann_json', version: ['>=3.11.3'], fallback: ['nlohmann_json', 'nlohmann_json_dep'])
vma = dependency('VulkanMemoryAllocator', version: ['>=3.1.0'], fallback: ['VulkanMemoryAllocator', 'VulkanMemoryAllocator_dep'])
stb = dependency('stb', fallback: ['stb', 'stb_dep'], default_options : ['stb_libraries=[\'stb_image\', \'stb_image_write\']'])
Expand Down
2 changes: 1 addition & 1 deletion subprojects/packagefiles/VulkanMemoryAllocator/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include_dirs = include_directories('include')

implementation = import('fs').copyfile('include/vk_mem_alloc.h', 'vk_mem_alloc.cpp')

vma = library(
vma = static_library(
'vma',
[implementation],
dependencies: [vulkan],
Expand Down
1 change: 1 addition & 0 deletions subprojects/packagefiles/imgui/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ project(
'cpp',
license: 'MIT',
version: run_command(['git', 'describe', '--exact-match', '--tags']).stdout().substring(1),
default_options: ['default_library=static'],
meson_version: '>=0.56.0',
)

Expand Down
2 changes: 1 addition & 1 deletion subprojects/packagefiles/stb/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ foreach lib : get_option('stb_libraries')
endif
endforeach

stb = library(
stb = static_library(
'stb',
implementations,
cpp_args: args,
Expand Down
2 changes: 1 addition & 1 deletion subprojects/packagefiles/tinyobjloader/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project(

include_dirs = include_directories('.')

tol = library(
tol = static_library(
'tol',
['tiny_obj_loader.cc'],
include_directories: include_dirs,
Expand Down

0 comments on commit da48ec6

Please sign in to comment.