ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

meson: Migrate implot submodule to subproject

This commit is contained in:
Matt Borgerson 2025-01-06 15:35:11 -07:00
parent 09f7787fa9
commit fcf5eb84a1
8 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -43,10 +43,6 @@
[submodule "tests/lcitool/libvirt-ci"] [submodule "tests/lcitool/libvirt-ci"]
path = tests/lcitool/libvirt-ci path = tests/lcitool/libvirt-ci
url = https://gitlab.com/libvirt/libvirt-ci.git url = https://gitlab.com/libvirt/libvirt-ci.git
[submodule "ui/thirdparty/implot"]
path = ui/thirdparty/implot
url = https://github.com/epezent/implot.git
ignore = untracked
[submodule "genconfig"] [submodule "genconfig"]
path = genconfig path = genconfig
url = https://github.com/mborgerson/genconfig.git url = https://github.com/mborgerson/genconfig.git

4
meson.build
View File

@ -2371,6 +2371,10 @@ imgui_proj = subproject('imgui', required: true,
]) ])
imgui = imgui_proj.get_variable('imgui_dep') imgui = imgui_proj.get_variable('imgui_dep')
implot_proj = subproject('implot', required: true,
default_options: ['default_library=static'])
implot = implot_proj.get_variable('implot_dep')
subdir('thirdparty') subdir('thirdparty')
################# #################

2
scripts/archive-source.sh
View File

@ -35,7 +35,7 @@ sub_deinit=""
# xemu extras # xemu extras
subprojects="$subprojects glslang SPIRV-Reflect volk VulkanMemoryAllocator subprojects="$subprojects glslang SPIRV-Reflect volk VulkanMemoryAllocator
nv2a_vsh_cpu tomlplusplus cpp-httplib xxhash imgui" nv2a_vsh_cpu tomlplusplus cpp-httplib xxhash imgui implot"
function cleanup() { function cleanup() {
local status=$? local status=$?

2
scripts/gen-license.py
View File

@ -198,7 +198,7 @@ Lib('imgui', 'https://github.com/ocornut/imgui',
Lib('implot', 'https://github.com/epezent/implot', Lib('implot', 'https://github.com/epezent/implot',
mit, 'https://raw.githubusercontent.com/epezent/implot/master/LICENSE', mit, 'https://raw.githubusercontent.com/epezent/implot/master/LICENSE',
ships_static=all_platforms, ships_static=all_platforms,
submodule=Submodule('ui/thirdparty/implot') submodule=Submodule('subprojects/implot.wrap')
), ),
Lib('cpp-httplib', 'https://github.com/yhirose/cpp-httplib', Lib('cpp-httplib', 'https://github.com/yhirose/cpp-httplib',

1
subprojects/.gitignore vendored
View File

@ -27,3 +27,4 @@ tomlplusplus
cpp-httplib cpp-httplib
xxHash-* xxHash-*
imgui imgui
implot

4
subprojects/implot.wrap Normal file
View File

@ -0,0 +1,4 @@
[wrap-git]
url=https://github.com/xemu-project/implot
revision=006a1c23e5706bbe816968163b4d589162257a57
depth=1

1
ui/thirdparty/implot vendored

@ -1 +0,0 @@
Subproject commit cc5e1daa5c7f2335a9460ae79c829011dc5cef2d

13
ui/thirdparty/meson.build vendored
View File

@ -1,16 +1,3 @@
implot_files = files(
'implot/implot.cpp',
'implot/implot_items.cpp'
#'implot/implot_demo.cpp',
)
libimplot = static_library('implot',
sources: implot_files,
include_directories: 'implot',
dependencies: [imgui])
implot = declare_dependency(link_with: libimplot,
include_directories: 'implot')
noc_ss = ss.source_set() noc_ss = ss.source_set()
if host_os == 'linux' if host_os == 'linux'
noc_ss.add([gtk, files('noc_file_dialog/noc_file_dialog_gtk.c')]) noc_ss.add([gtk, files('noc_file_dialog/noc_file_dialog_gtk.c')])