Remove types.hpp from core

This commit is contained in:
Gary Talent 2016-12-24 03:19:37 -06:00
parent e61a141081
commit 175fac3292
5 changed files with 6 additions and 41 deletions

View File

@ -11,7 +11,7 @@
namespace nostalgia { namespace nostalgia {
namespace core { namespace core {
Error init() { ox::std::Error init() {
auto err = initGfx(); auto err = initGfx();
return err; return err;
} }

View File

@ -11,7 +11,7 @@
namespace nostalgia { namespace nostalgia {
namespace core { namespace core {
Error init(); ox::std::Error init();
} }
} }

View File

@ -6,13 +6,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <ox/std/types.hpp>
#include "registers.hpp" #include "registers.hpp"
#include "../types.hpp"
namespace nostalgia { namespace nostalgia {
namespace core { namespace core {
Error initGfx() { ox::std::Error initGfx() {
/* Sprite Mode ----\ */ /* Sprite Mode ----\ */
/* ---\| */ /* ---\| */
/* Background 2 -\|| */ /* Background 2 -\|| */

View File

@ -6,12 +6,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include "types.hpp" #include <ox/std/types.hpp>
namespace nostalgia { namespace nostalgia {
namespace core { namespace core {
Error initGfx(); ox::std::Error initGfx();
} }
} }

View File

@ -1,35 +0,0 @@
/*
* Copyright 2016 gtalent2@gmail.com
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef NOSTALGIA_CORE_TYPES_HPP
#define NOSTALGIA_CORE_TYPES_HPP
namespace nostalgia {
namespace core {
typedef char int8_t;
typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short uint16_t;
typedef int int32_t;
typedef unsigned int uint32_t;
typedef unsigned uint_t;
typedef long long int64_t;
typedef unsigned long long uint64_t;
typedef uint32_t Error;
#ifdef _LP64
typedef uint64_t size_t;
#elif _LP32
typedef uint32_t size_t;
#endif
}
}
#endif