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

MacOS build fixes

This commit is contained in:
Jack Andersen 2019-08-31 10:40:07 -10:00
parent 0ab08daae7
commit cffb56a24e
5 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/vcs.xml
View File

@ -6,7 +6,6 @@
<mapping directory="$PROJECT_DIR$/NESEmulator/fixNES" vcs="Git" /> <mapping directory="$PROJECT_DIR$/NESEmulator/fixNES" vcs="Git" />
<mapping directory="$PROJECT_DIR$/amuse" vcs="Git" /> <mapping directory="$PROJECT_DIR$/amuse" vcs="Git" />
<mapping directory="$PROJECT_DIR$/assetnameparser/tinyxml2" vcs="Git" /> <mapping directory="$PROJECT_DIR$/assetnameparser/tinyxml2" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cotire" vcs="Git" />
<mapping directory="$PROJECT_DIR$/discord-rpc" vcs="Git" /> <mapping directory="$PROJECT_DIR$/discord-rpc" vcs="Git" />
<mapping directory="$PROJECT_DIR$/hecl" vcs="Git" /> <mapping directory="$PROJECT_DIR$/hecl" vcs="Git" />
<mapping directory="$PROJECT_DIR$/hecl-gui" vcs="Git" /> <mapping directory="$PROJECT_DIR$/hecl-gui" vcs="Git" />

11
CMakeLists.txt
View File

@ -12,7 +12,7 @@ if(APPLE)
function(add_library TARGET) function(add_library TARGET)
_add_library(${TARGET} ${ARGN}) _add_library(${TARGET} ${ARGN})
list(GET ARGV 1 ARG1) list(GET ARGV 1 ARG1)
if(NOT ${ARG1} STREQUAL INTERFACE) if(NOT ${ARG1} STREQUAL INTERFACE AND NOT ${ARG1} STREQUAL ALIAS)
set_target_properties(${TARGET} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "") set_target_properties(${TARGET} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
endif() endif()
endfunction() endfunction()
@ -135,10 +135,11 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
add_compile_options(-fsanitize=memory -fsanitize-memory-track-origins -fsanitize-recover=all) add_compile_options(-fsanitize=memory -fsanitize-memory-track-origins -fsanitize-recover=all)
endif() endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions")
add_compile_options(-Wall -Wno-multichar -Werror=implicit-fallthrough -Wno-unknown-warning-option add_compile_options(-Wall -Wno-multichar -Werror=implicit-fallthrough -Wno-unknown-warning-option
-Wno-lto-type-mismatch -Wno-unused-variable -Wno-unused-private-field -Wno-lto-type-mismatch -Wno-unused-variable -Wno-unused-private-field
-Wno-unused-function -Wno-sign-compare -Wno-unknown-pragmas -fno-exceptions -Werror) -Wno-unused-function -Wno-sign-compare -Wno-unknown-pragmas -Werror)
add_compile_definitions(FMT_EXCEPTIONS=0)
if(APPLE) if(APPLE)
add_compile_options(-Wno-error=deprecated-declarations) add_compile_options(-Wno-error=deprecated-declarations)

23
DataSpec/SpecMP1.cpp
View File

@ -357,16 +357,19 @@ struct SpecMP1 : SpecBase {
progress.startNewLine(); progress.startNewLine();
for (std::pair<const std::string, DNAMP1::PAKBridge*>& pair : m_orderedPaks) { for (std::pair<const std::string, DNAMP1::PAKBridge*>& pair : m_orderedPaks) {
#if 0 #if 0
const DNAMP1::PAK::Entry* ent = pair.second->getPAK().lookupEntry(UniqueID32("A4DFCAD6")); const DNAMP1::PAK::Entry* ent = pair.second->getPAK().lookupEntry(UniqueID32(0xE39FC9A1));
if (ent) if (ent) {
{ PAKEntryReadStream rs = ent->beginReadStream(pair.second->getNode());
DNAMP1::ANIM anim; DNAMP1::CMDL::Extract(*this, rs, hecl::ProjectPath(m_project.getProjectWorkingPath(), "MP1/Metroid1/!1IntroLevel1027/CMDL_E39FC9A1.blend"), m_pakRouter, *ent, true, hecl::blender::SharedBlenderToken, {});
PAKEntryReadStream rs = ent->beginReadStream(pair.second->getNode());
anim.read(rs); ent = pair.second->getPAK().lookupEntry(UniqueID32(0xC1AE2B4A));
exit(0); rs = ent->beginReadStream(pair.second->getNode());
} DNAMP1::CMDL::Extract(*this, rs, hecl::ProjectPath(m_project.getProjectWorkingPath(), "MP1/Metroid1/!1IntroLevel1027/CMDL_C1AE2B4A.blend"), m_pakRouter, *ent, true, hecl::blender::SharedBlenderToken, {});
else
continue; exit(0);
}
else
continue;
#endif #endif
DNAMP1::PAKBridge& pak = *pair.second; DNAMP1::PAKBridge& pak = *pair.second;

2
hecl

@ -1 +1 @@
Subproject commit 920fcb3c3d90f3db95f097c235597aff211227bc Subproject commit 625d22cbab3277ef9f55f85a022ffb69c4a1cb4c

10
visigen/MainMac.mm
View File

@ -104,13 +104,9 @@ static void UpdatePercent(float percent)
@end @end
static logvisor::Module AthenaLog("Athena"); static logvisor::Module AthenaLog("Athena");
static void AthenaExc(athena::error::Level level, const char* file, static void AthenaExc(athena::error::Level level, const char* /*file*/, const char*, int /*line*/,
const char*, int line, const char* fmt, ...) fmt::string_view fmt, fmt::format_args args) {
{ AthenaLog.vreport(logvisor::Level(level), fmt, args);
va_list ap;
va_start(ap, fmt);
AthenaLog.report(logvisor::Level(level), fmt, ap);
va_end(ap);
} }
int main(int argc, const char** argv) int main(int argc, const char** argv)