Skip to content

Commit 1cf68dd

Browse files
committed
Add Dear ImGui and implot as submodules
1 parent ef52c5c commit 1cf68dd

17 files changed

+30
-27888
lines changed

.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "3rd/imgui"]
2+
path = 3rd/imgui
3+
url = https://github.com/ocornut/imgui.git
4+
[submodule "3rd/implot"]
5+
path = 3rd/implot
6+
url = https://github.com/epezent/implot.git

3rd/imgui

Submodule imgui added at 39585aa

3rd/implot

Submodule implot added at 193b9d8

tools/rprof_inspector/Makefile

+11-7
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,27 @@ CXX = emcc
33
OUTPUT = rprof.js
44

55
SOURCES = main.cpp
6-
SOURCES += ../rprof_inspector/imgui/imgui.cpp
7-
SOURCES += ../rprof_inspector/imgui/imgui_draw.cpp
8-
SOURCES += ../rprof_inspector/imgui/imgui_impl_glfw.cpp
9-
SOURCES += ../rprof_inspector/imgui/imgui_impl_opengl3.cpp
6+
SOURCES += ../../3rd/imgui/imgui.cpp
7+
SOURCES += ../../3rd/imgui/imgui_draw.cpp
8+
SOURCES += ../../3rd/imgui/imgui_tables.cpp
9+
SOURCES += ../../3rd/imgui/imgui_widgets.cpp
10+
SOURCES += ../../3rd/imgui/backends/imgui_impl_glfw.cpp
11+
SOURCES += ../../3rd/imgui/backends/imgui_impl_opengl3.cpp
1012
SOURCES += ../../src/rprof_context.cpp
1113
SOURCES += ../../src/rprof_freelist.cpp
1214
SOURCES += ../../src/rprof_lib.cpp
1315

14-
LIBS = -lGL
16+
INCLUDES = -I../../3rd/imgui
17+
#LIBS = -lGL
18+
LIBS = -lGL-webgl2-full_es3-getprocaddr
1519
WEBGL_VER = -s USE_WEBGL2=1 -s USE_GLFW=3 -s FULL_ES3=1
16-
FILE_SYSTEM = -s FORCE_FILESYSTEM=1 -s ASYNCIFY=1 --memory-init-file 0
20+
FILE_SYSTEM = -s FORCE_FILESYSTEM=1 -s ASYNCIFY=1 --memory-init-file 0 -DIMGUI_DISABLE_DEBUG_TOOLS
1721
USE_WASM = -s WASM=1
1822

1923
PROJECTS := gui
2024

2125
GUI:
22-
$(CXX) $(SOURCES) -o $(OUTPUT) $(LIBS) $(WEBGL_VER) $(FILE_SYSTEM) -O2 --no-heap-copy -s ALLOW_MEMORY_GROWTH=1 --preload-file data $(USE_WASM)
26+
$(CXX) $(SOURCES) -o $(OUTPUT) $(LIBS) $(WEBGL_VER) $(FILE_SYSTEM) $(INCLUDES) -O2 --no-heap-copy -s ALLOW_MEMORY_GROWTH=1 --preload-file data $(USE_WASM) -sASSERTIONS
2327

2428
all: $(GUI)
2529

tools/rprof_inspector/imgui/imconfig.h

-72
This file was deleted.

0 commit comments

Comments
 (0)