AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

integrated libBoo submodule

This commit is contained in:
Jack Andersen 2015-08-18 09:45:28 -10:00
parent 1b3d5e1d3c
commit d17f2a5e78
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "MathLib"] [submodule "MathLib"]
path = MathLib path = MathLib
url = https://github.com/RetroView/MathLib.git url = https://github.com/RetroView/MathLib.git
[submodule "libBoo"]
path = libBoo
url = https://github.com/RetroView/libBoo.git

2
CMakeLists.txt
View File

@ -10,6 +10,8 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-multichar -fno-exceptions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-multichar -fno-exceptions")
endif() endif()
add_subdirectory(libBoo)
set(HECL_SUBPROJECT TRUE) set(HECL_SUBPROJECT TRUE)
set(HECL_DATASPEC_DECLS set(HECL_DATASPEC_DECLS
"/* RetroCommon specs */ "/* RetroCommon specs */

7
Runtime/CMakeLists.txt
View File

@ -1,5 +1,4 @@
add_subdirectory(MP3)
add_subdirectory(MP2)
add_subdirectory(MP1)
add_subdirectory(Common) add_subdirectory(Common)
add_subdirectory(MP1)
add_subdirectory(MP2)
add_subdirectory(MP3)

6
Runtime/Common/RetroTemplates.hpp
View File

@ -30,15 +30,15 @@ public:
{++ReferenceCount();} {++ReferenceCount();}
template<typename U = T> template<typename U = T>
TOneStatic(typename std::enable_if<std::is_default_constructible<U>::value>::type* = 0) TOneStatic(typename std::enable_if<std::is_default_constructible<U>::value>::type* = 0)
{++ReferenceCount(); new (GetAllocSpace()) T();} {++ReferenceCount(); new (m_allocspace) T();}
template<typename... Args> TOneStatic(Args&&... args) template<typename... Args> TOneStatic(Args&&... args)
{++ReferenceCount(); new (GetAllocSpace()) T(std::forward<Args>(args)...);} {++ReferenceCount(); new (m_allocspace) T(std::forward<Args>(args)...);}
~TOneStatic() {--ReferenceCount();} ~TOneStatic() {--ReferenceCount();}
template<typename... Args> void reset(Args&&... args) template<typename... Args> void reset(Args&&... args)
{new (GetAllocSpace()) T(std::forward<Args>(args)...);} {new (m_allocspace) T(std::forward<Args>(args)...);}
}; };
template<class T> u8 TOneStatic<T>::m_allocspace[sizeof(T)]; template<class T> u8 TOneStatic<T>::m_allocspace[sizeof(T)];
template<class T> u32 TOneStatic<T>::m_refCount; template<class T> u32 TOneStatic<T>::m_refCount;

1
libBoo Submodule

@ -0,0 +1 @@
Subproject commit 395e39d63a0ed4ffd3df869d30d4ea9ba51948d9