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

proper link order for DataSpec registration

This commit is contained in:
Jack Andersen 2015-07-06 18:45:29 -10:00
parent b22c5e69b6
commit b6216b049c
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hecl/driver/CMakeLists.txt
View File

@ -1,2 +1,17 @@
add_executable(hecl main.cpp) add_executable(hecl main.cpp
target_link_libraries(hecl LogVisor HECL blowfish pthread) ToolBase.hpp
ToolPackage.hpp
ToolExtract.hpp
ToolInit.hpp
ToolHelp.hpp
ToolGroup.hpp
ToolCook.hpp
ToolClean.hpp
ToolAdd.hpp
ToolRemove.hpp
ToolSpec.hpp
)
target_link_libraries(hecl HECL HECLDatabase
"-Wl,-whole-archive" RetroDataSpec "-Wl,-no-whole-archive"
AthenaCore NOD LogVisor blowfish zlib lzo pthread
)

11
hecl/driver/main.cpp
View File

@ -55,11 +55,6 @@ static const HECL::SystemRegex regFORCE(_S("-f"), std::regex::ECMAScript|std::re
#include "../blender/CBlenderConnection.hpp" #include "../blender/CBlenderConnection.hpp"
namespace Retro
{
extern HECL::Database::DataSpecEntry SpecMP1;
}
#if HECL_UCS2 #if HECL_UCS2
int wmain(int argc, const wchar_t** argv) int wmain(int argc, const wchar_t** argv)
#else #else
@ -68,10 +63,10 @@ int main(int argc, const char** argv)
{ {
/* Xterm check */ /* Xterm check */
const char* term = getenv("TERM"); const char* term = getenv("TERM");
if (!strncmp(term, "xterm", 5)) if (term && !strncmp(term, "xterm", 5))
XTERM_COLOR = true; XTERM_COLOR = true;
//fprintf(stderr, "%s\n", Retro::SpecMP1.m_name.c_str()); LogVisor::RegisterConsoleLogger();
//CBlenderConnection bconn(false); //CBlenderConnection bconn(false);
//return 0; //return 0;
@ -237,3 +232,5 @@ int main(int argc, const char** argv)
return retval; return retval;
} }

4
hecl/include/HECL/Database.hpp
View File

@ -160,7 +160,9 @@ struct DataSpecEntry
DataSpecEntry(SystemString&& name, SystemString&& desc, DataSpecEntry(SystemString&& name, SystemString&& desc,
std::function<IDataSpec*(DataSpecTool)>&& factory) std::function<IDataSpec*(DataSpecTool)>&& factory)
: m_name(std::move(name)), m_desc(std::move(desc)), m_factory(std::move(factory)) : m_name(std::move(name)), m_desc(std::move(desc)), m_factory(std::move(factory))
{DATA_SPEC_REGISTRY.push_back(this);} {
DATA_SPEC_REGISTRY.push_back(this);
}
}; };
/** /**

6
hecl/lib/CMakeLists.txt
View File

@ -7,8 +7,4 @@ add_library(HECL
HECL.cpp HECL.cpp
ProjectPath.cpp ProjectPath.cpp
WideStringConvert.cpp) WideStringConvert.cpp)
target_link_libraries(HECL
HECLBackend
HECLDatabase
HECLFrontend
HECLRuntime)