diff options
Diffstat (limited to 'lib/nes')
22 files changed, 33 insertions, 28 deletions
diff --git a/lib/nes/app/application.hh b/lib/nes/app/application.hh index ddeff85..66b5206 100644 --- a/lib/nes/app/application.hh +++ b/lib/nes/app/application.hh @@ -7,7 +7,7 @@ #include "nes/app/ui/screen-error.hh" #include "nes/app/ui/screen-confirm-quit.hh" #include "nes/sys/nes.hh" -#include "nes/common/box.hh" +#include "nes/common/containers/box.hh" #include "nes/common/display.hh" #include "nes/common/types.hh" #include <chrono> diff --git a/lib/nes/app/file-browser.hh b/lib/nes/app/file-browser.hh index d956c80..1fc7616 100644 --- a/lib/nes/app/file-browser.hh +++ b/lib/nes/app/file-browser.hh @@ -1,7 +1,7 @@ #pragma once +#include "nes/common/containers/span.hh" #include "nes/common/types.hh" -#include "nes/common/span.hh" #include "nes/common/status.hh" #include <string_view> diff --git a/lib/nes/app/graphics/renderer.hh b/lib/nes/app/graphics/renderer.hh index 83cafb3..d4d7cc4 100644 --- a/lib/nes/app/graphics/renderer.hh +++ b/lib/nes/app/graphics/renderer.hh @@ -1,9 +1,9 @@ #pragma once -#include "nes/common/types.hh" #include "nes/app/graphics/color.hh" #include "nes/app/graphics/text-attributes.hh" -#include "nes/common/string-builder.hh" +#include "nes/common/containers/string-builder.hh" +#include "nes/common/types.hh" #include <string_view> namespace nes diff --git a/lib/nes/app/input/input-buffer.hh b/lib/nes/app/input/input-buffer.hh index 319cfa9..755a5c7 100644 --- a/lib/nes/app/input/input-buffer.hh +++ b/lib/nes/app/input/input-buffer.hh @@ -1,7 +1,7 @@ #pragma once #include "nes/app/input/key.hh" -#include "nes/common/list.hh" +#include "nes/common/containers/list.hh" namespace nes::app { diff --git a/lib/nes/app/input/input-device-controller.hh b/lib/nes/app/input/input-device-controller.hh index b4e6570..69dd2a8 100644 --- a/lib/nes/app/input/input-device-controller.hh +++ b/lib/nes/app/input/input-device-controller.hh @@ -1,7 +1,7 @@ #pragma once #include "nes/app/input/input-device.hh" -#include "nes/common/list.hh" +#include "nes/common/containers/list.hh" #include <string_view> namespace nes::app diff --git a/lib/nes/app/input/input-manager.hh b/lib/nes/app/input/input-manager.hh index 8bc75b8..b0b60e8 100644 --- a/lib/nes/app/input/input-manager.hh +++ b/lib/nes/app/input/input-manager.hh @@ -2,7 +2,7 @@ #include "nes/app/input/input-device-keyboard.hh" #include "nes/app/input/input-device-controller.hh" -#include "nes/common/list.hh" +#include "nes/common/containers/list.hh" #include "nes/common/types.hh" namespace nes::app diff --git a/lib/nes/app/ui/screen-browser.cc b/lib/nes/app/ui/screen-browser.cc index a82e96d..4643e1c 100644 --- a/lib/nes/app/ui/screen-browser.cc +++ b/lib/nes/app/ui/screen-browser.cc @@ -3,7 +3,7 @@ #include "nes/app/graphics/color.hh" #include "nes/app/graphics/tiles/icons.hh" #include "nes/app/input/input-device-keyboard.hh" -#include "nes/common/path-view.hh" +#include "nes/common/containers/path-view.hh" namespace nes::app { diff --git a/lib/nes/common/CMakeLists.txt b/lib/nes/common/CMakeLists.txt index a5703ff..3920d36 100644 --- a/lib/nes/common/CMakeLists.txt +++ b/lib/nes/common/CMakeLists.txt @@ -4,14 +4,7 @@ target_sources( types.hh debug.hh rgb.hh - list.hh - box.hh display.hh - string-builder.hh - string-builder.cc - path-view.hh - path-view.cc - path-builder.hh - path-builder.cc - span.hh - status.hh)
\ No newline at end of file + status.hh) + +add_subdirectory(containers)
\ No newline at end of file diff --git a/lib/nes/common/containers/CMakeLists.txt b/lib/nes/common/containers/CMakeLists.txt new file mode 100644 index 0000000..351772f --- /dev/null +++ b/lib/nes/common/containers/CMakeLists.txt @@ -0,0 +1,12 @@ +target_sources( + nes + PRIVATE + box.hh + list.hh + path-builder.hh + path-builder.cc + path-view.hh + path-view.cc + span.hh + string-builder.hh + string-builder.cc)
\ No newline at end of file diff --git a/lib/nes/common/box.hh b/lib/nes/common/containers/box.hh index 7bf2848..7bf2848 100644 --- a/lib/nes/common/box.hh +++ b/lib/nes/common/containers/box.hh diff --git a/lib/nes/common/list.hh b/lib/nes/common/containers/list.hh index 46f7027..46f7027 100644 --- a/lib/nes/common/list.hh +++ b/lib/nes/common/containers/list.hh diff --git a/lib/nes/common/path-builder.cc b/lib/nes/common/containers/path-builder.cc index b66226f..2e3ce07 100644 --- a/lib/nes/common/path-builder.cc +++ b/lib/nes/common/containers/path-builder.cc @@ -1,4 +1,4 @@ -#include "nes/common/path-builder.hh" +#include "nes/common/containers/path-builder.hh" namespace nes { diff --git a/lib/nes/common/path-builder.hh b/lib/nes/common/containers/path-builder.hh index e7980ea..2991a83 100644 --- a/lib/nes/common/path-builder.hh +++ b/lib/nes/common/containers/path-builder.hh @@ -1,8 +1,8 @@ #pragma once +#include "nes/common/containers/span.hh" +#include "nes/common/containers/path-view.hh" #include "nes/common/types.hh" -#include "nes/common/span.hh" -#include "nes/common/path-view.hh" #include "nes/common/status.hh" #include <string_view> diff --git a/lib/nes/common/path-view.cc b/lib/nes/common/containers/path-view.cc index 743c060..c81668b 100644 --- a/lib/nes/common/path-view.cc +++ b/lib/nes/common/containers/path-view.cc @@ -1,4 +1,4 @@ -#include "nes/common/path-view.hh" +#include "nes/common/containers/path-view.hh" #include "nes/common/debug.hh" namespace nes diff --git a/lib/nes/common/path-view.hh b/lib/nes/common/containers/path-view.hh index 7741060..7741060 100644 --- a/lib/nes/common/path-view.hh +++ b/lib/nes/common/containers/path-view.hh diff --git a/lib/nes/common/span.hh b/lib/nes/common/containers/span.hh index 6779c37..6779c37 100644 --- a/lib/nes/common/span.hh +++ b/lib/nes/common/containers/span.hh diff --git a/lib/nes/common/string-builder.cc b/lib/nes/common/containers/string-builder.cc index 7747aaa..74d9548 100644 --- a/lib/nes/common/string-builder.cc +++ b/lib/nes/common/containers/string-builder.cc @@ -1,4 +1,4 @@ -#include "nes/common/string-builder.hh" +#include "nes/common/containers/string-builder.hh" namespace nes { diff --git a/lib/nes/common/string-builder.hh b/lib/nes/common/containers/string-builder.hh index 0298b8e..0f8a64c 100644 --- a/lib/nes/common/string-builder.hh +++ b/lib/nes/common/containers/string-builder.hh @@ -1,7 +1,7 @@ #pragma once #include "nes/common/types.hh" -#include "nes/common/span.hh" +#include "nes/common/containers/span.hh" #include "nes/common/status.hh" #include <string_view> diff --git a/lib/nes/sys/cartridge.hh b/lib/nes/sys/cartridge.hh index 4534e1e..680b829 100644 --- a/lib/nes/sys/cartridge.hh +++ b/lib/nes/sys/cartridge.hh @@ -1,9 +1,9 @@ #pragma once #include "nes/sys/mapper.hh" +#include "nes/common/containers/span.hh" #include "nes/common/status.hh" #include "nes/common/types.hh" -#include "nes/common/span.hh" namespace nes::sys { diff --git a/lib/nes/sys/mapper.hh b/lib/nes/sys/mapper.hh index 48363dd..f4b4c26 100644 --- a/lib/nes/sys/mapper.hh +++ b/lib/nes/sys/mapper.hh @@ -1,9 +1,9 @@ #pragma once #include "nes/sys/types/address.hh" +#include "nes/common/containers/span.hh" #include "nes/common/status.hh" #include "nes/common/types.hh" -#include "nes/common/span.hh" namespace nes::sys { diff --git a/lib/nes/sys/nes.hh b/lib/nes/sys/nes.hh index 187b940..2533cbb 100644 --- a/lib/nes/sys/nes.hh +++ b/lib/nes/sys/nes.hh @@ -5,7 +5,7 @@ #include "nes/sys/controller.hh" #include "nes/sys/cpu.hh" #include "nes/sys/ppu.hh" -#include "nes/common/span.hh" +#include "nes/common/containers/span.hh" namespace nes { diff --git a/lib/nes/sys/ppu.hh b/lib/nes/sys/ppu.hh index 7774669..5697081 100644 --- a/lib/nes/sys/ppu.hh +++ b/lib/nes/sys/ppu.hh @@ -1,8 +1,8 @@ #pragma once #include "nes/sys/types/cycle-count.hh" +#include "nes/common/containers/span.hh" #include "nes/common/types.hh" -#include "nes/common/span.hh" namespace nes { |