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

restored c++ abi to system default

This commit is contained in:
Jack Andersen 2015-07-12 08:08:20 -10:00
parent 1d3b94f9ff
commit de73e764e1
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/CMakeLists.txt
View File

@ -3,7 +3,7 @@ project(hecl)
set(HECL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "HECL include dir" FORCE) set(HECL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "HECL include dir" FORCE)
add_subdirectory(extern) add_subdirectory(extern)
include_directories(include ${LOG_VISOR_INCLUDE_DIR} ${ATHENA_INCLUDE_DIR}) include_directories(include ${LOG_VISOR_INCLUDE_DIR} ${ATHENA_INCLUDE_DIR})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=1") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
add_subdirectory(lib) add_subdirectory(lib)
add_subdirectory(blender) add_subdirectory(blender)
add_subdirectory(driver) add_subdirectory(driver)

5
hecl/driver/ToolBase.hpp
View File

@ -77,7 +77,10 @@ private:
++it; ++it;
} }
if (counter == WRAP_INDENT) if (counter == WRAP_INDENT)
it = string.insert(it, WRAP_INDENT, _S(' ')) + WRAP_INDENT; {
for (int i=0 ; i<WRAP_INDENT ; ++i)
it = string.insert(it, _S(' ')) + 1;
}
if (it >= string.end()) if (it >= string.end())
return; return;
if (*it != _S('\n')) if (*it != _S('\n'))

2
hecl/extern/Athena vendored

@ -1 +1 @@
Subproject commit 7ef451c86a99df7239aaecf23c11a39ec0b93ff3 Subproject commit 11331e068ecee56e8c46003fa7439c2b7450fd0f

2
hecl/extern/LogVisor vendored

@ -1 +1 @@
Subproject commit 36c62436d24fb0d92ae470bfaf6a0de763626869 Subproject commit 462971b134432330b30b60898d8c8b5c758bacb7

2
hecl/extern/RetroCommon vendored

@ -1 +1 @@
Subproject commit 6aa69f27752355c77f7a5dfb2205d08b59815881 Subproject commit abb9d4c0004daa0c892b7d81eb189549089f8cf2