2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 17:44:01 +00:00

forced c++11 abi on

This commit is contained in:
Jack Andersen
2015-07-11 20:07:39 -10:00
parent 4596b34f67
commit 1d3b94f9ff
6 changed files with 6 additions and 9 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")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=1")
add_subdirectory(lib)
add_subdirectory(blender)
add_subdirectory(driver)

View File

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

2
hecl/extern/Athena vendored

Submodule hecl/extern/Athena updated: 55adeec69c...7ef451c86a

Submodule hecl/extern/LogVisor updated: c1f226b4dc...36c62436d2

Submodule hecl/extern/RetroCommon updated: 975429f3c6...6aa69f2775