diff options
| -rw-r--r-- | Applications/IRCClient/Makefile | 2 | ||||
| -rwxr-xr-x | Kernel/makeall.sh | 4 | ||||
| -rwxr-xr-x | Kernel/sync.sh | 2 | ||||
| -rw-r--r-- | LibGUI/Makefile | 2 | ||||
| -rw-r--r-- | Servers/WindowServer/.gitignore (renamed from WindowServer/.gitignore) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/Makefile (renamed from WindowServer/Makefile) | 18 | ||||
| -rw-r--r-- | Servers/WindowServer/WSAPITypes.h (renamed from WindowServer/WSAPITypes.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSClientConnection.cpp (renamed from WindowServer/WSClientConnection.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSClientConnection.h (renamed from WindowServer/WSClientConnection.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSClipboard.cpp (renamed from WindowServer/WSClipboard.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSClipboard.h (renamed from WindowServer/WSClipboard.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMenu.cpp (renamed from WindowServer/WSMenu.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMenu.h (renamed from WindowServer/WSMenu.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMenuBar.cpp (renamed from WindowServer/WSMenuBar.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMenuBar.h (renamed from WindowServer/WSMenuBar.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMenuItem.cpp (renamed from WindowServer/WSMenuItem.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMenuItem.h (renamed from WindowServer/WSMenuItem.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMessage.h (renamed from WindowServer/WSMessage.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMessageLoop.cpp (renamed from WindowServer/WSMessageLoop.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMessageLoop.h (renamed from WindowServer/WSMessageLoop.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMessageReceiver.cpp (renamed from WindowServer/WSMessageReceiver.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSMessageReceiver.h (renamed from WindowServer/WSMessageReceiver.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSScreen.cpp (renamed from WindowServer/WSScreen.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSScreen.h (renamed from WindowServer/WSScreen.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSWindow.cpp (renamed from WindowServer/WSWindow.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSWindow.h (renamed from WindowServer/WSWindow.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSWindowManager.cpp (renamed from WindowServer/WSWindowManager.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSWindowManager.h (renamed from WindowServer/WSWindowManager.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSWindowSwitcher.cpp (renamed from WindowServer/WSWindowSwitcher.cpp) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSWindowSwitcher.h (renamed from WindowServer/WSWindowSwitcher.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/WSWindowType.h (renamed from WindowServer/WSWindowType.h) | 0 | ||||
| -rw-r--r-- | Servers/WindowServer/main.cpp (renamed from WindowServer/main.cpp) | 0 |
32 files changed, 14 insertions, 14 deletions
diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile index e5e34c15b4..ae25037cf1 100644 --- a/Applications/IRCClient/Makefile +++ b/Applications/IRCClient/Makefile @@ -16,7 +16,7 @@ STANDARD_FLAGS = -std=c++17 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough FLAVOR_FLAGS = -fno-exceptions -fno-rtti OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I. -I../../LibC +INCLUDE_FLAGS = -I../../Servers -I../.. -I. -I../../LibC DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh index 4307dac728..20f0c6335f 100755 --- a/Kernel/makeall.sh +++ b/Kernel/makeall.sh @@ -14,8 +14,8 @@ $make_cmd -C ../LibM clean && \ $make_cmd -C ../LibM clean && \ $make_cmd -C ../Servers/LookupServer clean && \ $make_cmd -C ../Servers/LookupServer && \ -$make_cmd -C ../WindowServer clean && \ -$make_cmd -C ../WindowServer && \ +$make_cmd -C ../Servers/WindowServer clean && \ +$make_cmd -C ../Servers/WindowServer && \ $make_cmd -C ../LibGUI clean && \ $make_cmd -C ../LibGUI && \ $make_cmd -C ../Userland clean && \ diff --git a/Kernel/sync.sh b/Kernel/sync.sh index 0edbe8fefa..ce77c795b8 100755 --- a/Kernel/sync.sh +++ b/Kernel/sync.sh @@ -89,7 +89,7 @@ cp -v ../Applications/TextEditor/TextEditor mnt/bin/TextEditor cp -v ../Applications/IRCClient/IRCClient mnt/bin/IRCClient ln -s IRCClient mnt/bin/irc cp -v ../Servers/LookupServer/LookupServer mnt/bin/LookupServer -cp -v ../WindowServer/WindowServer mnt/bin/WindowServer +cp -v ../Servers/WindowServer/WindowServer mnt/bin/WindowServer cp -v kernel.map mnt/ sh sync-local.sh umount mnt diff --git a/LibGUI/Makefile b/LibGUI/Makefile index d0479b07bf..9648deb7fa 100644 --- a/LibGUI/Makefile +++ b/LibGUI/Makefile @@ -56,7 +56,7 @@ STANDARD_FLAGS = -std=c++17 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough FLAVOR_FLAGS = -fno-exceptions -fno-rtti OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../LibC -I.. -I. +INCLUDE_FLAGS = -I../LibC -I../Servers -I.. -I. DEFINES = -DSERENITY -DUSERLAND -DSANITIZE_PTRS -DLIBGUI diff --git a/WindowServer/.gitignore b/Servers/WindowServer/.gitignore index 7d04c54152..7d04c54152 100644 --- a/WindowServer/.gitignore +++ b/Servers/WindowServer/.gitignore diff --git a/WindowServer/Makefile b/Servers/WindowServer/Makefile index 13602d8edb..b09160983b 100644 --- a/WindowServer/Makefile +++ b/Servers/WindowServer/Makefile @@ -1,11 +1,11 @@ SHAREDGRAPHICS_OBJS = \ - ../SharedGraphics/Painter.o \ - ../SharedGraphics/Font.o \ - ../SharedGraphics/Rect.o \ - ../SharedGraphics/GraphicsBitmap.o \ - ../SharedGraphics/CharacterBitmap.o \ - ../SharedGraphics/DisjointRectSet.o \ - ../SharedGraphics/Color.o + ../../SharedGraphics/Painter.o \ + ../../SharedGraphics/Font.o \ + ../../SharedGraphics/Rect.o \ + ../../SharedGraphics/GraphicsBitmap.o \ + ../../SharedGraphics/CharacterBitmap.o \ + ../../SharedGraphics/DisjointRectSet.o \ + ../../SharedGraphics/Color.o WINDOWSERVER_OBJS = \ WSMessageReceiver.o \ @@ -28,8 +28,8 @@ STANDARD_FLAGS = -std=c++17 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough FLAVOR_FLAGS = -fno-exceptions -fno-rtti OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I.. -I. -I../LibC -LDFLAGS = -L../LibC +INCLUDE_FLAGS = -I.. -I../.. -I. -I../../LibC +LDFLAGS = -L../../LibC DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND diff --git a/WindowServer/WSAPITypes.h b/Servers/WindowServer/WSAPITypes.h index 69f33c9612..69f33c9612 100644 --- a/WindowServer/WSAPITypes.h +++ b/Servers/WindowServer/WSAPITypes.h diff --git a/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp index b3b9c9ac51..b3b9c9ac51 100644 --- a/WindowServer/WSClientConnection.cpp +++ b/Servers/WindowServer/WSClientConnection.cpp diff --git a/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h index 06e643ed37..06e643ed37 100644 --- a/WindowServer/WSClientConnection.h +++ b/Servers/WindowServer/WSClientConnection.h diff --git a/WindowServer/WSClipboard.cpp b/Servers/WindowServer/WSClipboard.cpp index 1a7f8f2ea1..1a7f8f2ea1 100644 --- a/WindowServer/WSClipboard.cpp +++ b/Servers/WindowServer/WSClipboard.cpp diff --git a/WindowServer/WSClipboard.h b/Servers/WindowServer/WSClipboard.h index 6c29bb8cd8..6c29bb8cd8 100644 --- a/WindowServer/WSClipboard.h +++ b/Servers/WindowServer/WSClipboard.h diff --git a/WindowServer/WSMenu.cpp b/Servers/WindowServer/WSMenu.cpp index b8b457122f..b8b457122f 100644 --- a/WindowServer/WSMenu.cpp +++ b/Servers/WindowServer/WSMenu.cpp diff --git a/WindowServer/WSMenu.h b/Servers/WindowServer/WSMenu.h index e7e6c34ef0..e7e6c34ef0 100644 --- a/WindowServer/WSMenu.h +++ b/Servers/WindowServer/WSMenu.h diff --git a/WindowServer/WSMenuBar.cpp b/Servers/WindowServer/WSMenuBar.cpp index 6d642d160d..6d642d160d 100644 --- a/WindowServer/WSMenuBar.cpp +++ b/Servers/WindowServer/WSMenuBar.cpp diff --git a/WindowServer/WSMenuBar.h b/Servers/WindowServer/WSMenuBar.h index 7854795ed5..7854795ed5 100644 --- a/WindowServer/WSMenuBar.h +++ b/Servers/WindowServer/WSMenuBar.h diff --git a/WindowServer/WSMenuItem.cpp b/Servers/WindowServer/WSMenuItem.cpp index 49041e0034..49041e0034 100644 --- a/WindowServer/WSMenuItem.cpp +++ b/Servers/WindowServer/WSMenuItem.cpp diff --git a/WindowServer/WSMenuItem.h b/Servers/WindowServer/WSMenuItem.h index e3dce736f8..e3dce736f8 100644 --- a/WindowServer/WSMenuItem.h +++ b/Servers/WindowServer/WSMenuItem.h diff --git a/WindowServer/WSMessage.h b/Servers/WindowServer/WSMessage.h index 1b2ec1018c..1b2ec1018c 100644 --- a/WindowServer/WSMessage.h +++ b/Servers/WindowServer/WSMessage.h diff --git a/WindowServer/WSMessageLoop.cpp b/Servers/WindowServer/WSMessageLoop.cpp index a774317ab7..a774317ab7 100644 --- a/WindowServer/WSMessageLoop.cpp +++ b/Servers/WindowServer/WSMessageLoop.cpp diff --git a/WindowServer/WSMessageLoop.h b/Servers/WindowServer/WSMessageLoop.h index 752cd0d60c..752cd0d60c 100644 --- a/WindowServer/WSMessageLoop.h +++ b/Servers/WindowServer/WSMessageLoop.h diff --git a/WindowServer/WSMessageReceiver.cpp b/Servers/WindowServer/WSMessageReceiver.cpp index 20508c3005..20508c3005 100644 --- a/WindowServer/WSMessageReceiver.cpp +++ b/Servers/WindowServer/WSMessageReceiver.cpp diff --git a/WindowServer/WSMessageReceiver.h b/Servers/WindowServer/WSMessageReceiver.h index 97ee114c8c..97ee114c8c 100644 --- a/WindowServer/WSMessageReceiver.h +++ b/Servers/WindowServer/WSMessageReceiver.h diff --git a/WindowServer/WSScreen.cpp b/Servers/WindowServer/WSScreen.cpp index f491b014c6..f491b014c6 100644 --- a/WindowServer/WSScreen.cpp +++ b/Servers/WindowServer/WSScreen.cpp diff --git a/WindowServer/WSScreen.h b/Servers/WindowServer/WSScreen.h index 0d71f816ac..0d71f816ac 100644 --- a/WindowServer/WSScreen.h +++ b/Servers/WindowServer/WSScreen.h diff --git a/WindowServer/WSWindow.cpp b/Servers/WindowServer/WSWindow.cpp index c2e1435efb..c2e1435efb 100644 --- a/WindowServer/WSWindow.cpp +++ b/Servers/WindowServer/WSWindow.cpp diff --git a/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h index ff6ef6b5c8..ff6ef6b5c8 100644 --- a/WindowServer/WSWindow.h +++ b/Servers/WindowServer/WSWindow.h diff --git a/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp index a0f1e8c186..a0f1e8c186 100644 --- a/WindowServer/WSWindowManager.cpp +++ b/Servers/WindowServer/WSWindowManager.cpp diff --git a/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h index 55fbbdad31..55fbbdad31 100644 --- a/WindowServer/WSWindowManager.h +++ b/Servers/WindowServer/WSWindowManager.h diff --git a/WindowServer/WSWindowSwitcher.cpp b/Servers/WindowServer/WSWindowSwitcher.cpp index 8bee2c382e..8bee2c382e 100644 --- a/WindowServer/WSWindowSwitcher.cpp +++ b/Servers/WindowServer/WSWindowSwitcher.cpp diff --git a/WindowServer/WSWindowSwitcher.h b/Servers/WindowServer/WSWindowSwitcher.h index 418cb4481d..418cb4481d 100644 --- a/WindowServer/WSWindowSwitcher.h +++ b/Servers/WindowServer/WSWindowSwitcher.h diff --git a/WindowServer/WSWindowType.h b/Servers/WindowServer/WSWindowType.h index 7713495e0d..7713495e0d 100644 --- a/WindowServer/WSWindowType.h +++ b/Servers/WindowServer/WSWindowType.h diff --git a/WindowServer/main.cpp b/Servers/WindowServer/main.cpp index 31c7dd04ca..31c7dd04ca 100644 --- a/WindowServer/main.cpp +++ b/Servers/WindowServer/main.cpp |