mirror of https://github.com/AxioDL/metaforce.git
proper link order for DataSpec registration
This commit is contained in:
parent
b22c5e69b6
commit
b6216b049c
|
@ -1,2 +1,17 @@
|
|||
add_executable(hecl main.cpp)
|
||||
target_link_libraries(hecl LogVisor HECL blowfish pthread)
|
||||
add_executable(hecl main.cpp
|
||||
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
|
||||
)
|
||||
|
|
|
@ -55,11 +55,6 @@ static const HECL::SystemRegex regFORCE(_S("-f"), std::regex::ECMAScript|std::re
|
|||
|
||||
#include "../blender/CBlenderConnection.hpp"
|
||||
|
||||
namespace Retro
|
||||
{
|
||||
extern HECL::Database::DataSpecEntry SpecMP1;
|
||||
}
|
||||
|
||||
#if HECL_UCS2
|
||||
int wmain(int argc, const wchar_t** argv)
|
||||
#else
|
||||
|
@ -68,10 +63,10 @@ int main(int argc, const char** argv)
|
|||
{
|
||||
/* Xterm check */
|
||||
const char* term = getenv("TERM");
|
||||
if (!strncmp(term, "xterm", 5))
|
||||
if (term && !strncmp(term, "xterm", 5))
|
||||
XTERM_COLOR = true;
|
||||
|
||||
//fprintf(stderr, "%s\n", Retro::SpecMP1.m_name.c_str());
|
||||
LogVisor::RegisterConsoleLogger();
|
||||
|
||||
//CBlenderConnection bconn(false);
|
||||
//return 0;
|
||||
|
@ -237,3 +232,5 @@ int main(int argc, const char** argv)
|
|||
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -160,7 +160,9 @@ struct DataSpecEntry
|
|||
DataSpecEntry(SystemString&& name, SystemString&& desc,
|
||||
std::function<IDataSpec*(DataSpecTool)>&& 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);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -7,8 +7,4 @@ add_library(HECL
|
|||
HECL.cpp
|
||||
ProjectPath.cpp
|
||||
WideStringConvert.cpp)
|
||||
target_link_libraries(HECL
|
||||
HECLBackend
|
||||
HECLDatabase
|
||||
HECLFrontend
|
||||
HECLRuntime)
|
||||
|
||||
|
|
Loading…
Reference in New Issue