mirror of https://github.com/xemu-project/xemu.git
meson: Migrate implot submodule to subproject
This commit is contained in:
parent
09f7787fa9
commit
fcf5eb84a1
|
@ -43,10 +43,6 @@
|
|||
[submodule "tests/lcitool/libvirt-ci"]
|
||||
path = tests/lcitool/libvirt-ci
|
||||
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"]
|
||||
path = genconfig
|
||||
url = https://github.com/mborgerson/genconfig.git
|
||||
|
|
|
@ -2371,6 +2371,10 @@ imgui_proj = subproject('imgui', required: true,
|
|||
])
|
||||
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')
|
||||
|
||||
#################
|
||||
|
|
|
@ -35,7 +35,7 @@ sub_deinit=""
|
|||
|
||||
# xemu extras
|
||||
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() {
|
||||
local status=$?
|
||||
|
|
|
@ -198,7 +198,7 @@ Lib('imgui', 'https://github.com/ocornut/imgui',
|
|||
Lib('implot', 'https://github.com/epezent/implot',
|
||||
mit, 'https://raw.githubusercontent.com/epezent/implot/master/LICENSE',
|
||||
ships_static=all_platforms,
|
||||
submodule=Submodule('ui/thirdparty/implot')
|
||||
submodule=Submodule('subprojects/implot.wrap')
|
||||
),
|
||||
|
||||
Lib('cpp-httplib', 'https://github.com/yhirose/cpp-httplib',
|
||||
|
|
|
@ -27,3 +27,4 @@ tomlplusplus
|
|||
cpp-httplib
|
||||
xxHash-*
|
||||
imgui
|
||||
implot
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
[wrap-git]
|
||||
url=https://github.com/xemu-project/implot
|
||||
revision=006a1c23e5706bbe816968163b4d589162257a57
|
||||
depth=1
|
|
@ -1 +0,0 @@
|
|||
Subproject commit cc5e1daa5c7f2335a9460ae79c829011dc5cef2d
|
|
@ -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()
|
||||
if host_os == 'linux'
|
||||
noc_ss.add([gtk, files('noc_file_dialog/noc_file_dialog_gtk.c')])
|
||||
|
|
Loading…
Reference in New Issue