2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 15:44:56 +00:00

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

View File

@@ -3,7 +3,7 @@ project(hecl)
set(HECL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "HECL include dir" FORCE)
add_subdirectory(extern)
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(blender)
add_subdirectory(driver)

View File

@@ -77,7 +77,10 @@ private:
++it;
}
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())
return;
if (*it != _S('\n'))

2
hecl/extern/Athena vendored

Submodule hecl/extern/Athena updated: 7ef451c86a...11331e068e

Submodule hecl/extern/LogVisor updated: 36c62436d2...462971b134

Submodule hecl/extern/RetroCommon updated: 6aa69f2775...abb9d4c000