From bfc87b50b1662b43d39f82fd5d570880a93ea58b Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 12 May 2017 17:55:18 -0500 Subject: [PATCH] Add missing nostalgia directory level in src tree --- src/CMakeLists.txt | 17 +---------------- src/nostalgia/CMakeLists.txt | 18 ++++++++++++++++++ src/{ => nostalgia}/Makefile | 0 src/{ => nostalgia}/common/CMakeLists.txt | 0 src/{ => nostalgia}/common/bounds.cpp | 0 src/{ => nostalgia}/common/bounds.hpp | 0 src/{ => nostalgia}/common/common.hpp | 0 src/{ => nostalgia}/common/point.cpp | 0 src/{ => nostalgia}/common/point.hpp | 0 src/{ => nostalgia}/core/CMakeLists.txt | 0 src/{ => nostalgia}/core/core.cpp | 0 src/{ => nostalgia}/core/core.hpp | 0 src/{ => nostalgia}/core/gba/addresses.hpp | 0 src/{ => nostalgia}/core/gba/gba.hpp | 0 src/{ => nostalgia}/core/gba/gfx.cpp | 0 src/{ => nostalgia}/core/gba/media.cpp | 0 src/{ => nostalgia}/core/gba/media.hpp | 0 src/{ => nostalgia}/core/gfx.hpp | 0 src/{ => nostalgia}/core/qt/gfx.cpp | 0 src/{ => nostalgia}/player/CMakeLists.txt | 0 src/{ => nostalgia}/player/main.cpp | 2 +- src/{ => nostalgia}/studio/CMakeLists.txt | 0 src/{ => nostalgia}/studio/json/CMakeLists.txt | 0 src/{ => nostalgia}/studio/json/json.hpp | 0 .../studio/json/json_operator.hpp | 0 src/{ => nostalgia}/studio/json/json_read.cpp | 0 src/{ => nostalgia}/studio/json/json_read.hpp | 0 src/{ => nostalgia}/studio/json/json_write.cpp | 0 src/{ => nostalgia}/studio/json/json_write.hpp | 0 src/{ => nostalgia}/studio/json/test.cpp | 0 src/{ => nostalgia}/studio/lib/CMakeLists.txt | 0 src/{ => nostalgia}/studio/lib/newwizard.cpp | 0 src/{ => nostalgia}/studio/lib/newwizard.hpp | 0 .../studio/lib/oxfstreeview.cpp | 0 .../studio/lib/oxfstreeview.hpp | 0 src/{ => nostalgia}/studio/lib/project.cpp | 0 src/{ => nostalgia}/studio/lib/project.hpp | 0 src/{ => nostalgia}/studio/main.cpp | 0 src/{ => nostalgia}/studio/mainwindow.cpp | 0 src/{ => nostalgia}/studio/mainwindow.hpp | 0 src/{ => nostalgia}/studio/profile.json | 0 src/{ => nostalgia}/tools/CMakeLists.txt | 0 src/{ => nostalgia}/tools/pack.cpp | 4 ++-- 43 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 src/nostalgia/CMakeLists.txt rename src/{ => nostalgia}/Makefile (100%) rename src/{ => nostalgia}/common/CMakeLists.txt (100%) rename src/{ => nostalgia}/common/bounds.cpp (100%) rename src/{ => nostalgia}/common/bounds.hpp (100%) rename src/{ => nostalgia}/common/common.hpp (100%) rename src/{ => nostalgia}/common/point.cpp (100%) rename src/{ => nostalgia}/common/point.hpp (100%) rename src/{ => nostalgia}/core/CMakeLists.txt (100%) rename src/{ => nostalgia}/core/core.cpp (100%) rename src/{ => nostalgia}/core/core.hpp (100%) rename src/{ => nostalgia}/core/gba/addresses.hpp (100%) rename src/{ => nostalgia}/core/gba/gba.hpp (100%) rename src/{ => nostalgia}/core/gba/gfx.cpp (100%) rename src/{ => nostalgia}/core/gba/media.cpp (100%) rename src/{ => nostalgia}/core/gba/media.hpp (100%) rename src/{ => nostalgia}/core/gfx.hpp (100%) rename src/{ => nostalgia}/core/qt/gfx.cpp (100%) rename src/{ => nostalgia}/player/CMakeLists.txt (100%) rename src/{ => nostalgia}/player/main.cpp (92%) rename src/{ => nostalgia}/studio/CMakeLists.txt (100%) rename src/{ => nostalgia}/studio/json/CMakeLists.txt (100%) rename src/{ => nostalgia}/studio/json/json.hpp (100%) rename src/{ => nostalgia}/studio/json/json_operator.hpp (100%) rename src/{ => nostalgia}/studio/json/json_read.cpp (100%) rename src/{ => nostalgia}/studio/json/json_read.hpp (100%) rename src/{ => nostalgia}/studio/json/json_write.cpp (100%) rename src/{ => nostalgia}/studio/json/json_write.hpp (100%) rename src/{ => nostalgia}/studio/json/test.cpp (100%) rename src/{ => nostalgia}/studio/lib/CMakeLists.txt (100%) rename src/{ => nostalgia}/studio/lib/newwizard.cpp (100%) rename src/{ => nostalgia}/studio/lib/newwizard.hpp (100%) rename src/{ => nostalgia}/studio/lib/oxfstreeview.cpp (100%) rename src/{ => nostalgia}/studio/lib/oxfstreeview.hpp (100%) rename src/{ => nostalgia}/studio/lib/project.cpp (100%) rename src/{ => nostalgia}/studio/lib/project.hpp (100%) rename src/{ => nostalgia}/studio/main.cpp (100%) rename src/{ => nostalgia}/studio/mainwindow.cpp (100%) rename src/{ => nostalgia}/studio/mainwindow.hpp (100%) rename src/{ => nostalgia}/studio/profile.json (100%) rename src/{ => nostalgia}/tools/CMakeLists.txt (100%) rename src/{ => nostalgia}/tools/pack.cpp (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 979d15b0..2a7fd1df 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,20 +1,5 @@ cmake_minimum_required(VERSION 2.8.11) -#setup libraries - -if(NOT WOMBAT_BUILD_TYPE STREQUAL "GBA") - find_package(Qt5Widgets) -endif() - -#project packages - include_directories(".") -add_subdirectory(core) -add_subdirectory(common) -add_subdirectory(player) - -if(NOT WOMBAT_BUILD_TYPE STREQUAL "GBA") - add_subdirectory(tools) - add_subdirectory(studio) -endif() +add_subdirectory(nostalgia) diff --git a/src/nostalgia/CMakeLists.txt b/src/nostalgia/CMakeLists.txt new file mode 100644 index 00000000..3d786d71 --- /dev/null +++ b/src/nostalgia/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required(VERSION 2.8.11) + +#setup libraries + +if(NOT WOMBAT_BUILD_TYPE STREQUAL "GBA") + find_package(Qt5Widgets) +endif() + +#project packages + +add_subdirectory(core) +add_subdirectory(common) +add_subdirectory(player) + +if(NOT WOMBAT_BUILD_TYPE STREQUAL "GBA") + add_subdirectory(tools) + add_subdirectory(studio) +endif() diff --git a/src/Makefile b/src/nostalgia/Makefile similarity index 100% rename from src/Makefile rename to src/nostalgia/Makefile diff --git a/src/common/CMakeLists.txt b/src/nostalgia/common/CMakeLists.txt similarity index 100% rename from src/common/CMakeLists.txt rename to src/nostalgia/common/CMakeLists.txt diff --git a/src/common/bounds.cpp b/src/nostalgia/common/bounds.cpp similarity index 100% rename from src/common/bounds.cpp rename to src/nostalgia/common/bounds.cpp diff --git a/src/common/bounds.hpp b/src/nostalgia/common/bounds.hpp similarity index 100% rename from src/common/bounds.hpp rename to src/nostalgia/common/bounds.hpp diff --git a/src/common/common.hpp b/src/nostalgia/common/common.hpp similarity index 100% rename from src/common/common.hpp rename to src/nostalgia/common/common.hpp diff --git a/src/common/point.cpp b/src/nostalgia/common/point.cpp similarity index 100% rename from src/common/point.cpp rename to src/nostalgia/common/point.cpp diff --git a/src/common/point.hpp b/src/nostalgia/common/point.hpp similarity index 100% rename from src/common/point.hpp rename to src/nostalgia/common/point.hpp diff --git a/src/core/CMakeLists.txt b/src/nostalgia/core/CMakeLists.txt similarity index 100% rename from src/core/CMakeLists.txt rename to src/nostalgia/core/CMakeLists.txt diff --git a/src/core/core.cpp b/src/nostalgia/core/core.cpp similarity index 100% rename from src/core/core.cpp rename to src/nostalgia/core/core.cpp diff --git a/src/core/core.hpp b/src/nostalgia/core/core.hpp similarity index 100% rename from src/core/core.hpp rename to src/nostalgia/core/core.hpp diff --git a/src/core/gba/addresses.hpp b/src/nostalgia/core/gba/addresses.hpp similarity index 100% rename from src/core/gba/addresses.hpp rename to src/nostalgia/core/gba/addresses.hpp diff --git a/src/core/gba/gba.hpp b/src/nostalgia/core/gba/gba.hpp similarity index 100% rename from src/core/gba/gba.hpp rename to src/nostalgia/core/gba/gba.hpp diff --git a/src/core/gba/gfx.cpp b/src/nostalgia/core/gba/gfx.cpp similarity index 100% rename from src/core/gba/gfx.cpp rename to src/nostalgia/core/gba/gfx.cpp diff --git a/src/core/gba/media.cpp b/src/nostalgia/core/gba/media.cpp similarity index 100% rename from src/core/gba/media.cpp rename to src/nostalgia/core/gba/media.cpp diff --git a/src/core/gba/media.hpp b/src/nostalgia/core/gba/media.hpp similarity index 100% rename from src/core/gba/media.hpp rename to src/nostalgia/core/gba/media.hpp diff --git a/src/core/gfx.hpp b/src/nostalgia/core/gfx.hpp similarity index 100% rename from src/core/gfx.hpp rename to src/nostalgia/core/gfx.hpp diff --git a/src/core/qt/gfx.cpp b/src/nostalgia/core/qt/gfx.cpp similarity index 100% rename from src/core/qt/gfx.cpp rename to src/nostalgia/core/qt/gfx.cpp diff --git a/src/player/CMakeLists.txt b/src/nostalgia/player/CMakeLists.txt similarity index 100% rename from src/player/CMakeLists.txt rename to src/nostalgia/player/CMakeLists.txt diff --git a/src/player/main.cpp b/src/nostalgia/player/main.cpp similarity index 92% rename from src/player/main.cpp rename to src/nostalgia/player/main.cpp index f405b349..9b30a539 100644 --- a/src/player/main.cpp +++ b/src/nostalgia/player/main.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "core/core.hpp" +#include using namespace nostalgia; diff --git a/src/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt similarity index 100% rename from src/studio/CMakeLists.txt rename to src/nostalgia/studio/CMakeLists.txt diff --git a/src/studio/json/CMakeLists.txt b/src/nostalgia/studio/json/CMakeLists.txt similarity index 100% rename from src/studio/json/CMakeLists.txt rename to src/nostalgia/studio/json/CMakeLists.txt diff --git a/src/studio/json/json.hpp b/src/nostalgia/studio/json/json.hpp similarity index 100% rename from src/studio/json/json.hpp rename to src/nostalgia/studio/json/json.hpp diff --git a/src/studio/json/json_operator.hpp b/src/nostalgia/studio/json/json_operator.hpp similarity index 100% rename from src/studio/json/json_operator.hpp rename to src/nostalgia/studio/json/json_operator.hpp diff --git a/src/studio/json/json_read.cpp b/src/nostalgia/studio/json/json_read.cpp similarity index 100% rename from src/studio/json/json_read.cpp rename to src/nostalgia/studio/json/json_read.cpp diff --git a/src/studio/json/json_read.hpp b/src/nostalgia/studio/json/json_read.hpp similarity index 100% rename from src/studio/json/json_read.hpp rename to src/nostalgia/studio/json/json_read.hpp diff --git a/src/studio/json/json_write.cpp b/src/nostalgia/studio/json/json_write.cpp similarity index 100% rename from src/studio/json/json_write.cpp rename to src/nostalgia/studio/json/json_write.cpp diff --git a/src/studio/json/json_write.hpp b/src/nostalgia/studio/json/json_write.hpp similarity index 100% rename from src/studio/json/json_write.hpp rename to src/nostalgia/studio/json/json_write.hpp diff --git a/src/studio/json/test.cpp b/src/nostalgia/studio/json/test.cpp similarity index 100% rename from src/studio/json/test.cpp rename to src/nostalgia/studio/json/test.cpp diff --git a/src/studio/lib/CMakeLists.txt b/src/nostalgia/studio/lib/CMakeLists.txt similarity index 100% rename from src/studio/lib/CMakeLists.txt rename to src/nostalgia/studio/lib/CMakeLists.txt diff --git a/src/studio/lib/newwizard.cpp b/src/nostalgia/studio/lib/newwizard.cpp similarity index 100% rename from src/studio/lib/newwizard.cpp rename to src/nostalgia/studio/lib/newwizard.cpp diff --git a/src/studio/lib/newwizard.hpp b/src/nostalgia/studio/lib/newwizard.hpp similarity index 100% rename from src/studio/lib/newwizard.hpp rename to src/nostalgia/studio/lib/newwizard.hpp diff --git a/src/studio/lib/oxfstreeview.cpp b/src/nostalgia/studio/lib/oxfstreeview.cpp similarity index 100% rename from src/studio/lib/oxfstreeview.cpp rename to src/nostalgia/studio/lib/oxfstreeview.cpp diff --git a/src/studio/lib/oxfstreeview.hpp b/src/nostalgia/studio/lib/oxfstreeview.hpp similarity index 100% rename from src/studio/lib/oxfstreeview.hpp rename to src/nostalgia/studio/lib/oxfstreeview.hpp diff --git a/src/studio/lib/project.cpp b/src/nostalgia/studio/lib/project.cpp similarity index 100% rename from src/studio/lib/project.cpp rename to src/nostalgia/studio/lib/project.cpp diff --git a/src/studio/lib/project.hpp b/src/nostalgia/studio/lib/project.hpp similarity index 100% rename from src/studio/lib/project.hpp rename to src/nostalgia/studio/lib/project.hpp diff --git a/src/studio/main.cpp b/src/nostalgia/studio/main.cpp similarity index 100% rename from src/studio/main.cpp rename to src/nostalgia/studio/main.cpp diff --git a/src/studio/mainwindow.cpp b/src/nostalgia/studio/mainwindow.cpp similarity index 100% rename from src/studio/mainwindow.cpp rename to src/nostalgia/studio/mainwindow.cpp diff --git a/src/studio/mainwindow.hpp b/src/nostalgia/studio/mainwindow.hpp similarity index 100% rename from src/studio/mainwindow.hpp rename to src/nostalgia/studio/mainwindow.hpp diff --git a/src/studio/profile.json b/src/nostalgia/studio/profile.json similarity index 100% rename from src/studio/profile.json rename to src/nostalgia/studio/profile.json diff --git a/src/tools/CMakeLists.txt b/src/nostalgia/tools/CMakeLists.txt similarity index 100% rename from src/tools/CMakeLists.txt rename to src/nostalgia/tools/CMakeLists.txt diff --git a/src/tools/pack.cpp b/src/nostalgia/tools/pack.cpp similarity index 98% rename from src/tools/pack.cpp rename to src/nostalgia/tools/pack.cpp index 921a5933..ee2c1334 100644 --- a/src/tools/pack.cpp +++ b/src/nostalgia/tools/pack.cpp @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include #include