From e5118238097fb94165a081de171a499b71099a87 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sun, 27 Aug 2017 01:36:17 -0400 Subject: [PATCH] Update submodules, convert oui-blendish to git submodule --- .gitmodules | 3 +++ ext/nanosvg | 2 +- ext/nanovg | 2 +- ext/oui-blendish | 1 + include/widgets.hpp | 2 +- src/gui.cpp | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) create mode 160000 ext/oui-blendish diff --git a/.gitmodules b/.gitmodules index 83116fb2..a479429d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "ext/osdialog"] path = ext/osdialog url = https://github.com/AndrewBelt/osdialog.git +[submodule "ext/oui-blendish"] + path = ext/oui-blendish + url = https://github.com/AndrewBelt/oui-blendish.git diff --git a/ext/nanosvg b/ext/nanosvg index dc12d905..9a74da4d 160000 --- a/ext/nanosvg +++ b/ext/nanosvg @@ -1 +1 @@ -Subproject commit dc12d90586a8ab99da0c575aafff999666aa5d55 +Subproject commit 9a74da4db5ac74083e444010d75114658581b9c7 diff --git a/ext/nanovg b/ext/nanovg index c629efbf..a2784bad 160000 --- a/ext/nanovg +++ b/ext/nanovg @@ -1 +1 @@ -Subproject commit c629efbfa6ca90035d6625dfa3586048a9c3201f +Subproject commit a2784bad3a077ced36ee9b57cda64860edfc38e3 diff --git a/ext/oui-blendish b/ext/oui-blendish new file mode 160000 index 00000000..ac99b8dd --- /dev/null +++ b/ext/oui-blendish @@ -0,0 +1 @@ +Subproject commit ac99b8dd4d36ac314dad6d700701e39484c60e06 diff --git a/include/widgets.hpp b/include/widgets.hpp index 63bf2fa9..c4f9cadf 100644 --- a/include/widgets.hpp +++ b/include/widgets.hpp @@ -3,7 +3,7 @@ #include #include "../ext/nanovg/src/nanovg.h" -#include "../ext/oui/blendish.h" +#include "../ext/oui-blendish/blendish.h" #include "../ext/nanosvg/src/nanosvg.h" #include "math.hpp" diff --git a/src/gui.cpp b/src/gui.cpp index 1bfa4355..8ae7dc47 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -13,7 +13,7 @@ #define NANOVG_FBO_VALID 1 #include "../ext/nanovg/src/nanovg_gl_utils.h" #define BLENDISH_IMPLEMENTATION -#include "../ext/oui/blendish.h" +#include "../ext/oui-blendish/blendish.h" #define NANOSVG_IMPLEMENTATION #include "../ext/nanosvg/src/nanosvg.h"