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

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
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") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=1")
add_subdirectory(lib) add_subdirectory(lib)
add_subdirectory(blender) add_subdirectory(blender)
add_subdirectory(driver) add_subdirectory(driver)

2
hecl/driver/CMakeLists.txt
View File

@ -21,5 +21,5 @@ list(APPEND DATA_SPEC_LIBS
target_link_libraries(hecl target_link_libraries(hecl
HECLDatabase HECLDatabase
"-Wl,-whole-archive" ${DATA_SPEC_LIBS} "-Wl,-no-whole-archive" "-Wl,-whole-archive" ${DATA_SPEC_LIBS} "-Wl,-no-whole-archive"
HECL AthenaCore NOD LogVisor blowfish z lzo2 pthread HECL AthenaCore NOD LogVisor blowfish z lzo2 pthread
) )

5
hecl/driver/ToolBase.hpp
View File

@ -77,10 +77,7 @@ private:
++it; ++it;
} }
if (counter == WRAP_INDENT) if (counter == WRAP_INDENT)
{ it = string.insert(it, WRAP_INDENT, _S(' ')) + WRAP_INDENT;
string.insert(it, WRAP_INDENT, _S(' '));
it += WRAP_INDENT;
}
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 55adeec69c97467c010b110d27373e02803f806f Subproject commit 7ef451c86a99df7239aaecf23c11a39ec0b93ff3

2
hecl/extern/LogVisor vendored

@ -1 +1 @@
Subproject commit c1f226b4dca45bb822b6a96c8571250a9e991e21 Subproject commit 36c62436d24fb0d92ae470bfaf6a0de763626869

2
hecl/extern/RetroCommon vendored

@ -1 +1 @@
Subproject commit 975429f3c690dacfc8d112b033e512b52730fb54 Subproject commit 6aa69f27752355c77f7a5dfb2205d08b59815881