mirror of https://github.com/AxioDL/metaforce.git
Windows fixes
This commit is contained in:
Jack Andersen
parent
1280f922c3
commit
6d049bdbb1
|
|
@ -40,7 +40,7 @@ install:
|
|||
############################################################################
|
||||
# Install custom LLVM
|
||||
############################################################################
|
||||
- set LLVM_URL="https://www.dropbox.com/s/8vz8ogsxjhhxoi2/LLVM-4.0.0svn-win64-athena.exe?dl=1"
|
||||
- set LLVM_URL="https://axiodl.com/LLVM-6.0.0svn-win64.exe"
|
||||
- appveyor DownloadFile %LLVM_URL% -FileName llvm.exe
|
||||
- llvm.exe /S /D=C:\projects\deps\llvm
|
||||
- set PATH=C:\projects\deps\llvm\bin;%PATH%
|
||||
|
|
@ -62,7 +62,7 @@ notifications:
|
|||
incoming_webhook:
|
||||
secure: uoO0I0PWyCx0KLjBOG6d17aSVuEEvYztB/UiF8J0LmTb2O735mAdWcuZHTImDFUGZxeI34/qzOB2JKqF+h8dZA5yiprSTkWIookqQjUokAM=
|
||||
- provider: Webhook
|
||||
url: https://discordapp.com/api/webhooks/345359672326356993/M8kBYpqr1JyVNhnAHBwNN5TnZmtWy9_msxAQoeOlaa73UhPn8gLU5uYZCjU1qsAi3sGN
|
||||
url: https://skyhook.glitch.me/api/webhooks/345359672326356993/M8kBYpqr1JyVNhnAHBwNN5TnZmtWy9_msxAQoeOlaa73UhPn8gLU5uYZCjU1qsAi3sGN/appveyor
|
||||
method: POST
|
||||
on_build_success: true
|
||||
on_build_failure: true
|
||||
|
|
|
|||
|
|
@ -1183,7 +1183,7 @@ void SpecBase::backgroundIndexProc()
|
|||
athena::io::FileReader reader(tagCachePath.getAbsolutePath());
|
||||
if (reader.isOpen())
|
||||
{
|
||||
Log.report(logvisor::Info, _S("Cache index of '%s' loading"), getOriginalSpec().m_name);
|
||||
Log.report(logvisor::Info, _S("Cache index of '%s' loading"), getOriginalSpec().m_name.data());
|
||||
athena::io::YAMLDocReader cacheReader;
|
||||
if (cacheReader.parse(&reader))
|
||||
{
|
||||
|
|
@ -1212,12 +1212,12 @@ void SpecBase::backgroundIndexProc()
|
|||
fprintf(stderr, "\n");
|
||||
}
|
||||
Log.report(logvisor::Info, _S("Cache index of '%s' loaded; %d tags"),
|
||||
getOriginalSpec().m_name, m_tagToPath.size());
|
||||
getOriginalSpec().m_name.data(), m_tagToPath.size());
|
||||
|
||||
if (nameCachePath.isFile())
|
||||
{
|
||||
/* Read in name cache */
|
||||
Log.report(logvisor::Info, _S("Name index of '%s' loading"), getOriginalSpec().m_name);
|
||||
Log.report(logvisor::Info, _S("Name index of '%s' loading"), getOriginalSpec().m_name.data());
|
||||
athena::io::FileReader nreader(nameCachePath.getAbsolutePath());
|
||||
athena::io::YAMLDocReader nameReader;
|
||||
if (nameReader.parse(&nreader))
|
||||
|
|
@ -1240,7 +1240,7 @@ void SpecBase::backgroundIndexProc()
|
|||
}
|
||||
}
|
||||
Log.report(logvisor::Info, _S("Name index of '%s' loaded; %d names"),
|
||||
getOriginalSpec().m_name, m_catalogNameToTag.size());
|
||||
getOriginalSpec().m_name.data(), m_catalogNameToTag.size());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1254,7 +1254,7 @@ void SpecBase::backgroundIndexProc()
|
|||
m_catalogTagToName[oidsTag] = "MP1OriginalIDs";
|
||||
}
|
||||
|
||||
Log.report(logvisor::Info, _S("Background index of '%s' started"), getOriginalSpec().m_name);
|
||||
Log.report(logvisor::Info, _S("Background index of '%s' started"), getOriginalSpec().m_name.data());
|
||||
backgroundIndexRecursiveProc(specRoot, cacheWriter, nameWriter, 0);
|
||||
|
||||
tagCachePath.makeDirChain(false);
|
||||
|
|
@ -1266,7 +1266,7 @@ void SpecBase::backgroundIndexProc()
|
|||
|
||||
m_backgroundBlender.shutdown();
|
||||
Log.report(logvisor::Info, _S("Background index of '%s' complete; %d tags, %d names"),
|
||||
getOriginalSpec().m_name, m_tagToPath.size(), m_catalogNameToTag.size());
|
||||
getOriginalSpec().m_name.data(), m_tagToPath.size(), m_catalogNameToTag.size());
|
||||
m_backgroundRunning = false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -419,11 +419,11 @@ struct SpecMP1 : SpecBase
|
|||
progress(sysName.c_str(), _S(""), compIdx, 0.0);
|
||||
}
|
||||
|
||||
auto pakName = sysName.sys_str();
|
||||
auto pakName = hecl::SystemString(sysName.sys_str());
|
||||
process.addLambdaTransaction([&, pakName](hecl::BlenderToken& btok) {
|
||||
m_pakRouter.extractResources(pak, force, btok, [&](const hecl::SystemChar* substr, float factor) {
|
||||
std::unique_lock<std::mutex> lk(msgLock);
|
||||
progress(pakName.data(), substr, compIdx, factor);
|
||||
progress(pakName.c_str(), substr, compIdx, factor);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ struct SpecMP2 : SpecBase
|
|||
std::unique_lock<std::mutex> lk(msgLock);
|
||||
progress(sysName.c_str(), _S(""), compIdx, 0.0);
|
||||
}
|
||||
hecl::SystemString pakName = hecl::SystemString(sysName.sys_str());
|
||||
auto pakName = hecl::SystemString(sysName.sys_str());
|
||||
process.addLambdaTransaction([&, pakName](hecl::BlenderToken& btok)
|
||||
{
|
||||
m_pakRouter.extractResources(pak, force, btok,
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ struct SpecMP3 : SpecBase
|
|||
std::unique_lock<std::mutex> lk(msgLock);
|
||||
progress(sysName.c_str(), _S(""), compIdx, 0.0);
|
||||
}
|
||||
hecl::SystemString pakName = hecl::SystemString(sysName.sys_str());
|
||||
auto pakName = hecl::SystemString(sysName.sys_str());
|
||||
process.addLambdaTransaction([&, pakName](hecl::BlenderToken& btok)
|
||||
{
|
||||
m_pakRouter.extractResources(pak, force, btok,
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ Everything else is much too experimental to make portable/stable release builds
|
|||
* [CMake 3+](https://cmake.org)
|
||||
* [Python 3+](https://python.org)
|
||||
* LLVM development package *(headers and libs)*
|
||||
* [Specialized Windows Package](https://www.dropbox.com/s/8vz8ogsxjhhxoi2/LLVM-4.0.0svn-win64-athena.exe?dl=1)
|
||||
* [macOS Package](http://llvm.org/releases/3.9.0/clang+llvm-3.9.0-x86_64-apple-darwin.tar.xz)
|
||||
* **[Windows]** [Visual Studio 2015 and Windows SDK](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
|
||||
* [Specialized Windows Package](https://axiodl.com/LLVM-6.0.0svn-win64.exe)
|
||||
* [macOS Package](http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-x86_64-apple-darwin.tar.xz)
|
||||
* **[Windows]** [Visual Studio 2017 and Windows SDK](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
|
||||
* **[macOS]** [Xcode Tools](https://developer.apple.com/xcode/download/)
|
||||
* **[Linux]** recent development packages of `udev`, `x11`, `xcb`, `xinput`, `glx`, `asound`, `dmix`
|
||||
* **[Linux]** recent development packages of `udev`, `x11`, `xcb`, `xinput`, `glx`, `asound`
|
||||
|
||||
### Prep Directions
|
||||
|
||||
|
|
|
|||
2
amuse
2
amuse
|
|
@ -1 +1 @@
|
|||
Subproject commit 03d597b0ac1a09d3c1e8f4608d55401511cf6b32
|
||||
Subproject commit 448b212ad9c72506ad5d0301d3ba0768f1c70aa1
|
||||
2
hecl
2
hecl
|
|
@ -1 +1 @@
|
|||
Subproject commit 38c511f5b53cbb161c89a1c3f2ac3ae4e9ac7c2d
|
||||
Subproject commit d64f9440db2e562214801f754a52a543232a4fe9
|
||||
2
kabufuda
2
kabufuda
|
|
@ -1 +1 @@
|
|||
Subproject commit ffbe61508f3d6b277136a6cbeceb62c109ec9b18
|
||||
Subproject commit c6fcf4554621a381cd5a313bd8bf6bc9765cddf5
|
||||
2
nod
2
nod
|
|
@ -1 +1 @@
|
|||
Subproject commit 69e96e3b3c069ea38fd315dac4af9c82d3b6774c
|
||||
Subproject commit 58ceb47b25f9062c74452202848e4cbaf79e859f
|
||||
Loading…
Reference in New Issue