diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:44:40 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:44:40 +1000 |
| commit | 2b47a0708602b45b0b5db120a496bf92232aa4b1 (patch) | |
| tree | 6c5965b6bf1d109b853efe64777bbc7ee5548882 /src/gwin/sys_defs.h | |
| parent | c06bff3304ed234c3a7f96fd049755ac59228ef7 (diff) | |
| parent | 0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478 (diff) | |
| download | uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.tar.gz uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.tar.bz2 uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.zip | |
Merge branch 'master' into newmouse
Diffstat (limited to 'src/gwin/sys_defs.h')
| -rw-r--r-- | src/gwin/sys_defs.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/gwin/sys_defs.h b/src/gwin/sys_defs.h index 4b103d11..5e08f7a2 100644 --- a/src/gwin/sys_defs.h +++ b/src/gwin/sys_defs.h @@ -950,25 +950,26 @@ extern "C" { /* Include widgets */ #if GWIN_NEED_WIDGET || defined(__DOXYGEN__) - #include "src/gwin/gwidget.h" + #include "gwin_widget.h" #endif /* Include containers */ #if GWIN_NEED_CONTAINERS || defined(__DOXYGEN__) - #include "src/gwin/gcontainer.h" + #include "gwin_container.h" #endif /* Include vanilla window objects */ #if GWIN_NEED_CONSOLE || defined(__DOXYGEN__) - #include "src/gwin/console.h" + #include "gwin_console.h" #endif - #if GWIN_NEED_GRAPH || defined(__DOXYGEN__) - #include "src/gwin/graph.h" + #include "gwin_graph.h" #endif - #if GWIN_NEED_IMAGE || defined(__DOXYGEN__) - #include "src/gwin/gimage.h" + #include "gwin_image.h" + #endif + #if GWIN_NEED_GL3D || defined(__DOXYGEN__) + #include "gwin_gl3d.h" #endif #endif /* GFX_USE_GWIN */ |