ImGui as a submodule now

proconsule · Sep 27, 2023 · 439045e · 439045e
1 parent c42300c
commit 439045e
Show file tree

Hide file tree

Showing 5 changed files with 7,773 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "libs/imgui_toggle"]
 	path = libs/imgui_toggle
 	url = https://github.com/cmdwtf/imgui_toggle
+[submodule "libs/imgui"]
+	path = libs/imgui
+	url = https://github.com/ocornut/imgui
diff --git a/Makefile b/Makefile
@@ -39,9 +39,9 @@ include $(DEVKITPRO)/libnx/switch_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	source/backends source/backends/glfw3-opengl3 source/iniparser source/imgloader source/networkshareclass source/UI/textscroller source/vout source/mediaprobe libs/imgui_toggle source/fileBrowser source/logger source/stats libs/imgui-1.89.9 libs/imgui-1.89.9/misc/freetype source source/updater source/curldownloader source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/UI source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
+SOURCES		:=	source/backends source/backends/glfw3-opengl3 source/iniparser source/imgloader source/networkshareclass source/UI/textscroller source/vout source/mediaprobe libs/imgui_toggle source/fileBrowser source/logger source/stats libs/imgui libs/imgui/misc/freetype source source/updater source/curldownloader source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/UI source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
 DATA		:=	data
-INCLUDES	:=	source/backends source/backends/glfw3-opengl3 source/iniparser source/imgloader source/networkshareclass source/UI/textscroller source/vout source/mediaprobe libs/imgui_toggle source/fileBrowser source/logger source/stats libs/simpleini libs/imgui-1.89.9 include source/curldownloader source/updater source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
+INCLUDES	:=	source/backends source/backends/glfw3-opengl3 source/iniparser source/imgloader source/networkshareclass source/UI/textscroller source/vout source/mediaprobe libs/imgui_toggle source/fileBrowser source/logger source/stats libs/simpleini libs/imgui include source/curldownloader source/updater source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
 ROMFS		:=	romfs
 
 GITREV:= -D'GITREV="$(shell git rev-parse --short HEAD)"'

diff --git a/libs/imgui b/libs/imgui
diff --git a/libs/simpleini b/libs/simpleini
+73 −0		.github/workflows/codeql.yml
+23 −0		.github/workflows/test.yml
+0 −13		.travis.yml
+37 −0		CMakeLists.txt
+1 −1		ConvertUTF.c
+2 −2		ConvertUTF.h
+1 −1		LICENCE.txt
+7 −5		Makefile
+2 −2		README.md
+229 −91		SimpleIni.h
+1 −1		other/simpleini.doxy
+6 −0		release.txt
+8 −7		tests/Makefile
+1 −1		tests/packages.config
+8 −5		tests/tests.vcxproj
+57 −0		tests/tests.vcxproj.filters
+69 −0		tests/ts-noconvert.cpp
+202 −0		tests/ts-quotes.cpp
+83 −0		tests/ts-roundtrip.cpp
+44 −0		tests/ts-snippets.cpp
+3 −4		vcproj/SimpleIni.sln