1 files changed, 7 insertions, 24 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 054ab4823..02a7240f1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -720,11 +720,13 @@ SET(SRCS
     notifications.h
     notifymanager.cpp
     notifymanager.h
+    render/graphicsdef.hpp
     render/graphics_calcImageRect.hpp
     render/graphics_drawImageRect.hpp
     render/nullopenglgraphics.cpp
     render/nullopenglgraphics.h
     render/openglgraphicsdef.hpp
+    render/openglgraphicsdefadvanced.hpp
     render/renderers.cpp
     render/renderers.h
     render/rendererslistsdl.h
@@ -757,6 +759,7 @@ SET(SRCS
     render/sdl2softwaregraphics.h
     render/sdlgraphics.cpp
     render/sdlgraphics.h
+    render/softwaregraphicsdef.hpp
     sdlshared.h
     shopitem.cpp
     shopitem.h
@@ -790,13 +793,12 @@ SET(SRCS
     walklayer.h
     events/actionevent.h
     listeners/actionlistener.h
-    gui/base/basiccontainer.hpp
+    gui/widgets/basiccontainer.h
     gui/cliprect.h
     gui/color.h
     listeners/deathlistener.h
     events/event.h
     listeners/focuslistener.h
-    gui/base/gui.hpp
     events/inputguievent.h
     input/key.h
     events/keyevent.h
@@ -811,33 +813,14 @@ SET(SRCS
     utils/sdlpixel.h
     gui/widgets/widget.h
     listeners/widgetlistener.h
-    gui/base/widgets/button.hpp
-    gui/base/widgets/checkbox.hpp
-    gui/base/widgets/container.hpp
-    gui/base/widgets/label.hpp
-    gui/base/widgets/listbox.hpp
-    gui/base/widgets/radiobutton.hpp
-    gui/base/widgets/scrollarea.hpp
-    gui/base/widgets/slider.hpp
-    gui/base/widgets/textbox.hpp
-    gui/base/widgets/textfield.hpp
-    gui/base/basiccontainer.cpp
+    gui/widgets/basiccontainer2.h
+    gui/widgets/basiccontainer.cpp
     gui/cliprect.cpp
     gui/color.cpp
-    gui/base/gui.cpp
     input/key.cpp
     gui/rect.cpp
     gui/widgets/widget.cpp
-    gui/base/widgets/button.cpp
-    gui/base/widgets/checkbox.cpp
-    gui/base/widgets/container.cpp
-    gui/base/widgets/label.cpp
-    gui/base/widgets/listbox.cpp
-    gui/base/widgets/radiobutton.cpp
-    gui/base/widgets/scrollarea.cpp
-    gui/base/widgets/slider.cpp
-    gui/base/widgets/textbox.cpp
-    gui/base/widgets/textfield.cpp
+    gui/widgets/basiccontainer2.cpp
     )
 
 SET(SRCS_EVOL