Browse Source

Update submodules, convert oui-blendish to git submodule

tags/v0.3.0
Andrew Belt 7 years ago
parent
commit
e511823809
6 changed files with 8 additions and 4 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -1
      ext/nanosvg
  3. +1
    -1
      ext/nanovg
  4. +1
    -0
      ext/oui-blendish
  5. +1
    -1
      include/widgets.hpp
  6. +1
    -1
      src/gui.cpp

+ 3
- 0
.gitmodules View File

@@ -10,3 +10,6 @@
[submodule "ext/osdialog"] [submodule "ext/osdialog"]
path = ext/osdialog path = ext/osdialog
url = https://github.com/AndrewBelt/osdialog.git url = https://github.com/AndrewBelt/osdialog.git
[submodule "ext/oui-blendish"]
path = ext/oui-blendish
url = https://github.com/AndrewBelt/oui-blendish.git

+ 1
- 1
ext/nanosvg

@@ -1 +1 @@
Subproject commit dc12d90586a8ab99da0c575aafff999666aa5d55
Subproject commit 9a74da4db5ac74083e444010d75114658581b9c7

+ 1
- 1
ext/nanovg

@@ -1 +1 @@
Subproject commit c629efbfa6ca90035d6625dfa3586048a9c3201f
Subproject commit a2784bad3a077ced36ee9b57cda64860edfc38e3

+ 1
- 0
ext/oui-blendish

@@ -0,0 +1 @@
Subproject commit ac99b8dd4d36ac314dad6d700701e39484c60e06

+ 1
- 1
include/widgets.hpp View File

@@ -3,7 +3,7 @@
#include <memory> #include <memory>


#include "../ext/nanovg/src/nanovg.h" #include "../ext/nanovg/src/nanovg.h"
#include "../ext/oui/blendish.h"
#include "../ext/oui-blendish/blendish.h"
#include "../ext/nanosvg/src/nanosvg.h" #include "../ext/nanosvg/src/nanosvg.h"


#include "math.hpp" #include "math.hpp"


+ 1
- 1
src/gui.cpp View File

@@ -13,7 +13,7 @@
#define NANOVG_FBO_VALID 1 #define NANOVG_FBO_VALID 1
#include "../ext/nanovg/src/nanovg_gl_utils.h" #include "../ext/nanovg/src/nanovg_gl_utils.h"
#define BLENDISH_IMPLEMENTATION #define BLENDISH_IMPLEMENTATION
#include "../ext/oui/blendish.h"
#include "../ext/oui-blendish/blendish.h"
#define NANOSVG_IMPLEMENTATION #define NANOSVG_IMPLEMENTATION
#include "../ext/nanosvg/src/nanosvg.h" #include "../ext/nanosvg/src/nanosvg.h"




Loading…
Cancel
Save