diff --git a/.gitmodules b/.gitmodules index 7c6e89b..dcdc8b8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "subprojects/libliftoff"] path = subprojects/libliftoff url = https://github.com/emersion/libliftoff.git -[submodule "subprojects/stb"] - path = subprojects/stb - url = https://github.com/nothings/stb diff --git a/meson.build b/meson.build index d779eec..e7251ec 100644 --- a/meson.build +++ b/meson.build @@ -41,6 +41,8 @@ cap_dep = dependency('libcap') sdl_dep = dependency('SDL2') pipewire_dep = dependency('libpipewire-0.3', required: get_option('pipewire')) +stb_dep = dependency('stb') + wlroots_dep = dependency( 'wlroots', version: ['>= 0.13.0', '< 0.14.0'], @@ -103,7 +105,7 @@ executable( dep_x11, dep_xdamage, dep_xcomposite, dep_xrender, dep_xext, dep_xfixes, dep_xxf86vm, dep_xres, drm_dep, wayland_server, wayland_protos, xkbcommon, thread_dep, sdl_dep, wlroots_dep, - vulkan_dep, liftoff_dep, dep_xtst, cap_dep, pipewire_dep, + vulkan_dep, liftoff_dep, dep_xtst, cap_dep, pipewire_dep, stb_dep, ], install: true, ) diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp index c147063..920856a 100644 --- a/src/steamcompmgr.cpp +++ b/src/steamcompmgr.cpp @@ -81,7 +81,7 @@ #endif #define STB_IMAGE_IMPLEMENTATION -#include "../subprojects/stb/stb_image.h" +#include #define GPUVIS_TRACE_IMPLEMENTATION #include "gpuvis_trace_utils.h" diff --git a/subprojects/packagefiles/stb/meson.build b/subprojects/packagefiles/stb/meson.build new file mode 100644 index 0000000..69d02d5 --- /dev/null +++ b/subprojects/packagefiles/stb/meson.build @@ -0,0 +1,8 @@ +project('stb', 'c', version : '0.1.0', license : 'MIT') + +stb_dep = declare_dependency( + include_directories : include_directories('.'), + version : meson.project_version() +) + +meson.override_dependency('stb', stb_dep) diff --git a/subprojects/stb b/subprojects/stb deleted file mode 160000 index c0c9826..0000000 --- a/subprojects/stb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c0c982601f40183e74d84a61237e968dca08380e diff --git a/subprojects/stb.wrap b/subprojects/stb.wrap new file mode 100644 index 0000000..ab5d7b1 --- /dev/null +++ b/subprojects/stb.wrap @@ -0,0 +1,7 @@ +[wrap-git] +directory = stb + +url = https://github.com/nothings/stb.git +revision = head + +patch_directory = stb