diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-01-16 16:03:50 +0100 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-01-16 16:03:50 +0100 |
| commit | f7ca6d254d452e3524aaeaa1334ac041be3a1279 (patch) | |
| tree | 165f54aa32eafbfd79003eb686770370f585c14d /Kernel/Makefile | |
| parent | e655aebd70bb7d248c2f7be4a12d695ceec707a5 (diff) | |
| download | serenity-f7ca6d254d452e3524aaeaa1334ac041be3a1279.zip | |
Tear out or duplicate what's unique for WindowServer from Widgets.
This turned into a huge refactoring that somehow also includes
making locks recursive/reentrant.
Diffstat (limited to 'Kernel/Makefile')
| -rw-r--r-- | Kernel/Makefile | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/Kernel/Makefile b/Kernel/Makefile index 149cffa46c..580a921618 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -30,7 +30,7 @@ KERNEL_OBJS = \ ELFLoader.o \ KSyms.o \ PS2MouseDevice.o \ - WindowServer.o + GUIEventDevice.o VFS_OBJS = \ ../VirtualFileSystem/DiskDevice.o \ @@ -46,21 +46,20 @@ VFS_OBJS = \ ../VirtualFileSystem/FileDescriptor.o \ ../VirtualFileSystem/SyntheticFileSystem.o -WIDGETS_OBJS = \ - ../Widgets/Window.o \ - ../Widgets/Painter.o \ - ../Widgets/WindowManager.o \ - ../Widgets/FrameBuffer.o \ - ../Widgets/GraphicsBitmap.o \ - ../Widgets/Object.o \ +WINDOWSERVER_OBJS = \ ../Widgets/Rect.o \ - ../Widgets/Widget.o \ + ../Widgets/Painter.o \ ../Widgets/Font.o \ ../Widgets/Color.o \ ../Widgets/CharacterBitmap.o \ - ../Widgets/EventLoop.o \ - ../Widgets/AbstractScreen.o \ - ../Widgets/GUIEventDevice.o \ + ../Widgets/GraphicsBitmap.o \ + ../WindowServer/WSEventReceiver.o \ + ../WindowServer/WSEventLoop.o \ + ../WindowServer/WSWindow.o \ + ../WindowServer/WSWindowManager.o \ + ../WindowServer/WSFrameBuffer.o \ + ../WindowServer/WSScreen.o \ + ../WindowServer/main.o AK_OBJS = \ ../AK/String.o \ @@ -68,7 +67,7 @@ AK_OBJS = \ ../AK/StringBuilder.o \ ../AK/FileSystemPath.o -OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS) $(WIDGETS_OBJS) +OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS) $(WINDOWSERVER_OBJS) NASM = nasm KERNEL = kernel |