mirror of https://github.com/sm64pc/sm64pc.git
Fixed texture loading on windows and switch
This commit is contained in:
parent
8bec24fc57
commit
f56db9b48b
|
@ -10,12 +10,7 @@ using namespace std;
|
|||
using namespace miniz_cpp;
|
||||
|
||||
bool isDirectory;
|
||||
|
||||
#ifdef __MINGW32__
|
||||
#define SEPARATOR "\\"
|
||||
#else
|
||||
#define SEPARATOR "/"
|
||||
#endif
|
||||
|
||||
zip_file zipFile;
|
||||
|
||||
|
@ -32,11 +27,8 @@ vector<string> StrawFile::entries(){
|
|||
if(isDirectory) {
|
||||
vector<string> fileList;
|
||||
for (auto & entry : fs::recursive_directory_iterator(this->path)){
|
||||
#ifndef TARGET_SWITCH
|
||||
fileList.push_back(fs::relative(entry, this->path).string());
|
||||
#else
|
||||
fileList.push_back(entry.path().string());
|
||||
#endif
|
||||
string path = entry.path().string();
|
||||
fileList.push_back(path.substr(path.find(this->path) + this->path.length() + 1));
|
||||
}
|
||||
return fileList;
|
||||
}
|
||||
|
|
|
@ -250,7 +250,6 @@ void main_func(char *argv[]) {
|
|||
thread5_game_loop(NULL);
|
||||
inited = true;
|
||||
|
||||
fprintf(stdout, "precaching data\n");
|
||||
fflush(stdout);
|
||||
gfx_precache_textures();
|
||||
moon_setup("PreInit");
|
||||
|
|
Loading…
Reference in New Issue