Moved console.* from src/console to src/

makefile.lst

@@ -78,7 +78,6 @@ COMMON_SOURCES =					\
 	src/commands/fx/cmd_invert_color.cpp		\
 	src/commands/fx/cmd_replace_color.cpp		\
 	src/commands/fx/effectbg.cpp			\
-	src/console/console.cpp				\
 	src/core/app.cpp				\
 	src/core/cfg.cpp				\
 	src/core/color.cpp				\
@@ -233,6 +232,7 @@ COMMON_OBJS = $(addprefix $(OBJ_DIR)/,				\
 	          $(notdir $(basename $(COMMON_SOURCES)))))
 
 ASE_SOURCES = \
+	src/console.cpp						\
 	src/context.cpp						\
 	src/main.cpp						\
 	src/ui_context.cpp					\

misc/deps.sh

@@ -17,7 +17,6 @@ $GCC $CFLAGS							     \
     src/*.cpp							     \
     src/commands/*.cpp						     \
     src/commands/fx/*.cpp					     \
-    src/console/*.cpp						     \
     src/core/*.cpp						     \
     src/dialogs/*.cpp						     \
     src/effect/*.cpp						     \

misc/dist.sh

@@ -92,8 +92,6 @@ ase_files="config.h				\
 	   src/commands/*.h			\
 	   src/commands/fx/*.cpp		\
 	   src/commands/fx/*.h			\
-	   src/console/*.cpp			\
-	   src/console/*.h			\
 	   src/core/*.cpp			\
 	   src/core/*.h				\
 	   src/dialogs/*.cpp			\

src/ase_exception.h

@@ -21,7 +21,7 @@
 
 #include <exception>
 #include <string>
-#include "console/console.h"
+#include "console.h"
 
 class ase_exception : public std::exception
 {

src/commands/cmd_configure_screen.cpp

@@ -23,7 +23,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "dialogs/options.h"
 #include "modules/gui.h"

src/commands/cmd_duplicate_layer.cpp

@@ -21,7 +21,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "modules/gui.h"
 #include "modules/sprites.h"

src/commands/cmd_new_cel.cpp

@@ -21,7 +21,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/color.h"
 #include "modules/gui.h"
 #include "modules/sprites.h"

src/commands/cmd_new_file.cpp

@@ -26,7 +26,7 @@
 
 #include "ui_context.h"
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/cfg.h"
 #include "core/color.h"

src/commands/cmd_new_frame.cpp

@@ -22,7 +22,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/color.h"
 #include "core/app.h"
 #include "modules/gui.h"

src/commands/cmd_open_file.cpp

@@ -25,7 +25,7 @@
 
 #include "ui_context.h"
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "dialogs/filesel.h"
 #include "file/file.h"

src/commands/cmd_save_file.cpp

@@ -24,7 +24,7 @@
 
 #include "commands/commands.h"
 #include "core/app.h"
-#include "console/console.h"
+#include "console.h"
 #include "dialogs/filesel.h"
 #include "file/file.h"
 #include "modules/gui.h"

src/commands/commands.cpp

@@ -25,7 +25,7 @@
 
 #include "jinete/jinete.h"
 
-#include "console/console.h"
+#include "console.h"
 #include "commands/commands.h"
 
 extern Command cmd_about;

src/commands/fx/cmd_color_curve.cpp

@@ -22,7 +22,7 @@
 
 #include "commands/commands.h"
 #include "commands/fx/effectbg.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/cfg.h"
 #include "core/color.h"

src/commands/fx/cmd_convolution_matrix.cpp

@@ -33,7 +33,7 @@
 
 #include "commands/commands.h"
 #include "commands/fx/effectbg.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "core/core.h"

src/commands/fx/cmd_despeckle.cpp

@@ -29,7 +29,7 @@
 
 #include "commands/commands.h"
 #include "commands/fx/effectbg.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/cfg.h"
 #include "core/core.h"
 #include "effect/effect.h"

src/commands/fx/cmd_invert_color.cpp

@@ -28,7 +28,7 @@
 
 #include "commands/commands.h"
 #include "commands/fx/effectbg.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/cfg.h"
 #include "core/color.h"
 #include "core/core.h"

src/commands/fx/cmd_replace_color.cpp

@@ -24,7 +24,7 @@
 
 #include "commands/commands.h"
 #include "commands/fx/effectbg.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/cfg.h"
 #include "core/color.h"

src/core/app.cpp

@@ -33,7 +33,7 @@
 #include "ase_exception.h"
 #include "ui_context.h"
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/cfg.h"
 #include "core/core.h"

src/dialogs/drawtext.cpp

@@ -22,7 +22,7 @@
 
 #include "jinete/jinete.h"
 
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/cfg.h"
 #include "core/color.h"

src/dialogs/tips.cpp

@@ -25,7 +25,7 @@
 
 #include "jinete/jinete.h"
 
-#include "console/console.h"
+#include "console.h"
 #include "core/cfg.h"
 #include "core/dirs.h"
 #include "intl/intl.h"

src/effect/effect.cpp

@@ -27,7 +27,7 @@
 #include "jinete/jview.h"
 #include "jinete/jwidget.h"
 
-#include "console/console.h"
+#include "console.h"
 #include "core/cfg.h"
 #include "effect/colcurve.h"
 #include "effect/convmatr.h"

src/file/file.cpp

@@ -26,7 +26,7 @@
 #include "jinete/jlist.h"
 #include "jinete/jmutex.h"
 
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/core.h"
 #include "file/file.h"

src/modules/gfx.cpp

@@ -25,7 +25,7 @@
 #include "jinete/jsystem.h"
 #include "jinete/jtheme.h"
 
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/cfg.h"
 #include "core/dirs.h"

src/modules/gui.cpp

@@ -34,7 +34,7 @@
 
 #include "ui_context.h"
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/cfg.h"
 #include "core/core.h"

src/modules/rootmenu.cpp

@@ -25,7 +25,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/core.h"
 #include "core/dirs.h"

src/util/celmove.cpp

@@ -22,7 +22,7 @@
 #include <jinete/jlist.h>
 
 #include "sprite_wrappers.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/color.h"
 #include "core/core.h"

src/util/clipboard.cpp

@@ -25,7 +25,7 @@
 #include "jinete/jinete.h"
 
 #include "sprite_wrappers.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "core/core.h"
 #include "modules/editors.h"

src/util/quantize.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/color.h>
 
-#include "console/console.h"
+#include "console.h"
 #include "effect/effect.h"
 #include "modules/sprites.h"
 #include "raster/image.h"

src/widgets/fileview.cpp

@@ -25,7 +25,7 @@
 #include "jinete/jinete.h"
 
 #include "commands/commands.h"
-#include "console/console.h"
+#include "console.h"
 #include "core/app.h"
 #include "dialogs/filesel.h"
 #include "file/file.h"