diff --git a/CMakeLists.txt b/CMakeLists.txt index f898b259c3..ee76985fe8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,6 +148,5 @@ add_subdirectory(Kernel) add_subdirectory(Libraries) add_subdirectory(Services) add_subdirectory(Applications) -add_subdirectory(Games) add_subdirectory(DevTools) add_subdirectory(Userland) diff --git a/Userland/CMakeLists.txt b/Userland/CMakeLists.txt index e4a736e08a..5375a36ec9 100644 --- a/Userland/CMakeLists.txt +++ b/Userland/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(Demos) add_subdirectory(DynamicLoader) +add_subdirectory(Games) add_subdirectory(MenuApplets) add_subdirectory(Shell) add_subdirectory(Tests) diff --git a/Games/2048/BoardView.cpp b/Userland/Games/2048/BoardView.cpp similarity index 100% rename from Games/2048/BoardView.cpp rename to Userland/Games/2048/BoardView.cpp diff --git a/Games/2048/BoardView.h b/Userland/Games/2048/BoardView.h similarity index 100% rename from Games/2048/BoardView.h rename to Userland/Games/2048/BoardView.h diff --git a/Games/2048/CMakeLists.txt b/Userland/Games/2048/CMakeLists.txt similarity index 100% rename from Games/2048/CMakeLists.txt rename to Userland/Games/2048/CMakeLists.txt diff --git a/Games/2048/Game.cpp b/Userland/Games/2048/Game.cpp similarity index 100% rename from Games/2048/Game.cpp rename to Userland/Games/2048/Game.cpp diff --git a/Games/2048/Game.h b/Userland/Games/2048/Game.h similarity index 100% rename from Games/2048/Game.h rename to Userland/Games/2048/Game.h diff --git a/Games/2048/GameSizeDialog.cpp b/Userland/Games/2048/GameSizeDialog.cpp similarity index 100% rename from Games/2048/GameSizeDialog.cpp rename to Userland/Games/2048/GameSizeDialog.cpp diff --git a/Games/2048/GameSizeDialog.h b/Userland/Games/2048/GameSizeDialog.h similarity index 100% rename from Games/2048/GameSizeDialog.h rename to Userland/Games/2048/GameSizeDialog.h diff --git a/Games/2048/main.cpp b/Userland/Games/2048/main.cpp similarity index 100% rename from Games/2048/main.cpp rename to Userland/Games/2048/main.cpp diff --git a/Games/Breakout/CMakeLists.txt b/Userland/Games/Breakout/CMakeLists.txt similarity index 100% rename from Games/Breakout/CMakeLists.txt rename to Userland/Games/Breakout/CMakeLists.txt diff --git a/Games/Breakout/Game.cpp b/Userland/Games/Breakout/Game.cpp similarity index 100% rename from Games/Breakout/Game.cpp rename to Userland/Games/Breakout/Game.cpp diff --git a/Games/Breakout/Game.h b/Userland/Games/Breakout/Game.h similarity index 100% rename from Games/Breakout/Game.h rename to Userland/Games/Breakout/Game.h diff --git a/Games/Breakout/LevelSelectDialog.cpp b/Userland/Games/Breakout/LevelSelectDialog.cpp similarity index 100% rename from Games/Breakout/LevelSelectDialog.cpp rename to Userland/Games/Breakout/LevelSelectDialog.cpp diff --git a/Games/Breakout/LevelSelectDialog.h b/Userland/Games/Breakout/LevelSelectDialog.h similarity index 100% rename from Games/Breakout/LevelSelectDialog.h rename to Userland/Games/Breakout/LevelSelectDialog.h diff --git a/Games/Breakout/main.cpp b/Userland/Games/Breakout/main.cpp similarity index 100% rename from Games/Breakout/main.cpp rename to Userland/Games/Breakout/main.cpp diff --git a/Games/CMakeLists.txt b/Userland/Games/CMakeLists.txt similarity index 100% rename from Games/CMakeLists.txt rename to Userland/Games/CMakeLists.txt diff --git a/Games/Chess/CMakeLists.txt b/Userland/Games/Chess/CMakeLists.txt similarity index 100% rename from Games/Chess/CMakeLists.txt rename to Userland/Games/Chess/CMakeLists.txt diff --git a/Games/Chess/ChessWidget.cpp b/Userland/Games/Chess/ChessWidget.cpp similarity index 100% rename from Games/Chess/ChessWidget.cpp rename to Userland/Games/Chess/ChessWidget.cpp diff --git a/Games/Chess/ChessWidget.h b/Userland/Games/Chess/ChessWidget.h similarity index 100% rename from Games/Chess/ChessWidget.h rename to Userland/Games/Chess/ChessWidget.h diff --git a/Games/Chess/Engine.cpp b/Userland/Games/Chess/Engine.cpp similarity index 100% rename from Games/Chess/Engine.cpp rename to Userland/Games/Chess/Engine.cpp diff --git a/Games/Chess/Engine.h b/Userland/Games/Chess/Engine.h similarity index 100% rename from Games/Chess/Engine.h rename to Userland/Games/Chess/Engine.h diff --git a/Games/Chess/PromotionDialog.cpp b/Userland/Games/Chess/PromotionDialog.cpp similarity index 100% rename from Games/Chess/PromotionDialog.cpp rename to Userland/Games/Chess/PromotionDialog.cpp diff --git a/Games/Chess/PromotionDialog.h b/Userland/Games/Chess/PromotionDialog.h similarity index 100% rename from Games/Chess/PromotionDialog.h rename to Userland/Games/Chess/PromotionDialog.h diff --git a/Games/Chess/main.cpp b/Userland/Games/Chess/main.cpp similarity index 100% rename from Games/Chess/main.cpp rename to Userland/Games/Chess/main.cpp diff --git a/Games/Conway/CMakeLists.txt b/Userland/Games/Conway/CMakeLists.txt similarity index 100% rename from Games/Conway/CMakeLists.txt rename to Userland/Games/Conway/CMakeLists.txt diff --git a/Games/Conway/Game.cpp b/Userland/Games/Conway/Game.cpp similarity index 100% rename from Games/Conway/Game.cpp rename to Userland/Games/Conway/Game.cpp diff --git a/Games/Conway/Game.h b/Userland/Games/Conway/Game.h similarity index 100% rename from Games/Conway/Game.h rename to Userland/Games/Conway/Game.h diff --git a/Games/Conway/main.cpp b/Userland/Games/Conway/main.cpp similarity index 100% rename from Games/Conway/main.cpp rename to Userland/Games/Conway/main.cpp diff --git a/Games/Minesweeper/CMakeLists.txt b/Userland/Games/Minesweeper/CMakeLists.txt similarity index 100% rename from Games/Minesweeper/CMakeLists.txt rename to Userland/Games/Minesweeper/CMakeLists.txt diff --git a/Games/Minesweeper/Field.cpp b/Userland/Games/Minesweeper/Field.cpp similarity index 100% rename from Games/Minesweeper/Field.cpp rename to Userland/Games/Minesweeper/Field.cpp diff --git a/Games/Minesweeper/Field.h b/Userland/Games/Minesweeper/Field.h similarity index 100% rename from Games/Minesweeper/Field.h rename to Userland/Games/Minesweeper/Field.h diff --git a/Games/Minesweeper/main.cpp b/Userland/Games/Minesweeper/main.cpp similarity index 100% rename from Games/Minesweeper/main.cpp rename to Userland/Games/Minesweeper/main.cpp diff --git a/Games/Pong/CMakeLists.txt b/Userland/Games/Pong/CMakeLists.txt similarity index 100% rename from Games/Pong/CMakeLists.txt rename to Userland/Games/Pong/CMakeLists.txt diff --git a/Games/Pong/Game.cpp b/Userland/Games/Pong/Game.cpp similarity index 100% rename from Games/Pong/Game.cpp rename to Userland/Games/Pong/Game.cpp diff --git a/Games/Pong/Game.h b/Userland/Games/Pong/Game.h similarity index 100% rename from Games/Pong/Game.h rename to Userland/Games/Pong/Game.h diff --git a/Games/Pong/main.cpp b/Userland/Games/Pong/main.cpp similarity index 100% rename from Games/Pong/main.cpp rename to Userland/Games/Pong/main.cpp diff --git a/Games/Snake/CMakeLists.txt b/Userland/Games/Snake/CMakeLists.txt similarity index 100% rename from Games/Snake/CMakeLists.txt rename to Userland/Games/Snake/CMakeLists.txt diff --git a/Games/Snake/SnakeGame.cpp b/Userland/Games/Snake/SnakeGame.cpp similarity index 100% rename from Games/Snake/SnakeGame.cpp rename to Userland/Games/Snake/SnakeGame.cpp diff --git a/Games/Snake/SnakeGame.h b/Userland/Games/Snake/SnakeGame.h similarity index 100% rename from Games/Snake/SnakeGame.h rename to Userland/Games/Snake/SnakeGame.h diff --git a/Games/Snake/main.cpp b/Userland/Games/Snake/main.cpp similarity index 100% rename from Games/Snake/main.cpp rename to Userland/Games/Snake/main.cpp diff --git a/Games/Solitaire/CMakeLists.txt b/Userland/Games/Solitaire/CMakeLists.txt similarity index 100% rename from Games/Solitaire/CMakeLists.txt rename to Userland/Games/Solitaire/CMakeLists.txt diff --git a/Games/Solitaire/Card.cpp b/Userland/Games/Solitaire/Card.cpp similarity index 100% rename from Games/Solitaire/Card.cpp rename to Userland/Games/Solitaire/Card.cpp diff --git a/Games/Solitaire/Card.h b/Userland/Games/Solitaire/Card.h similarity index 100% rename from Games/Solitaire/Card.h rename to Userland/Games/Solitaire/Card.h diff --git a/Games/Solitaire/CardStack.cpp b/Userland/Games/Solitaire/CardStack.cpp similarity index 100% rename from Games/Solitaire/CardStack.cpp rename to Userland/Games/Solitaire/CardStack.cpp diff --git a/Games/Solitaire/CardStack.h b/Userland/Games/Solitaire/CardStack.h similarity index 100% rename from Games/Solitaire/CardStack.h rename to Userland/Games/Solitaire/CardStack.h diff --git a/Games/Solitaire/SolitaireWidget.cpp b/Userland/Games/Solitaire/SolitaireWidget.cpp similarity index 100% rename from Games/Solitaire/SolitaireWidget.cpp rename to Userland/Games/Solitaire/SolitaireWidget.cpp diff --git a/Games/Solitaire/SolitaireWidget.h b/Userland/Games/Solitaire/SolitaireWidget.h similarity index 100% rename from Games/Solitaire/SolitaireWidget.h rename to Userland/Games/Solitaire/SolitaireWidget.h diff --git a/Games/Solitaire/main.cpp b/Userland/Games/Solitaire/main.cpp similarity index 100% rename from Games/Solitaire/main.cpp rename to Userland/Games/Solitaire/main.cpp