libalx: new structure

13 files changed, 14 insertions, 15 deletions

diff --git a/libalx b/libalx
-Subproject 683a19b251a72cbed5b8a6d2ed368ae1642ed63
+Subproject 332b5f6a87a685b79cfae470ce6f1d700081c7e
diff --git a/modules/about/src/about.c b/modules/about/src/about.c
index ec6aac7..bc21f3e 100644
--- a/modules/about/src/about.c
+++ b/modules/about/src/about.c
@@ -10,7 +10,7 @@
 	#include <stdio.h>
 	#include <stdlib.h>
 /* libalx ------------------------------------------------------------------*/
-	#include "libalx/alx_file.h"
+	#include "libalx/io/alx_file.h"
 /* Project -------------------------------------------------------------------*/
 	#include "about.h"
 
diff --git a/modules/about/tmp/Makefile b/modules/about/tmp/Makefile
index 55afbaa..b46460f 100644
--- a/modules/about/tmp/Makefile
+++ b/modules/about/tmp/Makefile
@@ -14,7 +14,7 @@ SRC_DIR = $(ABOUT_DIR)/src/
 _ALL	= about.o
 ALL	= $(_ALL) about_mod.o
 
-ABOU_INC_LIBALX	= libalx/alx_file.h
+ABOU_INC_LIBALX	= libalx/io/alx_file.h
 ABOU_INC	= about.h
 ABOU_DEPS	= $(SRC_DIR)/about.c \
 			$(patsubst %,$(LIBALX_INC_DIR)/%,$(ABOU_INC_LIBALX)) \
diff --git a/modules/menu/src/menu_clui.c b/modules/menu/src/menu_clui.c
index ab81acf..582c90d 100644
--- a/modules/menu/src/menu_clui.c
+++ b/modules/menu/src/menu_clui.c
@@ -10,7 +10,7 @@
 	#include <math.h>
 	#include <stdlib.h>
 /* libalx --------------------------------------------------------------------*/
-	#include "libalx/alx_input.h"
+	#include "libalx/io/alx_input.h"
 /* Project -------------------------------------------------------------------*/
 	#include "about.h"
 	#include "game_iface.h"
diff --git a/modules/menu/src/menu_gui.c b/modules/menu/src/menu_gui.c
index 5383bfb..fdc40fc 100644
--- a/modules/menu/src/menu_gui.c
+++ b/modules/menu/src/menu_gui.c
@@ -13,7 +13,7 @@
 	#include <stdio.h>
 	#include <stdlib.h>
 /* libalx --------------------------------------------------------------------*/
-	#include "libalx/alx_input.h"
+	#include "libalx/io/alx_input.h"
 /* Project -------------------------------------------------------------------*/
 	#include "about.h"
 	#include "game_iface.h"
diff --git a/modules/menu/src/menu_tui.c b/modules/menu/src/menu_tui.c
index 4e73a5b..d864ffc 100644
--- a/modules/menu/src/menu_tui.c
+++ b/modules/menu/src/menu_tui.c
@@ -12,7 +12,7 @@
 	#include <stdbool.h>
 	#include <stdlib.h>
 /* libalx --------------------------------------------------------------------*/
-	#include "libalx/alx_ncur.h"
+	#include "libalx/curses/alx_ncur.h"
 /* Project -------------------------------------------------------------------*/
 	#include "about.h"
 	#include "game_iface.h"
diff --git a/modules/menu/tmp/Makefile b/modules/menu/tmp/Makefile
index 4304d65..ce766f4 100644
--- a/modules/menu/tmp/Makefile
+++ b/modules/menu/tmp/Makefile
@@ -54,7 +54,7 @@ MENUI_INC_DIRS	= -I $(INC_DIR) \
 			-I $(CTRL_INC_DIR) \
 			-I $(GAME_INC_DIR)
 
-MENUCLUI_INC_LIBALX	= libalx/alx_input.h
+MENUCLUI_INC_LIBALX	= libalx/io/alx_input.h
 MENUCLUI_INC_ABOUT	= about.h
 MENUCLUI_INC_CTRL	= start.h
 MENUCLUI_INC_GAME	= game_iface.h
@@ -74,7 +74,7 @@ MENUCLUI_INC_DIRS	= -I $(INC_DIR) \
 			-I $(GAME_INC_DIR) \
 			-I $(SAVE_INC_DIR)
 
-MENUTUI_INC_LIBALX	= libalx/alx_ncur.h
+MENUTUI_INC_LIBALX	= libalx/curses/alx_ncur.h
 MENUTUI_INC_ABOUT	= about.h
 MENUTUI_INC_CTRL	= start.h
 MENUTUI_INC_GAME	= game_iface.h
