build: move imgui out of src/intel/tools to be reused

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
+1-by: Mike Lothian <mike@fireburn.co.uk>
+1-by: Tapani Pälli <tapani.palli@intel.com>
+1-by: Eric Engestrom <eric.engestrom@intel.com>
+1-by: Yurii Kolesnykov <root@yurikoles.com>
+1-by: myfreeweb <greg@unrelenting.technology>
+1-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Lionel Landwerlin 2019-01-19 20:02:13 +00:00
parent f98fd9d15a
commit 51047cd2e8
22 changed files with 37 additions and 28 deletions

View File

@ -136,3 +136,18 @@ libglsl_util_la_SOURCES = \
mesa/program/prog_parameter.c \
mesa/program/symbol_table.c \
mesa/program/dummy_errors.c
EXTRA_DIST += \
tools/imgui/imconfig.h \
tools/imgui/imgui.cpp \
tools/imgui/imgui.h \
tools/imgui/imgui_draw.cpp \
tools/imgui/imgui_demo.cpp \
tools/imgui/imgui_internal.h \
tools/imgui/imgui_memory_editor.h \
tools/imgui/stb_rect_pack.h \
tools/imgui/stb_textedit.h \
tools/imgui/stb_truetype.h \
tools/imgui/README \
tools/imgui/LICENSE.txt \
tools/imgui/meson.build

11
src/imgui/meson.build Normal file
View File

@ -0,0 +1,11 @@
libimgui_core = static_library(
'intel_imgui_core',
files('imgui.cpp', 'imgui_demo.cpp', 'imgui_draw.cpp'),
cpp_args : ['-w'],
install: false
)
libimgui_core_dep = declare_dependency(
link_with: libimgui_core,
include_directories: include_directories('.')
)

View File

@ -72,23 +72,11 @@ EXTRA_DIST = \
tools/aubinator_viewer.h \
tools/aubinator_viewer_decoder.cpp \
tools/aubinator_viewer_urb.h \
tools/imgui/README \
tools/imgui/stb_textedit.h \
tools/imgui/meson.build \
tools/imgui/imconfig.h \
tools/imgui/imgui.cpp \
tools/imgui/imgui.h \
tools/imgui/imgui_draw.cpp \
tools/imgui/imgui_demo.cpp \
tools/imgui/imgui_internal.h \
tools/imgui/imgui_impl_gtk3.cpp \
tools/imgui/imgui_impl_gtk3.h \
tools/imgui/imgui_impl_opengl3.cpp \
tools/imgui/imgui_impl_opengl3.h \
tools/imgui/imgui_memory_editor.h \
tools/imgui/stb_truetype.h \
tools/imgui/stb_rect_pack.h \
tools/imgui/LICENSE.txt \
tools/imgui/meson.build \
tools/intel_sanitize_gpu.c \
tools/intel_sanitize_gpu.in \
tools/intel_dump_gpu.c \

View File

@ -221,13 +221,13 @@ update_mem_for_exec(struct aub_mem *mem, struct aub_file *file, int exec_idx)
#include <epoxy/gl.h>
#include "imgui.h"
#include "imgui/imgui.h"
#include "imgui/imgui_memory_editor.h"
#include "imgui_impl_gtk3.h"
#include "imgui_impl_opengl3.h"
#include "aubinator_viewer.h"
#include "aubinator_viewer_urb.h"
#include "imgui_memory_editor.h"
struct window {
struct list_head link; /* link in the global list of windows */

View File

@ -1,7 +1,7 @@
#ifndef AUBINATOR_VIEWER_H
#define AUBINATOR_VIEWER_H
#include "imgui.h"
#include "imgui/imgui.h"
#include "common/gen_decoder.h"
#include "common/gen_disasm.h"

View File

@ -3,7 +3,7 @@
#include "aubinator_viewer.h"
#include "imgui.h"
#include "imgui/imgui.h"
struct AubinatorViewerUrb {

View File

@ -8,7 +8,7 @@
#include <stdio.h>
#include <imgui.h>
#include "imgui/imgui.h"
#include "imgui_impl_gtk3.h"
#include <gtk/gtk.h>

View File

@ -48,7 +48,7 @@
#define _CRT_SECURE_NO_WARNINGS
#endif
#include "imgui.h"
#include "imgui/imgui.h"
#include "imgui_impl_opengl3.h"
#include <stdio.h>
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier

View File

@ -1,10 +1,3 @@
libintel_imgui_core = static_library(
'intel_imgui_core',
files('imgui.cpp', 'imgui_demo.cpp', 'imgui_draw.cpp'),
cpp_args : ['-w'],
install: false
)
libintel_imgui_gtk_deps = [
dependency('epoxy'),
dependency('gtk+-3.0'),
@ -13,13 +6,14 @@ libintel_imgui_gtk_deps = [
libintel_imgui_gtk = static_library(
'intel_imgui_gtk',
files('imgui_impl_gtk3.cpp', 'imgui_impl_opengl3.cpp'),
include_directories: inc_common,
dependencies : libintel_imgui_gtk_deps,
cpp_args : ['-w'],
install: false
)
libintel_imgui_gtk_dep = declare_dependency(
link_with: [libintel_imgui_core, libintel_imgui_gtk],
dependencies: libintel_imgui_gtk_deps,
link_with: libintel_imgui_gtk,
dependencies: [libimgui_core_dep, libintel_imgui_gtk_deps],
include_directories: include_directories('.')
)

View File

@ -51,6 +51,7 @@ subdir('util')
subdir('mapi')
# TODO: opengl
subdir('compiler')
subdir('imgui')
if with_platform_wayland
subdir('egl/wayland/wayland-drm')
endif