From d099a210d0832dd257e2f740418b65e4bf207803 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Mon, 17 Aug 2015 12:15:52 -1000 Subject: [PATCH] Updated hecl submodule for DataSpec registration --- CMakeLists.txt | 13 +++++++++++++ hecl | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ccb07569..b1f70dce6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,19 @@ else() endif() set(HECL_SUBPROJECT TRUE) +set(HECL_DATASPEC_DECLS +"/* RetroCommon specs */ +namespace Retro +{ + extern HECL::Database::DataSpecEntry SpecEntMP1; + extern HECL::Database::DataSpecEntry SpecEntMP2; + extern HECL::Database::DataSpecEntry SpecEntMP3; +}") +set(HECL_DATASPEC_PUSHES +" /* RetroCommon */ + HECL::Database::DATA_SPEC_REGISTRY.push_back(&Retro::SpecEntMP1); + HECL::Database::DATA_SPEC_REGISTRY.push_back(&Retro::SpecEntMP2); + HECL::Database::DATA_SPEC_REGISTRY.push_back(&Retro::SpecEntMP3);") add_subdirectory(hecl) add_subdirectory(NODLib) include_directories(${ATHENA_INCLUDE_DIR} ${LOG_VISOR_INCLUDE_DIR} ${HECL_INCLUDE_DIR} diff --git a/hecl b/hecl index f6b681030..9b3a0413b 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit f6b681030a7a5328683c18ea37f56b752551986b +Subproject commit 9b3a0413b0132334cc56fa4bb973e1563c5f0183