@@ -94,7 +94,7 @@ MENUTUI_INC_DIRS	= -I $(INC_DIR) \
 			-I $(GAME_INC_DIR) \
 			-I $(SAVE_INC_DIR)
 
-MENUGUI_INC_LIBALX	= libalx/alx_input.h
+MENUGUI_INC_LIBALX	= libalx/io/alx_input.h
 MENUGUI_INC_ABOUT	= about.h
 MENUGUI_INC_CTRL	= start.h
 MENUGUI_INC_GAME	= game_iface.h
diff --git a/modules/player/src/player_clui.c b/modules/player/src/player_clui.c
index 6afd8cd..9805cc2 100644
--- a/modules/player/src/player_clui.c
+++ b/modules/player/src/player_clui.c
@@ -9,7 +9,6 @@
 /* Standard C ----------------------------------------------------------------*/
 	#include <stdbool.h>
 	#include <stdio.h>
-	#include <wchar.h>
 /* Project -------------------------------------------------------------------*/
 	#include "game_iface.h"
 	#include "player_iface.h"
diff --git a/modules/player/src/player_gui.c b/modules/player/src/player_gui.c
index 5f1bc1f..9403384 100644
--- a/modules/player/src/player_gui.c
+++ b/modules/player/src/player_gui.c
@@ -13,7 +13,7 @@
 /* Packages ------------------------------------------------------------------*/
 	#include <gtk/gtk.h>
 /* libalx ------------------------------------------------------------------*/
-	#include "libalx/alx_input.h"
+	#include "libalx/io/alx_input.h"
 /* Project -------------------------------------------------------------------*/
 	#include "game_iface.h"
 	#include "menu_gui.h"
diff --git a/modules/player/src/player_tui.c b/modules/player/src/player_tui.c
index 4313d2f..86e91f2 100644
--- a/modules/player/src/player_tui.c
+++ b/modules/player/src/player_tui.c
@@ -9,7 +9,7 @@
 /* Standard C ----------------------------------------------------------------*/
 	#include <ncurses.h>
 /* libalx ------------------------------------------------------------------*/
-	#include "libalx/alx_ncur.h"
+	#include "libalx/curses/alx_ncur.h"
 /* Project -------------------------------------------------------------------*/
 	#include "game_iface.h"
 
diff --git a/modules/player/tmp/Makefile b/modules/player/tmp/Makefile
index 0aae428..bd3c714 100644
--- a/modules/player/tmp/Makefile
+++ b/modules/player/tmp/Makefile
@@ -33,7 +33,7 @@ PLAYCLUI_DEPS		= $(SRC_DIR)/player_clui.c \
 PLAYCLUI_INC_DIRS	= -I $(INC_DIR) \
 				-I $(GAME_INC_DIR)
 
-PLAYTUI_INC_LIBALX	= libalx/alx_ncur.h
+PLAYTUI_INC_LIBALX	= libalx/curses/alx_ncur.h
 PLAYTUI_INC_GAME	= game_iface.h
 PLAYTUI_INC		= player_tui.h	player_iface.h
 PLAYTUI_DEPS		= $(SRC_DIR)/player_tui.c \
@@ -44,7 +44,7 @@ PLAYTUI_INC_DIRS	= -I $(INC_DIR) \
 				-I $(LIBALX_INC_DIR) \
 				-I $(GAME_INC_DIR)
 
-PLAYGUI_INC_LIBALX	= libalx/alx_input.h
+PLAYGUI_INC_LIBALX	= libalx/io/alx_input.h
 PLAYGUI_INC_GAME	= game_iface.h
 PLAYGUI_INC_MENU	= menu_gui.h
 PLAYGUI_INC		= player_gui.h	player_iface.h
diff --git a/src/main.c b/src/main.c
index 3107faf..ed9aa83 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,7 +10,7 @@
 
 	#include <gtk/gtk.h>
 
-	#include "libalx/alx_ncur.h"
+	#include "libalx/curses/alx_ncur.h"
 
 	#include "about.h"
 	#include "game.h"
diff --git a/tmp/Makefile b/tmp/Makefile
index b323a91..363d0ca 100644
--- a/tmp/Makefile
+++ b/tmp/Makefile
@@ -30,7 +30,7 @@ SRC_DIR	= $(MAIN_DIR)/src/
 
 ALL = main.o
 
-MAIN_INC_LIBALX	= libalx/alx_ncur.h
+MAIN_INC_LIBALX	= libalx/curses/alx_ncur.h
 MAIN_INC_ABOUT	= about.h
 MAIN_INC_CTRL	= start.h
 MAIN_INC_GAME	= game.h