Add missing nostalgia directory level in src tree

This commit is contained in:
Gary Talent 2017-05-12 17:55:18 -05:00
parent 1b9f8f40f4
commit bfc87b50b1
43 changed files with 22 additions and 19 deletions

View File

@ -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)

View File

@ -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()

View File

@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "core/core.hpp"
#include <nostalgia/core/core.hpp>
using namespace nostalgia;

View File

@ -10,8 +10,8 @@
#include <QColor>
#include <QImage>
#include <QMap>
#include <core/gba/gba.hpp>
#include <common/point.hpp>
#include <nostalgia/core/gba/gba.hpp>
#include <nostalgia/common/point.hpp>
#include <ox/clargs/clargs.hpp>
#include <ox/fs/filesystem.hpp>