diff options
Diffstat (limited to 'source/modules/asura-utils')
| -rw-r--r-- | source/modules/asura-utils/math/matrix44.cpp | 1 | ||||
| -rw-r--r-- | source/modules/asura-utils/type.h | 62 | ||||
| -rw-r--r-- | source/modules/asura-utils/utils_config.h | 3 |
3 files changed, 5 insertions, 61 deletions
diff --git a/source/modules/asura-utils/math/matrix44.cpp b/source/modules/asura-utils/math/matrix44.cpp index 39fc1de..4472cd8 100644 --- a/source/modules/asura-utils/math/matrix44.cpp +++ b/source/modules/asura-utils/math/matrix44.cpp @@ -57,7 +57,6 @@ namespace AsuraEngine // | e1 e5 e9 e13 | // | e2 e6 e10 e14 | // | e3 e7 e11 e15 | - // ҳ˾ת Matrix44 Matrix44::operator * (const Matrix44 & m) const { diff --git a/source/modules/asura-utils/type.h b/source/modules/asura-utils/type.h index c2c6d7c..2976d3e 100644 --- a/source/modules/asura-utils/type.h +++ b/source/modules/asura-utils/type.h @@ -4,6 +4,8 @@ #include <cstdlib> #include <stdint.h> +#include "asura-base/config.h" + namespace AsuraEngine { @@ -27,66 +29,6 @@ namespace AsuraEngine typedef const char cc8; - //--------------------------------------------------------------------------------// - -#ifndef ASSERT - #ifdef NDEBUG - #define ASSERT(x) { false ? (void)(x) : (void)0; } - #else - #ifdef _WIN32 - #define ASURA_DEBUG_BREAK() __debugbreak() - #else - #define ASURA_DEBUG_BREAK() raise(SIGTRAP) - #endif - #define ASSERT(x) do { const volatile bool asura_assert_b____ = !(x); if(asura_assert_b____) ASURA_DEBUG_BREAK(); } while (false) - #endif -#endif - - //--------------------------------------------------------------------------------// - -#ifdef _WIN32 - #define ASURA_FINAL final - #define ASURA_LIBRARY_EXPORT __declspec(dllexport) - #define ASURA_LIBRARY_IMPORT __declspec(dllimport) - #define ASURA_FORCE_INLINE __forceinline - #define ASURA_RESTRICT __restrict - #define ASURA_ATTRIBUTE_USED - #define ASURA_ABSTRACT - #define ASURA_API ASURA_LIBRARY_EXPORT - - #define ASURA_WINDOWS 1 -#else - #define ASURA_FINAL final - #define ASURA_LIBRARY_EXPORT __attribute__((visibility("default"))) - #define ASURA_LIBRARY_IMPORT - #define ASURA_FORCE_INLINE __attribute__((always_inline)) inline - #define ASURA_RESTRICT __restrict__ - #define ASURA_ATTRIBUTE_USED __attribute__((used)) - #define ASURA_ABSTRACT - #define ASURA_API ASURA_LIBRARY_EXPORT -#endif - - /// - /// ƶָȨ - /// -#define ASURA_MOVE - -#define ASURA_DEBUG 0 - - //--------------------------------------------------------------------------------// - -#define ASURA_SDL_HOST 1 - -#define ASURA_LITTLE_ENDIAN 1 - - //--------------------------------------------------------------------------------// - // չؼ - -#define ASURA_THROW(ex) throw(ex) // ʾ׳쳣 - -#define ASURA_OUT -#define ASURA_REF - } // namespace AsuraEngine #endif // __ASURA_CONFIG_H__
\ No newline at end of file diff --git a/source/modules/asura-utils/utils_config.h b/source/modules/asura-utils/utils_config.h index 02837dc..7b120f0 100644 --- a/source/modules/asura-utils/utils_config.h +++ b/source/modules/asura-utils/utils_config.h @@ -1,6 +1,9 @@ #ifndef __ASURA_UTILS_CONFIG_H__ #define __ASURA_UTILS_CONFIG_H__ +// ı +#include "asura-base/config.h" + #define ASURA_THREAD_WIN32 1 #define ASURA_THREAD_STD 1 |