diff --git a/makefile.lst b/makefile.lst index 2a04d69a2..15f048908 100644 --- a/makefile.lst +++ b/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 \ diff --git a/misc/deps.sh b/misc/deps.sh index 9ad5267d9..42be744f4 100644 --- a/misc/deps.sh +++ b/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 \ diff --git a/misc/dist.sh b/misc/dist.sh index 82d93e9e3..20e104484 100644 --- a/misc/dist.sh +++ b/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 \ diff --git a/src/ase_exception.h b/src/ase_exception.h index a8ac0534e..0f80141ee 100644 --- a/src/ase_exception.h +++ b/src/ase_exception.h @@ -21,7 +21,7 @@ #include #include -#include "console/console.h" +#include "console.h" class ase_exception : public std::exception { diff --git a/src/commands/cmd_configure_screen.cpp b/src/commands/cmd_configure_screen.cpp index 99af48247..b786a0b9a 100644 --- a/src/commands/cmd_configure_screen.cpp +++ b/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" diff --git a/src/commands/cmd_duplicate_layer.cpp b/src/commands/cmd_duplicate_layer.cpp index c75add5c6..c2126b13b 100644 --- a/src/commands/cmd_duplicate_layer.cpp +++ b/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" diff --git a/src/commands/cmd_new_cel.cpp b/src/commands/cmd_new_cel.cpp index 7db993236..6288dd88b 100644 --- a/src/commands/cmd_new_cel.cpp +++ b/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" diff --git a/src/commands/cmd_new_file.cpp b/src/commands/cmd_new_file.cpp index 6c0c627ec..1b1a8ef28 100644 --- a/src/commands/cmd_new_file.cpp +++ b/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" diff --git a/src/commands/cmd_new_frame.cpp b/src/commands/cmd_new_frame.cpp index 3a93b7ac3..4bd9dce4b 100644 --- a/src/commands/cmd_new_frame.cpp +++ b/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" diff --git a/src/commands/cmd_open_file.cpp b/src/commands/cmd_open_file.cpp index 91911c95a..d694d28ea 100644 --- a/src/commands/cmd_open_file.cpp +++ b/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" diff --git a/src/commands/cmd_save_file.cpp b/src/commands/cmd_save_file.cpp index 0bceb0de0..5289779a6 100644 --- a/src/commands/cmd_save_file.cpp +++ b/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" diff --git a/src/commands/commands.cpp b/src/commands/commands.cpp index 99d7d0d1e..1edd6db3e 100644 --- a/src/commands/commands.cpp +++ b/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; diff --git a/src/commands/fx/cmd_color_curve.cpp b/src/commands/fx/cmd_color_curve.cpp index 7abe63362..b568b55cd 100644 --- a/src/commands/fx/cmd_color_curve.cpp +++ b/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" diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp index 3a9d9bde4..f871a63ef 100644 --- a/src/commands/fx/cmd_convolution_matrix.cpp +++ b/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" diff --git a/src/commands/fx/cmd_despeckle.cpp b/src/commands/fx/cmd_despeckle.cpp index 2749b1be3..1cf072d7c 100644 --- a/src/commands/fx/cmd_despeckle.cpp +++ b/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" diff --git a/src/commands/fx/cmd_invert_color.cpp b/src/commands/fx/cmd_invert_color.cpp index 96db51fbd..f90300320 100644 --- a/src/commands/fx/cmd_invert_color.cpp +++ b/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" diff --git a/src/commands/fx/cmd_replace_color.cpp b/src/commands/fx/cmd_replace_color.cpp index e11a2a5dd..43b9e7caf 100644 --- a/src/commands/fx/cmd_replace_color.cpp +++ b/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" diff --git a/src/console/console.cpp b/src/console.cpp similarity index 100% rename from src/console/console.cpp rename to src/console.cpp diff --git a/src/console/console.h b/src/console.h similarity index 100% rename from src/console/console.h rename to src/console.h diff --git a/src/core/app.cpp b/src/core/app.cpp index 5e2b5a888..811a0b5f2 100644 --- a/src/core/app.cpp +++ b/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" diff --git a/src/dialogs/drawtext.cpp b/src/dialogs/drawtext.cpp index 05486626b..7f34ac97c 100644 --- a/src/dialogs/drawtext.cpp +++ b/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" diff --git a/src/dialogs/tips.cpp b/src/dialogs/tips.cpp index 783b674a6..4ce6b8dfe 100644 --- a/src/dialogs/tips.cpp +++ b/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" diff --git a/src/effect/effect.cpp b/src/effect/effect.cpp index e86924d03..dbe0608d2 100644 --- a/src/effect/effect.cpp +++ b/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" diff --git a/src/file/file.cpp b/src/file/file.cpp index 72252f0e4..e1f174b5a 100644 --- a/src/file/file.cpp +++ b/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" diff --git a/src/modules/gfx.cpp b/src/modules/gfx.cpp index c8fff7395..304a3d72c 100644 --- a/src/modules/gfx.cpp +++ b/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" diff --git a/src/modules/gui.cpp b/src/modules/gui.cpp index b5d1cfc77..cd1542ddc 100644 --- a/src/modules/gui.cpp +++ b/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" diff --git a/src/modules/rootmenu.cpp b/src/modules/rootmenu.cpp index 3d3d4f339..6fc93cd63 100644 --- a/src/modules/rootmenu.cpp +++ b/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" diff --git a/src/util/celmove.cpp b/src/util/celmove.cpp index 0fc582886..683d8c6ef 100644 --- a/src/util/celmove.cpp +++ b/src/util/celmove.cpp @@ -22,7 +22,7 @@ #include #include "sprite_wrappers.h" -#include "console/console.h" +#include "console.h" #include "core/app.h" #include "core/color.h" #include "core/core.h" diff --git a/src/util/clipboard.cpp b/src/util/clipboard.cpp index 754f20e62..261218801 100644 --- a/src/util/clipboard.cpp +++ b/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" diff --git a/src/util/quantize.cpp b/src/util/quantize.cpp index 39aef2361..9c9e88dc2 100644 --- a/src/util/quantize.cpp +++ b/src/util/quantize.cpp @@ -20,7 +20,7 @@ #include -#include "console/console.h" +#include "console.h" #include "effect/effect.h" #include "modules/sprites.h" #include "raster/image.h" diff --git a/src/widgets/fileview.cpp b/src/widgets/fileview.cpp index 386de8288..28a5b6733 100644 --- a/src/widgets/fileview.cpp +++ b/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"